Skip to content

Commit bff384b

Browse files
refactor: error handling
1 parent 883a231 commit bff384b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

coderd/userauth.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -348,15 +348,13 @@ func (api *API) postChangePasswordWithOneTimePasscode(rw http.ResponseWriter, r
348348
})
349349
if err != nil && !errors.Is(err, sql.ErrNoRows) {
350350
logger.Error(ctx, "unable to fetch user by email", slog.F("email", req.Email), slog.Error(err))
351-
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
352-
Message: "Internal error.",
353-
})
354-
return nil
351+
return xerrors.Errorf("get user by email: %w", err)
355352
}
356353
aReq.Old = user
357354

358355
equal, err := userpassword.Compare(string(user.HashedOneTimePasscode), req.OneTimePasscode)
359356
if err != nil {
357+
logger.Error(ctx, "unable to compare one time passcode", slog.Error(err))
360358
return xerrors.Errorf("compare one time passcode: %w", err)
361359
}
362360

@@ -389,6 +387,7 @@ func (api *API) postChangePasswordWithOneTimePasscode(rw http.ResponseWriter, r
389387

390388
newHashedPassword, err := userpassword.Hash(req.Password)
391389
if err != nil {
390+
logger.Error(ctx, "unable to hash user's password", slog.Error(err))
392391
return xerrors.Errorf("hash user password: %w", err)
393392
}
394393

@@ -398,12 +397,14 @@ func (api *API) postChangePasswordWithOneTimePasscode(rw http.ResponseWriter, r
398397
HashedPassword: []byte(newHashedPassword),
399398
})
400399
if err != nil {
400+
logger.Error(ctx, "unable to delete user's hashed password", slog.Error(err))
401401
return xerrors.Errorf("update user hashed password: %w", err)
402402
}
403403

404404
//nolint:gocritic // We need the system auth context to be able to delete all API keys for the user.
405405
err = tx.DeleteAPIKeysByUserID(dbauthz.AsSystemRestricted(ctx), user.ID)
406406
if err != nil {
407+
logger.Error(ctx, "unable to delete user's api keys", slog.Error(err))
407408
return xerrors.Errorf("delete api keys for user: %w", err)
408409
}
409410

@@ -418,7 +419,6 @@ func (api *API) postChangePasswordWithOneTimePasscode(rw http.ResponseWriter, r
418419
return nil
419420
}, nil)
420421
if err != nil {
421-
logger.Error(ctx, "unable to update user's password", slog.Error(err))
422422
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
423423
Message: "Internal error.",
424424
Detail: err.Error(),

0 commit comments

Comments
 (0)