From 1c4e29fa7c567588772abb34a6977598f36a00cc Mon Sep 17 00:00:00 2001 From: Lakhan Samani Date: Tue, 29 Nov 2022 05:27:29 +0530 Subject: [PATCH] fix: access_token renew + web_message redirect --- server/handlers/authorize.go | 7 ++++--- server/middlewares/cors.go | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/handlers/authorize.go b/server/handlers/authorize.go index c3e2e2a..cf86ee6 100644 --- a/server/handlers/authorize.go +++ b/server/handlers/authorize.go @@ -139,6 +139,7 @@ func AuthorizeHandler() gin.HandlerFunc { "error_description": "code challenge is required", }, }, http.StatusOK) + return } loginError := map[string]interface{}{ @@ -268,7 +269,7 @@ func AuthorizeHandler() gin.HandlerFunc { return } - if err := memorystore.Provider.SetUserSession(sessionKey, constants.TokenTypeAccessToken+"_"+nonce, authToken.FingerPrintHash); err != nil { + if err := memorystore.Provider.SetUserSession(sessionKey, constants.TokenTypeAccessToken+"_"+nonce, authToken.AccessToken.Token); err != nil { log.Debug("SetUserSession failed: ", err) handleResponse(gc, responseMode, loginURL, redirectURI, loginError, http.StatusOK) return @@ -321,6 +322,7 @@ func AuthorizeHandler() gin.HandlerFunc { } handleResponse(gc, responseMode, loginURL, redirectURI, loginError, http.StatusOK) + return } } @@ -349,14 +351,13 @@ func handleResponse(gc *gin.Context, responseMode, loginURI, redirectURI string, isAuthenticationRequired = true } - if isAuthenticationRequired { + if isAuthenticationRequired && responseMode != constants.ResponseModeWebMessage { gc.Redirect(http.StatusFound, loginURI) return } switch responseMode { case constants.ResponseModeQuery, constants.ResponseModeFragment: - gc.Redirect(http.StatusFound, redirectURI) return case constants.ResponseModeWebMessage: diff --git a/server/middlewares/cors.go b/server/middlewares/cors.go index ee3b9c3..2c9c5d1 100644 --- a/server/middlewares/cors.go +++ b/server/middlewares/cors.go @@ -9,7 +9,6 @@ import ( func CORSMiddleware() gin.HandlerFunc { return func(c *gin.Context) { origin := c.Request.Header.Get("Origin") - if validators.IsValidOrigin(origin) { c.Writer.Header().Set("Access-Control-Allow-Origin", origin) }