Refactor auth package (#17962)

services/auth/source/oauth2/assert_interface_test.go

@@ -5,7 +5,7 @@
 package oauth2_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/oauth2"
 )
@@ -14,9 +14,9 @@ import (
 // It tightly binds the interfaces and implementation without breaking go import cycles
 
 type sourceInterface interface {
-	login.Config
-	login.SourceSettable
-	login.RegisterableSource
+	auth_model.Config
+	auth_model.SourceSettable
+	auth_model.RegisterableSource
 	auth.PasswordAuthenticator
 }
 

services/auth/source/oauth2/init.go

@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"sync"
 
-	"code.gitea.io/gitea/models/login"
+	"code.gitea.io/gitea/models/auth"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
@@ -52,19 +52,19 @@ func Init() error {
 	// Unlock our mutex
 	gothRWMutex.Unlock()
 
-	return initOAuth2LoginSources()
+	return initOAuth2Sources()
 }
 
 // ResetOAuth2 clears existing OAuth2 providers and loads them from DB
 func ResetOAuth2() error {
 	ClearProviders()
-	return initOAuth2LoginSources()
+	return initOAuth2Sources()
 }
 
-// initOAuth2LoginSources is used to load and register all active OAuth2 providers
-func initOAuth2LoginSources() error {
-	loginSources, _ := login.GetActiveOAuth2ProviderLoginSources()
-	for _, source := range loginSources {
+// initOAuth2Sources is used to load and register all active OAuth2 providers
+func initOAuth2Sources() error {
+	authSources, _ := auth.GetActiveOAuth2ProviderSources()
+	for _, source := range authSources {
 		oauth2Source, ok := source.Cfg.(*Source)
 		if !ok {
 			continue

services/auth/source/oauth2/providers.go

@@ -9,7 +9,7 @@ import (
 	"net/url"
 	"sort"
 
-	"code.gitea.io/gitea/models/login"
+	"code.gitea.io/gitea/models/auth"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
@@ -55,7 +55,7 @@ func NewImagedProvider(image string, provider GothProvider) *ImagedProvider {
 }
 
 // Providers contains the map of registered OAuth2 providers in Gitea (based on goth)
-// key is used to map the OAuth2Provider with the goth provider type (also in LoginSource.OAuth2Config.Provider)
+// key is used to map the OAuth2Provider with the goth provider type (also in AuthSource.OAuth2Config.Provider)
 // value is used to store display data
 var gothProviders = map[string]GothProvider{}
 
@@ -88,14 +88,14 @@ func GetOAuth2Providers() []Provider {
 func GetActiveOAuth2Providers() ([]string, map[string]Provider, error) {
 	// Maybe also separate used and unused providers so we can force the registration of only 1 active provider for each type
 
-	loginSources, err := login.GetActiveOAuth2ProviderLoginSources()
+	authSources, err := auth.GetActiveOAuth2ProviderSources()
 	if err != nil {
 		return nil, nil, err
 	}
 
 	var orderedKeys []string
 	providers := make(map[string]Provider)
-	for _, source := range loginSources {
+	for _, source := range authSources {
 		prov := gothProviders[source.Cfg.(*Source).Provider]
 		if source.Cfg.(*Source).IconURL != "" {
 			prov = &ImagedProvider{prov, source.Cfg.(*Source).IconURL}
@@ -140,8 +140,8 @@ func ClearProviders() {
 }
 
 var (
-	// ErrLoginSourceNotActived login source is not actived error
-	ErrLoginSourceNotActived = errors.New("Login source is not actived")
+	// ErrAuthSourceNotActived login source is not actived error
+	ErrAuthSourceNotActived = errors.New("auth source is not actived")
 )
 
 // used to create different types of goth providers
@@ -153,7 +153,7 @@ func createProvider(providerName string, source *Source) (goth.Provider, error)
 
 	p, ok := gothProviders[source.Provider]
 	if !ok {
-		return nil, ErrLoginSourceNotActived
+		return nil, ErrAuthSourceNotActived
 	}
 
 	provider, err = p.CreateGothProvider(providerName, callbackURL, source)

services/auth/source/oauth2/source.go

@@ -5,7 +5,7 @@
 package oauth2
 
 import (
-	"code.gitea.io/gitea/models/login"
+	"code.gitea.io/gitea/models/auth"
 	"code.gitea.io/gitea/modules/json"
 )
 
@@ -33,8 +33,8 @@ type Source struct {
 	RestrictedGroup    string
 	SkipLocalTwoFA     bool `json:",omitempty"`
 
-	// reference to the loginSource
-	loginSource *login.Source
+	// reference to the authSource
+	authSource *auth.Source
 }
 
 // FromDB fills up an OAuth2Config from serialized format.
@@ -47,11 +47,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.OAuth2, &Source{})
+	auth.RegisterTypeConfig(auth.OAuth2, &Source{})
 }

services/auth/source/oauth2/source_callout.go

@@ -14,7 +14,7 @@ import (
 // Callout redirects request/response pair to authenticate against the provider
 func (source *Source) Callout(request *http.Request, response http.ResponseWriter) error {
 	// not sure if goth is thread safe (?) when using multiple providers
-	request.Header.Set(ProviderHeaderKey, source.loginSource.Name)
+	request.Header.Set(ProviderHeaderKey, source.authSource.Name)
 
 	// don't use the default gothic begin handler to prevent issues when some error occurs
 	// normally the gothic library will write some custom stuff to the response instead of our own nice error page
@@ -34,7 +34,7 @@ func (source *Source) Callout(request *http.Request, response http.ResponseWrite
 // this will trigger a new authentication request, but because we save it in the session we can use that
 func (source *Source) Callback(request *http.Request, response http.ResponseWriter) (goth.User, error) {
 	// not sure if goth is thread safe (?) when using multiple providers
-	request.Header.Set(ProviderHeaderKey, source.loginSource.Name)
+	request.Header.Set(ProviderHeaderKey, source.authSource.Name)
 
 	gothRWMutex.RLock()
 	defer gothRWMutex.RUnlock()

services/auth/source/oauth2/source_register.go

@@ -10,13 +10,13 @@ import (
 
 // RegisterSource causes an OAuth2 configuration to be registered
 func (source *Source) RegisterSource() error {
-	err := RegisterProviderWithGothic(source.loginSource.Name, source)
-	return wrapOpenIDConnectInitializeError(err, source.loginSource.Name, source)
+	err := RegisterProviderWithGothic(source.authSource.Name, source)
+	return wrapOpenIDConnectInitializeError(err, source.authSource.Name, source)
 }
 
 // UnregisterSource causes an OAuth2 configuration to be unregistered
 func (source *Source) UnregisterSource() error {
-	RemoveProviderFromGothic(source.loginSource.Name)
+	RemoveProviderFromGothic(source.authSource.Name)
 	return nil
 }