TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-10-21 15:29:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: external login (#818)

Browse Source 
* fix: external login

* fix: external login
This commit is contained in:
Fabi
2020-10-07 16:29:56 +02:00
committed by GitHub
parent a19b4d2659
commit 56d5704749
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/auth/repository/eventsourcing/eventstore/auth_request.go
View File

@@ -172,7 +172,10 @@ func (repo *AuthRequestRepo) CheckExternalUserLogin(ctx context.Context, authReq
} }
err = repo.checkExternalUserLogin(request, externalUser.IDPConfigID, externalUser.ExternalUserID) err = repo.checkExternalUserLogin(request, externalUser.IDPConfigID, externalUser.ExternalUserID)
if errors.IsNotFound(err) { if errors.IsNotFound(err) {
return repo.setLinkingUser(ctx, request, externalUser) if err := repo.setLinkingUser(ctx, request, externalUser); err != nil {
return err
}
return err
} }
if err != nil { if err != nil {
return err return err

5
internal/ui/login/handler/external_login_handler.go
View File

@@ -133,7 +133,10 @@ func (l *Login) handleExternalUserAuthenticated(w http.ResponseWriter, r *http.R
externalUser := l.mapTokenToLoginUser(tokens, idpConfig) externalUser := l.mapTokenToLoginUser(tokens, idpConfig)
err := l.authRepo.CheckExternalUserLogin(r.Context(), authReq.ID, userAgentID, externalUser, model.BrowserInfoFromRequest(r)) err := l.authRepo.CheckExternalUserLogin(r.Context(), authReq.ID, userAgentID, externalUser, model.BrowserInfoFromRequest(r))
if err != nil { if err != nil {
l.renderExternalNotFoundOption(w, r, authReq, nil) if errors.IsNotFound(err) {
err = nil
}
l.renderExternalNotFoundOption(w, r, authReq, err)
return return
} }
l.renderNextStep(w, r, authReq) l.renderNextStep(w, r, authReq)

2
internal/user/repository/eventsourcing/user.go
View File

@@ -466,7 +466,7 @@ func PasswordCodeSentAggregate(aggCreator *es_models.AggregateCreator, user *mod
func ExternalLoginCheckSucceededAggregate(aggCreator *es_models.AggregateCreator, user *model.User, check *model.AuthRequest) es_sdk.AggregateFunc { func ExternalLoginCheckSucceededAggregate(aggCreator *es_models.AggregateCreator, user *model.User, check *model.AuthRequest) es_sdk.AggregateFunc {
return func(ctx context.Context) (*es_models.Aggregate, error) { return func(ctx context.Context) (*es_models.Aggregate, error) {
agg, err := UserAggregate(ctx, aggCreator, user) agg, err := UserAggregateOverwriteContext(ctx, aggCreator, user, user.ResourceOwner, user.AggregateID)
if err != nil { if err != nil {
return nil, err return nil, err
} }