Refactor auth package (#17962)

services/auth/source/pam/assert_interface_test.go

@@ -5,7 +5,7 @@
 package pam_test
 
 import (
-	"code.gitea.io/gitea/models/login"
+	auth_model "code.gitea.io/gitea/models/auth"
 	"code.gitea.io/gitea/services/auth"
 	"code.gitea.io/gitea/services/auth/source/pam"
 )
@@ -15,8 +15,8 @@ import (
 
 type sourceInterface interface {
 	auth.PasswordAuthenticator
-	login.Config
-	login.SourceSettable
+	auth_model.Config
+	auth_model.SourceSettable
 }
 
 var _ (sourceInterface) = &pam.Source{}

services/auth/source/pam/source.go

@@ -5,7 +5,7 @@
 package pam
 
 import (
-	"code.gitea.io/gitea/models/login"
+	"code.gitea.io/gitea/models/auth"
 	"code.gitea.io/gitea/modules/json"
 )
 
@@ -22,8 +22,8 @@ type Source struct {
 	EmailDomain    string
 	SkipLocalTwoFA bool `json:",omitempty"` // Skip Local 2fa for users authenticated with this source
 
-	// reference to the loginSource
-	loginSource *login.Source
+	// reference to the authSource
+	authSource *auth.Source
 }
 
 // FromDB fills up a PAMConfig from serialized format.
@@ -36,11 +36,11 @@ func (source *Source) ToDB() ([]byte, error) {
 	return json.Marshal(source)
 }
 
-// SetLoginSource sets the related LoginSource
-func (source *Source) SetLoginSource(loginSource *login.Source) {
-	source.loginSource = loginSource
+// SetAuthSource sets the related AuthSource
+func (source *Source) SetAuthSource(authSource *auth.Source) {
+	source.authSource = authSource
 }
 
 func init() {
-	login.RegisterTypeConfig(login.PAM, &Source{})
+	auth.RegisterTypeConfig(auth.PAM, &Source{})
 }

services/auth/source/pam/source_authenticate.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"strings"
 
-	"code.gitea.io/gitea/models/login"
+	"code.gitea.io/gitea/models/auth"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/auth/pam"
 	"code.gitea.io/gitea/modules/setting"
@@ -55,8 +55,8 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str
 		Name:        username,
 		Email:       email,
 		Passwd:      password,
-		LoginType:   login.PAM,
-		LoginSource: source.loginSource.ID,
+		LoginType:   auth.PAM,
+		LoginSource: source.authSource.ID,
 		LoginName:   userName, // This is what the user typed in
 		IsActive:    true,
 	}