diff --git a/api-userpage.go b/api-userpage.go index 4592b90..f29a3d7 100644 --- a/api-userpage.go +++ b/api-userpage.go @@ -94,7 +94,7 @@ func (app *appContext) SetMyContactMethods(gc *gin.Context) { // @Security Bearer // @tags User Page func (app *appContext) LogoutUser(gc *gin.Context) { - cookie, err := gc.Cookie("refresh") + cookie, err := gc.Cookie("user-refresh") if err != nil { app.debug.Printf("Couldn't get cookies: %s", err) respond(500, "Couldn't fetch cookies", gc) diff --git a/auth.go b/auth.go index d0fab2d..c1754e4 100644 --- a/auth.go +++ b/auth.go @@ -237,9 +237,9 @@ func (app *appContext) getTokenLogin(gc *gin.Context) { gc.JSON(200, getTokenDTO{token}) } -func (app *appContext) decodeValidateRefreshCookie(gc *gin.Context) (claims jwt.MapClaims, ok bool) { +func (app *appContext) decodeValidateRefreshCookie(gc *gin.Context, cookieName string) (claims jwt.MapClaims, ok bool) { ok = false - cookie, err := gc.Cookie("refresh") + cookie, err := gc.Cookie(cookieName) if err != nil || cookie == "" { app.debug.Printf("getTokenRefresh denied: Couldn't get token: %s", err) respond(400, "Couldn't get token", gc) @@ -285,7 +285,7 @@ func (app *appContext) decodeValidateRefreshCookie(gc *gin.Context) (claims jwt. // @tags Auth func (app *appContext) getTokenRefresh(gc *gin.Context) { app.debug.Println("Token requested (refresh token)") - claims, ok := app.decodeValidateRefreshCookie(gc) + claims, ok := app.decodeValidateRefreshCookie(gc, "refresh") if !ok { return } diff --git a/user-auth.go b/user-auth.go index bc26d4b..40ea057 100644 --- a/user-auth.go +++ b/user-auth.go @@ -60,7 +60,7 @@ func (app *appContext) getUserTokenLogin(gc *gin.Context) { } app.debug.Printf("Token generated for non-admin user \"%s\"", username) - gc.SetCookie("refresh", refresh, REFRESH_TOKEN_VALIDITY_SEC, "/my", gc.Request.URL.Hostname(), true, true) + gc.SetCookie("user-refresh", refresh, REFRESH_TOKEN_VALIDITY_SEC, "/my", gc.Request.URL.Hostname(), true, true) gc.JSON(200, getTokenDTO{token}) } @@ -79,7 +79,7 @@ func (app *appContext) getUserTokenRefresh(gc *gin.Context) { } app.info.Println("UserToken request (refresh token)") - claims, ok := app.decodeValidateRefreshCookie(gc) + claims, ok := app.decodeValidateRefreshCookie(gc, "user-refresh") if !ok { return } @@ -93,6 +93,6 @@ func (app *appContext) getUserTokenRefresh(gc *gin.Context) { return } - gc.SetCookie("refresh", refresh, REFRESH_TOKEN_VALIDITY_SEC, "/my", gc.Request.URL.Hostname(), true, true) + gc.SetCookie("user-refresh", refresh, REFRESH_TOKEN_VALIDITY_SEC, "/my", gc.Request.URL.Hostname(), true, true) gc.JSON(200, getTokenDTO{jwt}) }