DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Fix error handling when retriving user data in AuthClient

Browse Source
This commit is contained in:
Mumbi Francis 2024-02-14 16:58:59 +03:00 committed by Mumbi Francis
parent 65cfca0c95
commit 4721a2b281
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/auth/handlers/handle_oauth2.go
View File

@ -395,12 +395,17 @@ func (h AuthHandlers) handleTokenRequest(req *request.AuthReq, client *types.Aut
sessionUserExists := req.AuthUser != nil && req.AuthUser.User != nil sessionUserExists := req.AuthUser != nil && req.AuthUser.User != nil
user, err = h.UserService.FindByAny(suCtx, userID) user, err = h.UserService.FindByAny(suCtx, userID)
if err != nil && !errors.Is(err, systemService.UserErrNotFound()) && sessionUserExists {
user = req.AuthUser.User if err != nil {
} else { if !errors.Is(err, systemService.UserErrNotFound()) {
return h.tokenError(w, fmt.Errorf("could not generate token: %v", err)) return h.tokenError(w, fmt.Errorf("could not generate token: %v", err))
} }
if errors.Is(err, systemService.UserErrNotFound()) && sessionUserExists {
user = req.AuthUser.User
}
}
if sessionUserExists && req.AuthUser.User.ID == cast.ToUint64(userID) { if sessionUserExists && req.AuthUser.User.ID == cast.ToUint64(userID) {
req.AuthUser.User = user req.AuthUser.User = user
req.AuthUser.Save(req.Session) req.AuthUser.Save(req.Session)