|
|
|
@ -13,7 +13,9 @@ import ( |
|
|
|
|
user_model "code.gitea.io/gitea/models/user" |
|
|
|
|
"code.gitea.io/gitea/modules/base" |
|
|
|
|
"code.gitea.io/gitea/modules/context" |
|
|
|
|
"code.gitea.io/gitea/modules/log" |
|
|
|
|
"code.gitea.io/gitea/modules/setting" |
|
|
|
|
"code.gitea.io/gitea/modules/util" |
|
|
|
|
"code.gitea.io/gitea/modules/web" |
|
|
|
|
auth_service "code.gitea.io/gitea/services/auth" |
|
|
|
|
"code.gitea.io/gitea/services/auth/source/oauth2" |
|
|
|
@ -81,6 +83,32 @@ func LinkAccount(ctx *context.Context) { |
|
|
|
|
ctx.HTML(http.StatusOK, tplLinkAccount) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func handleSignInError(ctx *context.Context, userName string, ptrForm any, tmpl base.TplName, invoker string, err error) { |
|
|
|
|
if errors.Is(err, util.ErrNotExist) { |
|
|
|
|
ctx.RenderWithErr(ctx.Tr("form.username_password_incorrect"), tmpl, ptrForm) |
|
|
|
|
} else if errors.Is(err, util.ErrInvalidArgument) { |
|
|
|
|
ctx.Data["user_exists"] = true |
|
|
|
|
ctx.RenderWithErr(ctx.Tr("form.username_password_incorrect"), tmpl, ptrForm) |
|
|
|
|
} else if user_model.IsErrUserProhibitLogin(err) { |
|
|
|
|
ctx.Data["user_exists"] = true |
|
|
|
|
log.Info("Failed authentication attempt for %s from %s: %v", userName, ctx.RemoteAddr(), err) |
|
|
|
|
ctx.Data["Title"] = ctx.Tr("auth.prohibit_login") |
|
|
|
|
ctx.HTML(http.StatusOK, "user/auth/prohibit_login") |
|
|
|
|
} else if user_model.IsErrUserInactive(err) { |
|
|
|
|
ctx.Data["user_exists"] = true |
|
|
|
|
if setting.Service.RegisterEmailConfirm { |
|
|
|
|
ctx.Data["Title"] = ctx.Tr("auth.active_your_account") |
|
|
|
|
ctx.HTML(http.StatusOK, TplActivate) |
|
|
|
|
} else { |
|
|
|
|
log.Info("Failed authentication attempt for %s from %s: %v", userName, ctx.RemoteAddr(), err) |
|
|
|
|
ctx.Data["Title"] = ctx.Tr("auth.prohibit_login") |
|
|
|
|
ctx.HTML(http.StatusOK, "user/auth/prohibit_login") |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
ctx.ServerError(invoker, err) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// LinkAccountPostSignIn handle the coupling of external account with another account using signIn
|
|
|
|
|
func LinkAccountPostSignIn(ctx *context.Context) { |
|
|
|
|
signInForm := web.GetForm(ctx).(*forms.SignInForm) |
|
|
|
@ -116,12 +144,7 @@ func LinkAccountPostSignIn(ctx *context.Context) { |
|
|
|
|
|
|
|
|
|
u, _, err := auth_service.UserSignIn(signInForm.UserName, signInForm.Password) |
|
|
|
|
if err != nil { |
|
|
|
|
if user_model.IsErrUserNotExist(err) { |
|
|
|
|
ctx.Data["user_exists"] = true |
|
|
|
|
ctx.RenderWithErr(ctx.Tr("form.username_password_incorrect"), tplLinkAccount, &signInForm) |
|
|
|
|
} else { |
|
|
|
|
ctx.ServerError("UserLinkAccount", err) |
|
|
|
|
} |
|
|
|
|
handleSignInError(ctx, signInForm.UserName, &signInForm, tplLinkAccount, "UserLinkAccount", err) |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|