This commit is contained in:
2026-10-08 02:07:45 +07:00
parent 56bc009311
commit 0210a0ed15
6 changed files with 285 additions and 24 deletions
+5 -13
View File
@@ -285,18 +285,6 @@ func (s *UsersService) Refresh(
return "", "", ErrInvalidRefreshToken
}
now := time.Now()
ok, err := s.refreshTokensRepo.ExistsRefreshToken(ctx, claims.UserID, claims.ID, now)
if err != nil {
return "", "", err
}
if !ok {
return "", "", ErrInvalidRefreshToken
}
if err := s.refreshTokensRepo.DeleteRefreshTokenByJti(ctx, claims.ID); err != nil {
return "", "", err
}
user, err := s.usersRepo.GetUserByID(ctx, claims.UserID)
if err != nil {
if errors.Is(err, users_repo.ErrUserNotFound) {
@@ -319,9 +307,13 @@ func (s *UsersService) Refresh(
return "", "", errors.New("не получилось получить доступ")
}
if err := s.refreshTokensRepo.AddRefreshToken(ctx, user.ID, refreshTokenClaims.ExpiresAt.Time, refreshTokenClaims.ID); err != nil {
ok, err := s.refreshTokensRepo.ReplaceRefreshToken(ctx, user.ID, claims.ID, time.Now(), refreshTokenClaims.ExpiresAt.Time, refreshTokenClaims.ID)
if err != nil {
return "", "", err
}
if !ok {
return "", "", ErrInvalidRefreshToken
}
return accessToken, refreshToken, nil
}