devstack/authorizer
4
0
Fork 0
Code Pull Requests Actions Activity

fix: redirect uri

Browse Source
This commit is contained in:
Lakhan Samani 2022-06-05 22:46:56 +05:30
parent c6add0cca6
commit 360dd3c3bd
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/handlers/oauth_callback.go
View File

@ -214,7 +214,7 @@ func OAuthCallbackHandler() gin.HandlerFunc {
if strings.Contains(redirectURL, "?") { if strings.Contains(redirectURL, "?") {
redirectURL = redirectURL + "&" + params redirectURL = redirectURL + "&" + params
} else { } else {
redirectURL = redirectURL + "?" + params redirectURL = redirectURL + "?" + strings.TrimPrefix(params, "&")
} }
c.Redirect(http.StatusTemporaryRedirect, redirectURL) c.Redirect(http.StatusTemporaryRedirect, redirectURL)

3
server/handlers/verify_email.go
View File

@ -42,7 +42,6 @@ func VerifyEmailHandler() gin.HandlerFunc {
// verify if token exists in db // verify if token exists in db
hostname := parsers.GetHost(c) hostname := parsers.GetHost(c)
log.Debug("hostname used for jwt verification: ", hostname)
claim, err := token.ParseJWTToken(tokenInQuery, hostname, verificationRequest.Nonce, verificationRequest.Email) claim, err := token.ParseJWTToken(tokenInQuery, hostname, verificationRequest.Nonce, verificationRequest.Email)
if err != nil { if err != nil {
log.Debug("Error parsing token: ", err) log.Debug("Error parsing token: ", err)
@ -116,7 +115,7 @@ func VerifyEmailHandler() gin.HandlerFunc {
if strings.Contains(redirectURL, "?") { if strings.Contains(redirectURL, "?") {
redirectURL = redirectURL + "&" + params redirectURL = redirectURL + "&" + params
} else { } else {
redirectURL = redirectURL + "?" + params redirectURL = redirectURL + "?" + strings.TrimPrefix(params, "&")
} }
go db.Provider.AddSession(models.Session{ go db.Provider.AddSession(models.Session{

2
server/resolvers/magic_link_login.go
View File

@ -197,7 +197,7 @@ func MagicLinkLoginResolver(ctx context.Context, params model.MagicLinkLoginInpu
if strings.Contains(redirectURL, "?") { if strings.Contains(redirectURL, "?") {
redirectURL = redirectURL + "&" + redirectURLParams redirectURL = redirectURL + "&" + redirectURLParams
} else { } else {
redirectURL = redirectURL + "?" + redirectURLParams redirectURL = redirectURL + "?" + strings.TrimPrefix(redirectURLParams, "&")
} }
verificationType := constants.VerificationTypeMagicLinkLogin verificationType := constants.VerificationTypeMagicLinkLogin

3
server/token/jwt.go
View File

@ -4,7 +4,6 @@ import (
"errors" "errors"
"github.com/golang-jwt/jwt" "github.com/golang-jwt/jwt"
log "github.com/sirupsen/logrus"
"github.com/authorizerdev/authorizer/server/constants" "github.com/authorizerdev/authorizer/server/constants"
"github.com/authorizerdev/authorizer/server/crypto" "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)) intIat := int64(claims["iat"].(float64))
claims["exp"] = intExp claims["exp"] = intExp
claims["iat"] = intIat claims["iat"] = intIat
log.Debug("claims: ", claims)
clientID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyClientID) clientID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyClientID)
if err != nil { if err != nil {
return claims, err return claims, err
@ -199,7 +197,6 @@ func ParseJWTTokenWithoutNonce(token, hostname string) (jwt.MapClaims, error) {
intIat := int64(claims["iat"].(float64)) intIat := int64(claims["iat"].(float64))
claims["exp"] = intExp claims["exp"] = intExp
claims["iat"] = intIat claims["iat"] = intIat
log.Debug("claims: ", claims)
clientID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyClientID) clientID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyClientID)
if err != nil { if err != nil {
return claims, err return claims, err