diff options
| author | zeripath <art27@cantab.net> | 2021-09-17 12:43:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 12:43:47 +0100 |
| commit | 27b351aba564804f65e5574919a88d6194c75256 (patch) | |
| tree | fa4857e05e344693e629aa14b05b7f8ffba42cfc /routers/web/user/auth_openid.go | |
| parent | f96d0d3d5b2acb3545c3a2ced7972879a9750c9d (diff) | |
| download | gitea-27b351aba564804f65e5574919a88d6194c75256.tar.gz gitea-27b351aba564804f65e5574919a88d6194c75256.zip | |
Make LDAP be able to skip local 2FA (#16954)
This PR extends #16594 to allow LDAP to be able to be set to skip local 2FA too. The technique used here would be extensible to PAM and SMTP sources.
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'routers/web/user/auth_openid.go')
| -rw-r--r-- | routers/web/user/auth_openid.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/routers/web/user/auth_openid.go b/routers/web/user/auth_openid.go index fc419a7f6e..e6ad6fef4c 100644 --- a/routers/web/user/auth_openid.go +++ b/routers/web/user/auth_openid.go @@ -291,7 +291,7 @@ func ConnectOpenIDPost(ctx *context.Context) { ctx.Data["EnableOpenIDSignUp"] = setting.Service.EnableOpenIDSignUp ctx.Data["OpenID"] = oid - u, err := auth.UserSignIn(form.UserName, form.Password) + u, _, err := auth.UserSignIn(form.UserName, form.Password) if err != nil { if models.IsErrUserNotExist(err) { ctx.RenderWithErr(ctx.Tr("form.username_password_incorrect"), tplConnectOID, &form) |