diff --git a/internal/provider/auth/model.go b/internal/provider/auth/model.go index 2044e62..436bb4b 100644 --- a/internal/provider/auth/model.go +++ b/internal/provider/auth/model.go @@ -5,7 +5,7 @@ import ( "time" ) -type RefreshToken struct { +type Session struct { Id uint `gorm:"primary_key"` CreatedAt time.Time `gorm:"column:created_at"` UpdatedAt sql.NullTime `gorm:"column:updated_at"` @@ -15,3 +15,7 @@ type RefreshToken struct { SessionUuid string `gorm:"column:session_uuid"` Expires time.Time `gorm:"column:expires"` } + +func (Session) TableName() string { + return "sessions" +} diff --git a/internal/provider/auth/repository.go b/internal/provider/auth/repository.go index 3aa0ced..2643ed7 100644 --- a/internal/provider/auth/repository.go +++ b/internal/provider/auth/repository.go @@ -6,8 +6,8 @@ import ( ) type Repository interface { - CreateRefreshToken(token *RefreshToken) error - ReadRefreshToken(userUuid, tokenUuid, sessionUuid string) (RefreshToken, error) + CreateRefreshToken(token *Session) error + ReadRefreshToken(userUuid, tokenUuid, sessionUuid string) (Session, error) InvalidateRefreshToken(userUuid, refreshUuid, sessionUuid string) error } @@ -19,12 +19,12 @@ func newRepository(db *gorm.DB) *repo { return &repo{db: db} } -func (r *repo) CreateRefreshToken(token *RefreshToken) error { +func (r *repo) CreateRefreshToken(token *Session) error { return r.db.Create(token).Error } -func (r *repo) ReadRefreshToken(userUuid, tokenUuid, sessionUuid string) (RefreshToken, error) { - var tokenData RefreshToken +func (r *repo) ReadRefreshToken(userUuid, tokenUuid, sessionUuid string) (Session, error) { + var tokenData Session if err := r.db. Where("user_uuid = ?", userUuid). @@ -32,7 +32,7 @@ func (r *repo) ReadRefreshToken(userUuid, tokenUuid, sessionUuid string) (Refres Where("session_uuid = ?", sessionUuid). Where("deleted_at IS NULL"). First(&tokenData).Error; err != nil { - return RefreshToken{}, err + return Session{}, err } return tokenData, nil @@ -40,7 +40,7 @@ func (r *repo) ReadRefreshToken(userUuid, tokenUuid, sessionUuid string) (Refres func (r *repo) InvalidateRefreshToken(userUuid, refreshUuid, sessionUuid string) error { return r.db. - Model(&RefreshToken{}). + Model(&Session{}). Where("user_uuid = ?", userUuid). Where("refresh_uuid = ?", refreshUuid). Where("session_uuid = ?", sessionUuid). diff --git a/internal/provider/auth/service.go b/internal/provider/auth/service.go index 900977b..09ceb19 100644 --- a/internal/provider/auth/service.go +++ b/internal/provider/auth/service.go @@ -71,7 +71,7 @@ func (s *Service) createSession(userUuid, sessionUuid string) (shared.AuthData, expires := time.Now().UTC().Add(s.refreshExpiry) refreshCookie := s.jwtProvider.CreateRefreshToken(refreshUuid, expires) - err = s.repo.CreateRefreshToken(&RefreshToken{ + err = s.repo.CreateRefreshToken(&Session{ Expires: expires, UserUuid: userUuid, RefreshUuid: refreshUuid,