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

Merge branch 'main' of https://github.com/authorizerdev/authorizer into fix/forgot-password

Browse Source
This commit is contained in:
Lakhan Samani
2023-12-14 22:45:36 +05:30
parent 2a0e0da436 ed3100c179
commit c9c2789097
8 changed files with 73 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/resolvers/deactivate_account.go
View File

@@ -21,15 +21,15 @@ func DeactivateAccountResolver(ctx context.Context) (*model.Response, error) {
log.Debug("Failed to get GinContext: ", err)
return res, err
}
userID, err := token.GetUserIDFromSessionOrAccessToken(gc)
tokenData, err := token.GetUserIDFromSessionOrAccessToken(gc)
if err != nil {
log.Debug("Failed GetUserIDFromSessionOrAccessToken: ", err)
return res, err
}
log := log.WithFields(log.Fields{
"user_id": userID,
"user_id": tokenData.UserID,
})
user, err := db.Provider.GetUserByID(ctx, userID)
user, err := db.Provider.GetUserByID(ctx, tokenData.UserID)
if err != nil {
log.Debug("Failed to get user by id: ", err)
return res, err

27
server/resolvers/logout.go
View File

@@ -2,12 +2,10 @@ package resolvers
import (
"context"
"encoding/json"
log "github.com/sirupsen/logrus"
"github.com/authorizerdev/authorizer/server/cookie"
"github.com/authorizerdev/authorizer/server/crypto"
"github.com/authorizerdev/authorizer/server/graph/model"
"github.com/authorizerdev/authorizer/server/memorystore"
"github.com/authorizerdev/authorizer/server/token"
@@ -22,31 +20,18 @@ func LogoutResolver(ctx context.Context) (*model.Response, error) {
return nil, err
}
// get fingerprint hash
fingerprintHash, err := cookie.GetSession(gc)
tokenData, err := token.GetUserIDFromSessionOrAccessToken(gc)
if err != nil {
log.Debug("Failed to get fingerprint hash: ", err)
log.Debug("Failed GetUserIDFromSessionOrAccessToken: ", err)
return nil, err
}
decryptedFingerPrint, err := crypto.DecryptAES(fingerprintHash)
if err != nil {
log.Debug("Failed to decrypt fingerprint hash: ", err)
return nil, err
sessionKey := tokenData.UserID
if tokenData.LoginMethod != "" {
sessionKey = tokenData.LoginMethod + ":" + tokenData.UserID
}
var sessionData token.SessionData
err = json.Unmarshal([]byte(decryptedFingerPrint), &sessionData)
if err != nil {
return nil, err
}
sessionKey := sessionData.Subject
if sessionData.LoginMethod != "" {
sessionKey = sessionData.LoginMethod + ":" + sessionData.Subject
}
memorystore.Provider.DeleteUserSession(sessionKey, sessionData.Nonce)
memorystore.Provider.DeleteUserSession(sessionKey, tokenData.Nonce)
cookie.DeleteSession(gc)
res := &model.Response{

6
server/resolvers/profile.go
View File

@@ -20,15 +20,15 @@ func ProfileResolver(ctx context.Context) (*model.User, error) {
log.Debug("Failed to get GinContext: ", err)
return res, err
}
userID, err := token.GetUserIDFromSessionOrAccessToken(gc)
tokenData, err := token.GetUserIDFromSessionOrAccessToken(gc)
if err != nil {
log.Debug("Failed GetUserIDFromSessionOrAccessToken: ", err)
return res, err
}
log := log.WithFields(log.Fields{
"user_id": userID,
"user_id": tokenData.UserID,
})
user, err := db.Provider.GetUserByID(ctx, userID)
user, err := db.Provider.GetUserByID(ctx, tokenData.UserID)
if err != nil {
log.Debug("Failed to get user: ", err)
return res, err

6
server/resolvers/update_profile.go
View File

@@ -36,7 +36,7 @@ func UpdateProfileResolver(ctx context.Context, params model.UpdateProfileInput)
log.Debug("Failed to get GinContext: ", err)
return res, err
}
userID, err := token.GetUserIDFromSessionOrAccessToken(gc)
tokenData, err := token.GetUserIDFromSessionOrAccessToken(gc)
if err != nil {
log.Debug("Failed GetUserIDFromSessionOrAccessToken: ", err)
return res, err
@@ -48,9 +48,9 @@ func UpdateProfileResolver(ctx context.Context, params model.UpdateProfileInput)
return res, fmt.Errorf("please enter at least one param to update")
}
log := log.WithFields(log.Fields{
"user_id": userID,
"user_id": tokenData.UserID,
})
user, err := db.Provider.GetUserByID(ctx, userID)
user, err := db.Provider.GetUserByID(ctx, tokenData.UserID)
if err != nil {
log.Debug("Failed to get user by id: ", err)
return res, err

2
server/resolvers/update_user.go
View File

@@ -48,7 +48,7 @@ func UpdateUserResolver(ctx context.Context, params model.UpdateUserInput) (*mod
"user_id": params.ID,
})
if params.GivenName == nil && params.FamilyName == nil && params.Picture == nil && params.MiddleName == nil && params.Nickname == nil && params.Email == nil && params.Birthdate == nil && params.Gender == nil && params.PhoneNumber == nil && params.Roles == nil && params.IsMultiFactorAuthEnabled == nil {
if params.GivenName == nil && params.FamilyName == nil && params.Picture == nil && params.MiddleName == nil && params.Nickname == nil && params.Email == nil && params.Birthdate == nil && params.Gender == nil && params.PhoneNumber == nil && params.Roles == nil && params.IsMultiFactorAuthEnabled == nil && params.AppData == nil {
log.Debug("No params to update")
return res, fmt.Errorf("please enter atleast one param to update")
}