get current session info
This commit is contained in:
parent
476e5edf38
commit
c59fbc0864
6 changed files with 84 additions and 26 deletions
|
|
@ -5,10 +5,11 @@ import (
|
|||
"time"
|
||||
)
|
||||
|
||||
type Repository interface {
|
||||
CreateRefreshToken(token *Session) error
|
||||
ReadRefreshToken(tokenUuid string) (Session, error)
|
||||
InvalidateRefreshToken(refreshUuid string) error
|
||||
type repository interface {
|
||||
createRefreshToken(token *Session) error
|
||||
readRefreshToken(tokenUuid string) (Session, error)
|
||||
invalidateRefreshToken(refreshUuid string) error
|
||||
getCurrentSession(sessionUuid string) (Session, error)
|
||||
}
|
||||
|
||||
type repo struct {
|
||||
|
|
@ -19,11 +20,11 @@ func newRepository(db *gorm.DB) *repo {
|
|||
return &repo{db: db}
|
||||
}
|
||||
|
||||
func (r *repo) CreateRefreshToken(token *Session) error {
|
||||
func (r *repo) createRefreshToken(token *Session) error {
|
||||
return r.db.Create(token).Error
|
||||
}
|
||||
|
||||
func (r *repo) ReadRefreshToken(tokenUuid string) (Session, error) {
|
||||
func (r *repo) readRefreshToken(tokenUuid string) (Session, error) {
|
||||
var tokenData Session
|
||||
|
||||
if err := r.db.
|
||||
|
|
@ -36,9 +37,15 @@ func (r *repo) ReadRefreshToken(tokenUuid string) (Session, error) {
|
|||
return tokenData, nil
|
||||
}
|
||||
|
||||
func (r *repo) InvalidateRefreshToken(refreshUuid string) error {
|
||||
func (r *repo) invalidateRefreshToken(refreshUuid string) error {
|
||||
return r.db.
|
||||
Model(&Session{}).
|
||||
Where("refresh_uuid = ?", refreshUuid).
|
||||
Update("deleted_at", time.Now().UTC()).Error
|
||||
}
|
||||
|
||||
func (r *repo) getCurrentSession(sessionUuid string) (Session, error) {
|
||||
var s Session
|
||||
err := r.db.Where("refresh_uuid = ?", sessionUuid).Where("deleted_at IS NULL").Find(&s).Error
|
||||
return s, err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ import (
|
|||
)
|
||||
|
||||
type Service struct {
|
||||
repo Repository
|
||||
repo repository
|
||||
jwtProvider interfaces.JWTProvider
|
||||
}
|
||||
|
||||
func newService(repo Repository, jwtProvider interfaces.JWTProvider) *Service {
|
||||
func newService(repo repository, jwtProvider interfaces.JWTProvider) *Service {
|
||||
return &Service{
|
||||
repo: repo,
|
||||
jwtProvider: jwtProvider,
|
||||
|
|
@ -29,7 +29,7 @@ func (s *Service) Login(userUuid string) (shared.AuthData, error) {
|
|||
func (s *Service) Refresh(refreshUuid string) (shared.AuthData, error) {
|
||||
var err error
|
||||
|
||||
tokenData, err := s.repo.ReadRefreshToken(refreshUuid)
|
||||
tokenData, err := s.repo.readRefreshToken(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,11 +38,11 @@ func (s *Service) Refresh(refreshUuid string) (shared.AuthData, error) {
|
|||
}
|
||||
|
||||
if time.Now().After(tokenData.Expires) {
|
||||
_ = s.repo.InvalidateRefreshToken(refreshUuid)
|
||||
_ = s.repo.invalidateRefreshToken(refreshUuid)
|
||||
return shared.AuthData{}, errors.New("token expired")
|
||||
}
|
||||
|
||||
err = s.repo.InvalidateRefreshToken(refreshUuid)
|
||||
err = s.repo.invalidateRefreshToken(refreshUuid)
|
||||
if err != nil {
|
||||
return shared.AuthData{}, err
|
||||
}
|
||||
|
|
@ -51,7 +51,7 @@ func (s *Service) Refresh(refreshUuid string) (shared.AuthData, error) {
|
|||
}
|
||||
|
||||
func (s *Service) Logout(refreshUuid string) error {
|
||||
return s.repo.InvalidateRefreshToken(refreshUuid)
|
||||
return s.repo.invalidateRefreshToken(refreshUuid)
|
||||
}
|
||||
|
||||
func (s *Service) newSession(userUuid string) (shared.AuthData, error) {
|
||||
|
|
@ -81,7 +81,7 @@ func (s *Service) createSession(userUuid, sessionUuid string) (shared.AuthData,
|
|||
expires := time.Now().UTC().Add(s.jwtProvider.RefreshExpires())
|
||||
refreshCookie := s.jwtProvider.CreateRefreshToken(refreshUuid, expires)
|
||||
|
||||
err = s.repo.CreateRefreshToken(&Session{
|
||||
err = s.repo.createRefreshToken(&Session{
|
||||
Expires: expires,
|
||||
UserUuid: userUuid,
|
||||
RefreshUuid: refreshUuid,
|
||||
|
|
@ -93,3 +93,17 @@ func (s *Service) createSession(userUuid, sessionUuid string) (shared.AuthData,
|
|||
RefreshCookie: refreshCookie,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (s *Service) GetCurrentSession(sessionUuid string) (shared.CurrentSession, error) {
|
||||
cs, err := s.repo.getCurrentSession(sessionUuid)
|
||||
if err != nil {
|
||||
return shared.CurrentSession{}, err
|
||||
}
|
||||
|
||||
resp := shared.CurrentSession{
|
||||
Uuid: cs.SessionUuid,
|
||||
Expires: cs.Expires,
|
||||
}
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue