loading up the forgejo repo on tangled to test page performance
Revert "Unify password changing and invalidate auth tokens (#27625)"
This reverts commit 688d4a1f719d2df4d2626453f4bc042c1874a375.
+1
-20
-5
models/auth/auth_token.go
-5
models/auth/auth_token.go
···
54
54
return err
55
55
}
56
56
57
-
func DeleteAuthTokensByUserID(ctx context.Context, uid int64) error {
58
-
_, err := db.GetEngine(ctx).Where(builder.Eq{"user_id": uid}).Delete(&AuthToken{})
59
-
return err
60
-
}
61
-
62
57
func DeleteExpiredAuthTokens(ctx context.Context) error {
63
58
_, err := db.GetEngine(ctx).Where(builder.Lt{"expires_unix": timeutil.TimeStampNow()}).Delete(&AuthToken{})
64
59
return err
-4
services/user/delete.go
-4
services/user/delete.go
···
187
187
}
188
188
// ***** END: ExternalLoginUser *****
189
189
190
-
if err := auth_model.DeleteAuthTokensByUserID(ctx, u.ID); err != nil {
191
-
return fmt.Errorf("DeleteAuthTokensByUserID: %w", err)
192
-
}
193
-
194
190
if _, err = db.DeleteByID[user_model.User](ctx, u.ID); err != nil {
195
191
return fmt.Errorf("delete: %w", err)
196
192
}
+1
-11
services/user/update.go
+1
-11
services/user/update.go
···
183
183
u.LoginName = opts.LoginName.Value()
184
184
}
185
185
186
-
deleteAuthTokens := false
187
186
if opts.Password.Has() && (u.IsLocal() || u.IsOAuth2()) {
188
187
password := opts.Password.Value()
189
188
···
200
199
if err := u.SetPassword(password); err != nil {
201
200
return err
202
201
}
203
-
204
-
deleteAuthTokens = true
205
202
}
206
203
207
204
if opts.MustChangePassword.Has() {
···
211
208
u.ProhibitLogin = opts.ProhibitLogin.Value()
212
209
}
213
210
214
-
if err := user_model.UpdateUserCols(ctx, u, "login_type", "login_source", "login_name", "passwd", "passwd_hash_algo", "salt", "must_change_password", "prohibit_login"); err != nil {
215
-
return err
216
-
}
217
-
218
-
if deleteAuthTokens {
219
-
return auth_model.DeleteAuthTokensByUserID(ctx, u.ID)
220
-
}
221
-
return nil
211
+
return user_model.UpdateUserCols(ctx, u, "login_type", "login_source", "login_name", "passwd", "passwd_hash_algo", "salt", "must_change_password", "prohibit_login")
222
212
}