kamen
/
graphicek
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/editable-dashboard

This commit is contained in:
Jan Zípek 2022-08-28 08:39:39 +02:00
parent 658a424586 f767610f22
commit 85201e254e
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/services/auth_service.go
View File

@ -19,6 +19,7 @@ func (s *AuthService) FromContext(ctx *gin.Context) (*SessionItem, error) {
return nil, err return nil, err
} }
s.setCookieFromSession(ctx, session)
s.ctx.Services.Sessions.Extend(session) s.ctx.Services.Sessions.Extend(session)
return session, nil return session, nil
@ -31,7 +32,7 @@ func (s *AuthService) Login(ctx *gin.Context) error {
return err return err
} }
ctx.SetCookie(SESSION_ID, session.Id, int(time.Duration(time.Hour*24).Seconds()), "/", "", false, true) s.setCookieFromSession(ctx, session)
return nil return nil
} }
@ -47,11 +48,19 @@ func (s *AuthService) Logout(ctx *gin.Context) error {
return err return err
} }
ctx.SetCookie(SESSION_ID, "", 0, "/", "", false, true) s.clearCookie(ctx)
return nil return nil
} }
func (s *AuthService) clearCookie(ctx *gin.Context) {
ctx.SetCookie(SESSION_ID, "", 0, "/", "", false, true)
}
func (s *AuthService) setCookieFromSession(ctx *gin.Context, session *SessionItem) {
ctx.SetCookie(SESSION_ID, session.Id, int(time.Duration(time.Hour*24).Seconds()), "/", "", false, true)
}
func (s *AuthService) getSessionFromContext(ctx *gin.Context) (*SessionItem, error) { func (s *AuthService) getSessionFromContext(ctx *gin.Context) (*SessionItem, error) {
cookie, err := ctx.Cookie(SESSION_ID) cookie, err := ctx.Cookie(SESSION_ID)