use signin instead of login

Author: wxiaoguang

custom/conf/app.example.ini

@@ -786,7 +786,7 @@ LEVEL = Info
 ;;
 ;; Show the password login form (for password-based login), otherwise, only show OAuth2 login methods.
 ;; If you set it to false, maybe it also needs to set ENABLE_BASIC_AUTHENTICATION to false to completely disable password-based authentication.
-;ENABLE_PASSWORD_LOGIN_FORM = true
+;ENABLE_PASSWORD_SIGNIN_FORM = true
 ;;
 ;; More detail: https://github.com/gogits/gogs/issues/165
 ;ENABLE_REVERSE_PROXY_AUTHENTICATION = false

modules/setting/service.go

@@ -41,7 +41,7 @@ var Service = struct {
 	AllowOnlyInternalRegistration           bool
 	AllowOnlyExternalRegistration           bool
 	ShowRegistrationButton                  bool
-	EnablePasswordLoginForm                 bool
+	EnablePasswordSignInForm                bool
 	ShowMilestonesDashboardPage             bool
 	RequireSignInView                       bool
 	EnableNotifyMail                        bool
@@ -160,7 +160,7 @@ func loadServiceFrom(rootCfg ConfigProvider) {
 	Service.ShowMilestonesDashboardPage = sec.Key("SHOW_MILESTONES_DASHBOARD_PAGE").MustBool(true)
 	Service.RequireSignInView = sec.Key("REQUIRE_SIGNIN_VIEW").MustBool()
 	Service.EnableBasicAuth = sec.Key("ENABLE_BASIC_AUTHENTICATION").MustBool(true)
-	Service.EnablePasswordLoginForm = sec.Key("ENABLE_PASSWORD_LOGIN_FORM").MustBool(true)
+	Service.EnablePasswordSignInForm = sec.Key("ENABLE_PASSWORD_SIGNIN_FORM").MustBool(true)
 	Service.EnableReverseProxyAuth = sec.Key("ENABLE_REVERSE_PROXY_AUTHENTICATION").MustBool()
 	Service.EnableReverseProxyAuthAPI = sec.Key("ENABLE_REVERSE_PROXY_AUTHENTICATION_API").MustBool()
 	Service.EnableReverseProxyAutoRegister = sec.Key("ENABLE_REVERSE_PROXY_AUTO_REGISTRATION").MustBool()

routers/web/auth/auth.go

@@ -160,15 +160,15 @@ func CheckAutoLogin(ctx *context.Context) bool {
 	return false
 }
 
-func prepareSignPageData(ctx *context.Context) {
+func prepareSignInPageData(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("sign_in")
 	ctx.Data["OAuth2Providers"], _ = oauth2.GetOAuth2Providers(ctx, optional.Some(true))
 	ctx.Data["Title"] = ctx.Tr("sign_in")
 	ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login"
 	ctx.Data["PageIsSignIn"] = true
 	ctx.Data["PageIsLogin"] = true
 	ctx.Data["EnableSSPI"] = auth.IsSSPIEnabled(ctx)
-	ctx.Data["EnablePasswordLoginForm"] = setting.Service.EnablePasswordLoginForm
+	ctx.Data["EnablePasswordSignInForm"] = setting.Service.EnablePasswordSignInForm
 
 	if setting.Service.EnableCaptcha && setting.Service.RequireCaptchaForLogin {
 		context.SetCaptchaData(ctx)
@@ -184,18 +184,18 @@ func SignIn(ctx *context.Context) {
 		RedirectAfterLogin(ctx)
 		return
 	}
-	prepareSignPageData(ctx)
+	prepareSignInPageData(ctx)
 	ctx.HTML(http.StatusOK, tplSignIn)
 }
 
 // SignInPost response for sign in request
 func SignInPost(ctx *context.Context) {
-	if !setting.Service.EnablePasswordLoginForm {
+	if !setting.Service.EnablePasswordSignInForm {
 		ctx.Error(http.StatusForbidden)
 		return
 	}
 
-	prepareSignPageData(ctx)
+	prepareSignInPageData(ctx)
 	if ctx.HasError() {
 		ctx.HTML(http.StatusOK, tplSignIn)
 		return

templates/user/auth/signin_inner.tmpl

@@ -10,7 +10,7 @@
 		{{end}}
 	</h4>
 	<div class="ui attached segment">
-		{{if .EnablePasswordLoginForm}}
+		{{if .EnablePasswordSignInForm}}
 		<form class="ui form" action="{{.SignInLink}}" method="post">
 			{{.CsrfTokenHtml}}
 			<div class="required field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
@@ -47,8 +47,8 @@
 				</button>
 			</div>
 		</form>
-		{{end}}{{/*if .EnablePasswordLoginForm*/}}
-		{{if and .OAuth2Providers .EnableOpenIDSignIn .EnablePasswordLoginForm}}
+		{{end}}{{/*if .EnablePasswordSignInForm*/}}
+		{{if and .OAuth2Providers .EnableOpenIDSignIn .EnablePasswordSignInForm}}
 			<div class="divider divider-text">{{ctx.Locale.Tr "sign_in_or"}}</div>
 		{{end}}
 		{{if and .OAuth2Providers .EnableOpenIDSignIn}}

tests/integration/signin_test.go

@@ -93,12 +93,12 @@ func TestSigninWithRememberMe(t *testing.T) {
 	session.MakeRequest(t, req, http.StatusOK)
 }
 
-func TestEnablePasswordLoginForm(t *testing.T) {
+func TestEnablePasswordSignInForm(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 
-	t.Run("EnablePasswordLoginForm=false", func(t *testing.T) {
+	t.Run("EnablePasswordSignInForm=false", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
-		defer test.MockVariableValue(&setting.Service.EnablePasswordLoginForm, false)()
+		defer test.MockVariableValue(&setting.Service.EnablePasswordSignInForm, false)()
 
 		req := NewRequest(t, "GET", "/user/login")
 		resp := MakeRequest(t, req, http.StatusOK)
@@ -108,9 +108,9 @@ func TestEnablePasswordLoginForm(t *testing.T) {
 		MakeRequest(t, req, http.StatusForbidden)
 	})
 
-	t.Run("EnablePasswordLoginForm=true", func(t *testing.T) {
+	t.Run("EnablePasswordSignInForm=true", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
-		defer test.MockVariableValue(&setting.Service.EnablePasswordLoginForm, true)()
+		defer test.MockVariableValue(&setting.Service.EnablePasswordSignInForm, true)()
 
 		req := NewRequest(t, "GET", "/user/login")
 		resp := MakeRequest(t, req, http.StatusOK)