Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: revert refactor resource owner password grant #1466

Merged
merged 1 commit into from
Mar 4, 2024
Merged

fix: revert refactor resource owner password grant #1466

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions internal/api/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,29 +117,27 @@ func (a *API) ResourceOwnerPasswordGrant(ctx context.Context, w http.ResponseWri

grantParams.FillGrantParams(r)

switch {
case params.Email != "" && config.External.Email.Enabled:
if params.Email != "" {
provider = "email"
if !config.External.Email.Enabled {
return badRequestError("Email logins are disabled")
}
user, err = models.FindUserByEmailAndAudience(db, params.Email, aud)

case params.Phone != "" && config.External.Phone.Enabled:
} else if params.Phone != "" {
provider = "phone"
if !config.External.Phone.Enabled {
return badRequestError("Phone logins are disabled")
}
params.Phone = formatPhoneNumber(params.Phone)
user, err = models.FindUserByPhoneAndAudience(db, params.Phone, aud)

case !config.External.Email.Enabled:
return badRequestError("Email logins are disabled")

case !config.External.Phone.Enabled:
return badRequestError("Phone logins are disabled")

default:
} else {
return oauthError("invalid_grant", InvalidLoginMessage)
}

if err != nil && models.IsNotFoundError(err) {
return oauthError("invalid_grant", InvalidLoginMessage)
} else if err != nil {
if err != nil {
if models.IsNotFoundError(err) {
return oauthError("invalid_grant", InvalidLoginMessage)
}
return internalServerError("Database error querying schema").WithInternalError(err)
}

Expand Down
Loading