Skip to content

Commit 1951c51

Browse files
committed
Revert "Unify password changing and invalidate auth tokens (go-gitea#27625)"
This reverts commit 688d4a1.
1 parent 80cf92b commit 1951c51

File tree

3 files changed

+1
-20
lines changed

3 files changed

+1
-20
lines changed

models/auth/auth_token.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ func DeleteAuthTokenByID(ctx context.Context, id string) error {
5454
return err
5555
}
5656

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-
6257
func DeleteExpiredAuthTokens(ctx context.Context) error {
6358
_, err := db.GetEngine(ctx).Where(builder.Lt{"expires_unix": timeutil.TimeStampNow()}).Delete(&AuthToken{})
6459
return err

services/user/delete.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,6 @@ func deleteUser(ctx context.Context, u *user_model.User, purge bool) (err error)
187187
}
188188
// ***** END: ExternalLoginUser *****
189189

190-
if err := auth_model.DeleteAuthTokensByUserID(ctx, u.ID); err != nil {
191-
return fmt.Errorf("DeleteAuthTokensByUserID: %w", err)
192-
}
193-
194190
if _, err = db.DeleteByID[user_model.User](ctx, u.ID); err != nil {
195191
return fmt.Errorf("delete: %w", err)
196192
}

services/user/update.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ func UpdateAuth(ctx context.Context, u *user_model.User, opts *UpdateAuthOptions
183183
u.LoginName = opts.LoginName.Value()
184184
}
185185

186-
deleteAuthTokens := false
187186
if opts.Password.Has() && (u.IsLocal() || u.IsOAuth2()) {
188187
password := opts.Password.Value()
189188

@@ -200,8 +199,6 @@ func UpdateAuth(ctx context.Context, u *user_model.User, opts *UpdateAuthOptions
200199
if err := u.SetPassword(password); err != nil {
201200
return err
202201
}
203-
204-
deleteAuthTokens = true
205202
}
206203

207204
if opts.MustChangePassword.Has() {
@@ -211,12 +208,5 @@ func UpdateAuth(ctx context.Context, u *user_model.User, opts *UpdateAuthOptions
211208
u.ProhibitLogin = opts.ProhibitLogin.Value()
212209
}
213210

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")
222212
}

0 commit comments

Comments
 (0)