From 360dd3c3bd8993afb853ecebcd6fc6d5c7daf596 Mon Sep 17 00:00:00 2001 From: Lakhan Samani Date: Sun, 5 Jun 2022 22:46:56 +0530 Subject: [PATCH] fix: redirect uri --- server/handlers/oauth_callback.go | 2 +- server/handlers/verify_email.go | 3 +-- server/resolvers/magic_link_login.go | 2 +- server/token/jwt.go | 3 --- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/server/handlers/oauth_callback.go b/server/handlers/oauth_callback.go index d384040..6801f0e 100644 --- a/server/handlers/oauth_callback.go +++ b/server/handlers/oauth_callback.go @@ -214,7 +214,7 @@ func OAuthCallbackHandler() gin.HandlerFunc { if strings.Contains(redirectURL, "?") { redirectURL = redirectURL + "&" + params } else { - redirectURL = redirectURL + "?" + params + redirectURL = redirectURL + "?" + strings.TrimPrefix(params, "&") } c.Redirect(http.StatusTemporaryRedirect, redirectURL) diff --git a/server/handlers/verify_email.go b/server/handlers/verify_email.go index a6e28e1..c3dd0c3 100644 --- a/server/handlers/verify_email.go +++ b/server/handlers/verify_email.go @@ -42,7 +42,6 @@ func VerifyEmailHandler() gin.HandlerFunc { // verify if token exists in db hostname := parsers.GetHost(c) - log.Debug("hostname used for jwt verification: ", hostname) claim, err := token.ParseJWTToken(tokenInQuery, hostname, verificationRequest.Nonce, verificationRequest.Email) if err != nil { log.Debug("Error parsing token: ", err) @@ -116,7 +115,7 @@ func VerifyEmailHandler() gin.HandlerFunc { if strings.Contains(redirectURL, "?") { redirectURL = redirectURL + "&" + params } else { - redirectURL = redirectURL + "?" + params + redirectURL = redirectURL + "?" + strings.TrimPrefix(params, "&") } go db.Provider.AddSession(models.Session{ diff --git a/server/resolvers/magic_link_login.go b/server/resolvers/magic_link_login.go index 713c850..541d622 100644 --- a/server/resolvers/magic_link_login.go +++ b/server/resolvers/magic_link_login.go @@ -197,7 +197,7 @@ func MagicLinkLoginResolver(ctx context.Context, params model.MagicLinkLoginInpu if strings.Contains(redirectURL, "?") { redirectURL = redirectURL + "&" + redirectURLParams } else { - redirectURL = redirectURL + "?" + redirectURLParams + redirectURL = redirectURL + "?" + strings.TrimPrefix(redirectURLParams, "&") } verificationType := constants.VerificationTypeMagicLinkLogin diff --git a/server/token/jwt.go b/server/token/jwt.go index 4ff8895..af7c020 100644 --- a/server/token/jwt.go +++ b/server/token/jwt.go @@ -4,7 +4,6 @@ import ( "errors" "github.com/golang-jwt/jwt" - log "github.com/sirupsen/logrus" "github.com/authorizerdev/authorizer/server/constants" "github.com/authorizerdev/authorizer/server/crypto" @@ -117,7 +116,6 @@ func ParseJWTToken(token, hostname, nonce, subject string) (jwt.MapClaims, error intIat := int64(claims["iat"].(float64)) claims["exp"] = intExp claims["iat"] = intIat - log.Debug("claims: ", claims) clientID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyClientID) if err != nil { return claims, err @@ -199,7 +197,6 @@ func ParseJWTTokenWithoutNonce(token, hostname string) (jwt.MapClaims, error) { intIat := int64(claims["iat"].(float64)) claims["exp"] = intExp claims["iat"] = intIat - log.Debug("claims: ", claims) clientID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyClientID) if err != nil { return claims, err