Extract out login-sources from models

Signed-off-by: Andrew Thornton <art27@cantab.net>

Author: zeripath

cmd/admin.go

@@ -15,6 +15,8 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/auth/oauth2"
+	oauth2Service "code.gitea.io/gitea/services/auth/source/oauth2"
+
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/graceful"
 	"code.gitea.io/gitea/modules/log"
@@ -597,7 +599,7 @@ func runRegenerateKeys(_ *cli.Context) error {
 	return models.RewriteAllPublicKeys()
 }
 
-func parseOAuth2Config(c *cli.Context) *models.OAuth2Config {
+func parseOAuth2Config(c *cli.Context) *oauth2Service.Source {
 	var customURLMapping *oauth2.CustomURLMapping
 	if c.IsSet("use-custom-urls") {
 		customURLMapping = &oauth2.CustomURLMapping{
@@ -609,7 +611,7 @@ func parseOAuth2Config(c *cli.Context) *models.OAuth2Config {
 	} else {
 		customURLMapping = nil
 	}
-	return &models.OAuth2Config{
+	return &oauth2Service.Source{
 		Provider:                      c.String("provider"),
 		ClientID:                      c.String("key"),
 		ClientSecret:                  c.String("secret"),
@@ -646,7 +648,7 @@ func runUpdateOauth(c *cli.Context) error {
 		return err
 	}
 
-	oAuth2Config := source.OAuth2()
+	oAuth2Config := source.Cfg.(*oauth2Service.Source)
 
 	if c.IsSet("name") {
 		source.Name = c.String("name")

cmd/admin_auth_ldap.go

@@ -10,6 +10,7 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/auth/ldap"
+	ldapService "code.gitea.io/gitea/services/auth/source/ldap"
 
 	"github.com/urfave/cli"
 )
@@ -180,7 +181,7 @@ func parseLoginSource(c *cli.Context, loginSource *models.LoginSource) {
 }
 
 // parseLdapConfig assigns values on config according to command line flags.
-func parseLdapConfig(c *cli.Context, config *models.LDAPConfig) error {
+func parseLdapConfig(c *cli.Context, config *ldapService.Source) error {
 	if c.IsSet("name") {
 		config.Source.Name = c.String("name")
 	}
@@ -251,7 +252,7 @@ func parseLdapConfig(c *cli.Context, config *models.LDAPConfig) error {
 // findLdapSecurityProtocolByName finds security protocol by its name ignoring case.
 // It returns the value of the security protocol and if it was found.
 func findLdapSecurityProtocolByName(name string) (ldap.SecurityProtocol, bool) {
-	for i, n := range models.SecurityProtocolNames {
+	for i, n := range ldap.SecurityProtocolNames {
 		if strings.EqualFold(name, n) {
 			return i, true
 		}
@@ -291,15 +292,15 @@ func (a *authService) addLdapBindDn(c *cli.Context) error {
 	loginSource := &models.LoginSource{
 		Type:      models.LoginLDAP,
 		IsActived: true, // active by default
-		Cfg: &models.LDAPConfig{
+		Cfg: &ldapService.Source{
 			Source: &ldap.Source{
 				Enabled: true, // always true
 			},
 		},
 	}
 
 	parseLoginSource(c, loginSource)
-	if err := parseLdapConfig(c, loginSource.LDAP()); err != nil {
+	if err := parseLdapConfig(c, loginSource.Cfg.(*ldapService.Source)); err != nil {
 		return err
 	}
 
@@ -318,7 +319,7 @@ func (a *authService) updateLdapBindDn(c *cli.Context) error {
 	}
 
 	parseLoginSource(c, loginSource)
-	if err := parseLdapConfig(c, loginSource.LDAP()); err != nil {
+	if err := parseLdapConfig(c, loginSource.Cfg.(*ldapService.Source)); err != nil {
 		return err
 	}
 
@@ -338,15 +339,15 @@ func (a *authService) addLdapSimpleAuth(c *cli.Context) error {
 	loginSource := &models.LoginSource{
 		Type:      models.LoginDLDAP,
 		IsActived: true, // active by default
-		Cfg: &models.LDAPConfig{
+		Cfg: &ldapService.Source{
 			Source: &ldap.Source{
 				Enabled: true, // always true
 			},
 		},
 	}
 
 	parseLoginSource(c, loginSource)
-	if err := parseLdapConfig(c, loginSource.LDAP()); err != nil {
+	if err := parseLdapConfig(c, loginSource.Cfg.(*ldapService.Source)); err != nil {
 		return err
 	}
 
@@ -365,7 +366,7 @@ func (a *authService) updateLdapSimpleAuth(c *cli.Context) error {
 	}
 
 	parseLoginSource(c, loginSource)
-	if err := parseLdapConfig(c, loginSource.LDAP()); err != nil {
+	if err := parseLdapConfig(c, loginSource.Cfg.(*ldapService.Source)); err != nil {
 		return err
 	}