5d2e11eedb
`models` does far too much. In particular it handles all `UserSignin`. It shouldn't be responsible for calling LDAP, SMTP or PAM for signing in. Therefore we should move this code out of `models`. This code has to depend on `models` - therefore it belongs in `services`. There is a package in `services` called `auth` and clearly this functionality belongs in there. Plan: - [x] Change `auth.Auth` to `auth.Method` - as they represent methods of authentication. - [x] Move `models.UserSignIn` into `auth` - [x] Move `models.ExternalUserLogin` - [x] Move most of the `LoginVia*` methods to `auth` or subpackages - [x] Move Resynchronize functionality to `auth` - Involved some restructuring of `models/ssh_key.go` to reduce the size of this massive file and simplify its files. - [x] Move the rest of the LDAP functionality in to the ldap subpackage - [x] Re-factor the login sources to express an interfaces `auth.Source`? - I've done this through some smaller interfaces Authenticator and Synchronizable - which would allow us to extend things in future - [x] Now LDAP is out of models - need to think about modules/auth/ldap and I think all of that functionality might just be moveable - [x] Similarly a lot Oauth2 functionality need not be in models too and should be moved to services/auth/source/oauth2 - [x] modules/auth/oauth2/oauth2.go uses xorm... This is naughty - probably need to move this into models. - [x] models/oauth2.go - mostly should be in modules/auth/oauth2 or services/auth/source/oauth2 - [x] More simplifications of login_source.go may need to be done - Allow wiring in of notify registration - *this can now easily be done - but I think we should do it in another PR* - see #16178 - More refactors...? - OpenID should probably become an auth Method but I think that can be left for another PR - Methods should also probably be cleaned up - again another PR I think. - SSPI still needs more refactors.* Rename auth.Auth auth.Method * Restructure ssh_key.go - move functions from models/user.go that relate to ssh_key to ssh_key - split ssh_key.go to try create clearer function domains for allow for future refactors here. Signed-off-by: Andrew Thornton <art27@cantab.net>
51 lines
1.5 KiB
Go
51 lines
1.5 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package oauth2
|
|
|
|
import (
|
|
"code.gitea.io/gitea/models"
|
|
|
|
jsoniter "github.com/json-iterator/go"
|
|
)
|
|
|
|
// ________ _____ __ .__ ________
|
|
// \_____ \ / _ \ __ ___/ |_| |__ \_____ \
|
|
// / | \ / /_\ \| | \ __\ | \ / ____/
|
|
// / | \/ | \ | /| | | Y \/ \
|
|
// \_______ /\____|__ /____/ |__| |___| /\_______ \
|
|
// \/ \/ \/ \/
|
|
|
|
// Source holds configuration for the OAuth2 login source.
|
|
type Source struct {
|
|
Provider string
|
|
ClientID string
|
|
ClientSecret string
|
|
OpenIDConnectAutoDiscoveryURL string
|
|
CustomURLMapping *CustomURLMapping
|
|
IconURL string
|
|
|
|
// reference to the loginSource
|
|
loginSource *models.LoginSource
|
|
}
|
|
|
|
// FromDB fills up an OAuth2Config from serialized format.
|
|
func (source *Source) FromDB(bs []byte) error {
|
|
return models.JSONUnmarshalHandleDoubleEncode(bs, &source)
|
|
}
|
|
|
|
// ToDB exports an SMTPConfig to a serialized format.
|
|
func (source *Source) ToDB() ([]byte, error) {
|
|
json := jsoniter.ConfigCompatibleWithStandardLibrary
|
|
return json.Marshal(source)
|
|
}
|
|
|
|
// SetLoginSource sets the related LoginSource
|
|
func (source *Source) SetLoginSource(loginSource *models.LoginSource) {
|
|
source.loginSource = loginSource
|
|
}
|
|
|
|
func init() {
|
|
models.RegisterLoginTypeConfig(models.LoginOAuth2, &Source{})
|
|
}
|