From b8dff86a56f70442a7ce83366f7ffcd97d872c79 Mon Sep 17 00:00:00 2001 From: Nityananda Gohain Date: Thu, 15 May 2025 12:52:14 +0530 Subject: [PATCH] fix: refresh token to access token (#7949) * fix: fix refresh token to access token * fix: update the if condition --- ee/modules/user/impluser/handler.go | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/ee/modules/user/impluser/handler.go b/ee/modules/user/impluser/handler.go index 9335bdba8e..6599c1e491 100644 --- a/ee/modules/user/impluser/handler.go +++ b/ee/modules/user/impluser/handler.go @@ -38,19 +38,21 @@ func (h *Handler) Login(w http.ResponseWriter, r *http.Request) { return } - // the EE handler wrapper passes the feature flag value in context - ssoAvailable, ok := ctx.Value(types.SSOAvailable).(bool) - if !ok { - render.Error(w, errors.New(errors.TypeInternal, errors.CodeInternal, "failed to retrieve SSO availability")) - return - } - - if ssoAvailable { - _, err := h.module.CanUsePassword(ctx, req.Email) - if err != nil { - render.Error(w, err) + if req.RefreshToken == "" { + // the EE handler wrapper passes the feature flag value in context + ssoAvailable, ok := ctx.Value(types.SSOAvailable).(bool) + if !ok { + render.Error(w, errors.New(errors.TypeInternal, errors.CodeInternal, "failed to retrieve SSO availability")) return } + + if ssoAvailable { + _, err := h.module.CanUsePassword(ctx, req.Email) + if err != nil { + render.Error(w, err) + return + } + } } user, err := h.module.GetAuthenticatedUser(ctx, req.OrgID, req.Email, req.Password, req.RefreshToken)