merch-tracker-v2/api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

session id check by refresh token

Browse source
This commit is contained in:
nquidox 2025-09-10 20:19:51 +03:00
parent a8c974994b
commit 6d20fc3ed6
11 changed files with 74 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/provider/auth/repository.go
View file

@ -7,8 +7,8 @@ import (
type Repository interface {
CreateRefreshToken(token *Session) error
ReadRefreshToken(userUuid, tokenUuid, sessionUuid string) (Session, error)
InvalidateRefreshToken(userUuid, refreshUuid, sessionUuid string) error
ReadRefreshToken(userUuid, tokenUuid string) (Session, error)
InvalidateRefreshToken(userUuid, refreshUuid string) error
}
type repo struct {
@ -23,13 +23,12 @@ func (r *repo) CreateRefreshToken(token *Session) error {
return r.db.Create(token).Error
}
func (r *repo) ReadRefreshToken(userUuid, tokenUuid, sessionUuid string) (Session, error) {
func (r *repo) ReadRefreshToken(userUuid, tokenUuid string) (Session, error) {
var tokenData Session
if err := r.db.
Where("user_uuid = ?", userUuid).
Where("refresh_uuid = ?", tokenUuid).
Where("session_uuid = ?", sessionUuid).
Where("deleted_at IS NULL").
First(&tokenData).Error; err != nil {
return Session{}, err
@ -38,11 +37,10 @@ func (r *repo) ReadRefreshToken(userUuid, tokenUuid, sessionUuid string) (Sessio
return tokenData, nil
}
func (r *repo) InvalidateRefreshToken(userUuid, refreshUuid, sessionUuid string) error {
func (r *repo) InvalidateRefreshToken(userUuid, refreshUuid string) error {
return r.db.
Model(&Session{}).
Where("user_uuid = ?", userUuid).
Where("refresh_uuid = ?", refreshUuid).
Where("session_uuid = ?", sessionUuid).
Update("deleted_at", time.Now().UTC()).Error
}

13
internal/provider/auth/service.go
View file

@ -26,10 +26,10 @@ func (s *Service) Login(userUuid string) (shared.AuthData, error) {
return s.newSession(userUuid)
}
func (s *Service) Refresh(userUuid, refreshUuid, sessionUuid string) (shared.AuthData, error) {
func (s *Service) Refresh(userUuid, refreshUuid string) (shared.AuthData, error) {
var err error
tokenData, err := s.repo.ReadRefreshToken(userUuid, refreshUuid, sessionUuid)
tokenData, err := s.repo.ReadRefreshToken(userUuid, refreshUuid)
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return shared.AuthData{}, errors.New("refresh token is not valid or doesn't exist")
@ -38,19 +38,20 @@ func (s *Service) Refresh(userUuid, refreshUuid, sessionUuid string) (shared.Aut
}
if time.Now().After(tokenData.Expires) {
_ = s.repo.InvalidateRefreshToken(userUuid, refreshUuid)
return shared.AuthData{}, errors.New("token expired")
}
err = s.repo.InvalidateRefreshToken(userUuid, refreshUuid, sessionUuid)
err = s.repo.InvalidateRefreshToken(userUuid, refreshUuid)
if err != nil {
return shared.AuthData{}, err
}
return s.updateSession(userUuid, sessionUuid)
return s.updateSession(userUuid, tokenData.SessionUuid)
}
func (s *Service) Logout(userUuid, refreshUuid, sessionUuid string) error {
return s.repo.InvalidateRefreshToken(userUuid, refreshUuid, sessionUuid)
func (s *Service) Logout(userUuid, refreshUuid string) error {
return s.repo.InvalidateRefreshToken(userUuid, refreshUuid)
}
func (s *Service) newSession(userUuid string) (shared.AuthData, error) {