From d7a9f177922d519188a293b549a377c7d4d6c176 Mon Sep 17 00:00:00 2001 From: genofire Date: Tue, 20 Sep 2022 20:57:06 +0200 Subject: [PATCH] feat(web/auth): add IsLoginWithUserID for request without exit --- web/auth/lib_user.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/web/auth/lib_user.go b/web/auth/lib_user.go index 36bd023..1c6734e 100644 --- a/web/auth/lib_user.go +++ b/web/auth/lib_user.go @@ -12,15 +12,12 @@ import ( "dev.sum7.eu/genofire/golang-lib/web" ) -// GetCurrentUserID get UserID of session in golang-gin -func GetCurrentUserID(c *gin.Context) (uuid.UUID, bool) { +// IsLoginWithUserID get UserID of session in golang-gin +func IsLoginWithUserID(c *gin.Context) (uuid.UUID, bool) { session := sessions.Default(c) v := session.Get("user_id") if v == nil { - c.JSON(http.StatusUnauthorized, web.HTTPError{ - Message: ErrAPINoSession.Error(), - }) return uuid.Nil, false } @@ -28,6 +25,17 @@ func GetCurrentUserID(c *gin.Context) (uuid.UUID, bool) { return id, true } +// GetCurrentUserID get UserID of session in golang-gin +func GetCurrentUserID(c *gin.Context) (uuid.UUID, bool) { + id, ok := IsLoginWithUserID(c) + if !ok { + c.JSON(http.StatusUnauthorized, web.HTTPError{ + Message: ErrAPINoSession.Error(), + }) + } + return id, ok +} + // GetCurrentUser get User of session from database in golang-gin func GetCurrentUser(c *gin.Context, ws *web.Service) (*User, bool) { id, ok := GetCurrentUserID(c)