Arsharth/dex
1
0
Fork 0
forked from mystiq/dex
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #242 from ericchiang/duplicate_login

Browse source 
server: fix flow when user logs in through wrong connector
This commit is contained in:
bobbyrullo 2015-12-22 15:40:19 -08:00
commit 6c09576668
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
server/server.go
View file

@ -322,26 +322,22 @@ func (s *Server) Login(ident oidc.Identity, key string) (string, error) {
ConnectorID: ses.ConnectorID, ConnectorID: ses.ConnectorID,
ID: ses.Identity.ID, ID: ses.Identity.ID,
}) })
if err != nil { if err == user.ErrorNotFound {
if err == user.ErrorNotFound { // Does the user have an existing account with a different connector?
// If has authenticated via a connector, but no local identity there if ses.Identity.Email != "" {
// are a couple of possibilities: connID, err := getConnectorForUserByEmail(s.UserRepo, ses.Identity.Email)
if err == nil {
// * Maybe they are using the wrong connector: // Ask user to sign in through existing account.
if ses.Identity.Email != "" { u := newLoginURLFromSession(s.IssuerURL, ses, false, []string{connID}, "wrong-connector")
if connID, err := getConnectorForUserByEmail(s.UserRepo, return u.String(), nil
ses.Identity.Email); err == nil {
return newLoginURLFromSession(s.IssuerURL,
ses, true, []string{connID},
"wrong-connector").String(), nil
}
} }
// * User needs to register
return newLoginURLFromSession(s.IssuerURL,
ses, true, []string{ses.ConnectorID}, "register-maybe").String(), nil
} }
// User doesn't have an existing account. Ask them to register.
u := newLoginURLFromSession(s.IssuerURL, ses, true, []string{ses.ConnectorID}, "register-maybe")
return u.String(), nil
}
if err != nil {
return "", err return "", err
} }