Browse Source

Change more suspension check logic

From u.Status == UserSuspended to u.IsSuspended()

Ref T661
T661-disable-accounts
Matt Baer 4 years ago
parent
commit
f7550a0da8
5 changed files with 6 additions and 6 deletions
  1. +1
    -1
      account.go
  2. +1
    -1
      admin.go
  3. +2
    -2
      collections.go
  4. +1
    -1
      database.go
  5. +1
    -1
      invites.go

+ 1
- 1
account.go View File

@@ -1053,7 +1053,7 @@ func viewSettings(app *App, u *User, w http.ResponseWriter, r *http.Request) err
Email: fullUser.EmailClear(app.keys),
HasPass: passIsSet,
IsLogOut: r.FormValue("logout") == "1",
Suspended: fullUser.Status == UserSuspended,
Suspended: fullUser.IsSuspended(),
}

showUserPage(w, "settings", obj)


+ 1
- 1
admin.go View File

@@ -242,7 +242,7 @@ func handleAdminToggleUserStatus(app *App, u *User, w http.ResponseWriter, r *ht
log.Error("failed to get user: %v", err)
return impart.HTTPError{http.StatusInternalServerError, fmt.Sprintf("Could not get user from username: %v", err)}
}
if user.Status == UserSuspended {
if user.IsSuspended() {
err = app.db.SetUserStatus(user.ID, UserActive)
} else {
err = app.db.SetUserStatus(user.ID, UserSuspended)


+ 2
- 2
collections.go View File

@@ -906,10 +906,10 @@ func handleViewCollectionTag(app *App, w http.ResponseWriter, r *http.Request) e
log.Error("Error getting user for collection: %v", err)
}
}
if !isOwner && u.Status == UserSuspended {
if !isOwner && u.IsSuspended() {
return ErrCollectionNotFound
}
displayPage.Suspended = u.Status == UserSuspended
displayPage.Suspended = u.IsSuspended()
displayPage.Owner = owner
coll.Owner = displayPage.Owner
// Add more data


+ 1
- 1
database.go View File

@@ -322,7 +322,7 @@ func (db *datastore) IsUserSuspended(id int64) (bool, error) {
return false, fmt.Errorf("is user suspended: %v", err)
}

return u.Status == UserSuspended, nil
return u.IsSuspended(), nil
}

// DoesUserNeedAuth returns true if the user hasn't provided any methods for


+ 1
- 1
invites.go View File

@@ -78,7 +78,7 @@ func handleCreateUserInvite(app *App, u *User, w http.ResponseWriter, r *http.Re
muVal := r.FormValue("uses")
expVal := r.FormValue("expires")

if u.Status == UserSuspended {
if u.IsSuspended() {
return ErrUserSuspended
}



Loading…
Cancel
Save