diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-09-19 19:49:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-19 19:49:59 +0800 |
| commit | a4bfef265d9e512830350635a0489c2cdcd6508f (patch) | |
| tree | 1e3c2ec94276dfcb2f8ba73a2ac075ba39c4a34a /services/auth | |
| parent | 462306e263db5a809dbe2cdf62e99307aeff28de (diff) | |
| download | gitea-a4bfef265d9e512830350635a0489c2cdcd6508f.tar.gz gitea-a4bfef265d9e512830350635a0489c2cdcd6508f.zip | |
Move db related basic functions to models/db (#17075)
* Move db related basic functions to models/db
* Fix lint
* Fix lint
* Fix test
* Fix lint
* Fix lint
* revert unnecessary change
* Fix test
* Fix wrong replace string
* Use *Context
* Correct committer spelling and fix wrong replaced words
Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'services/auth')
| -rw-r--r-- | services/auth/group.go | 3 | ||||
| -rw-r--r-- | services/auth/oauth2.go | 3 | ||||
| -rw-r--r-- | services/auth/signin.go | 3 | ||||
| -rw-r--r-- | services/auth/source/oauth2/init.go | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/services/auth/group.go b/services/auth/group.go index fb885b818a..c396ae046b 100644 --- a/services/auth/group.go +++ b/services/auth/group.go @@ -8,6 +8,7 @@ import ( "net/http" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" ) // Ensure the struct implements the interface. @@ -60,7 +61,7 @@ func (b *Group) Free() error { // Verify extracts and validates func (b *Group) Verify(req *http.Request, w http.ResponseWriter, store DataStore, sess SessionStore) *models.User { - if !models.HasEngine { + if !db.HasEngine { return nil } diff --git a/services/auth/oauth2.go b/services/auth/oauth2.go index 665e5232cc..e79b640ce4 100644 --- a/services/auth/oauth2.go +++ b/services/auth/oauth2.go @@ -11,6 +11,7 @@ import ( "time" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/web/middleware" @@ -109,7 +110,7 @@ func (o *OAuth2) userIDFromToken(req *http.Request, store DataStore) int64 { // If verification is successful returns an existing user object. // Returns nil if verification fails. func (o *OAuth2) Verify(req *http.Request, w http.ResponseWriter, store DataStore, sess SessionStore) *models.User { - if !models.HasEngine { + if !db.HasEngine { return nil } diff --git a/services/auth/signin.go b/services/auth/signin.go index 0ac2634c80..a7acb95ba2 100644 --- a/services/auth/signin.go +++ b/services/auth/signin.go @@ -8,6 +8,7 @@ import ( "strings" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/log" // Register the sources @@ -25,7 +26,7 @@ func UserSignIn(username, password string) (*models.User, *models.LoginSource, e if strings.Contains(username, "@") { user = &models.User{Email: strings.ToLower(strings.TrimSpace(username))} // check same email - cnt, err := models.Count(user) + cnt, err := db.Count(user) if err != nil { return nil, nil, err } diff --git a/services/auth/source/oauth2/init.go b/services/auth/source/oauth2/init.go index 64328aa381..be31503eef 100644 --- a/services/auth/source/oauth2/init.go +++ b/services/auth/source/oauth2/init.go @@ -9,6 +9,7 @@ import ( "sync" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" @@ -33,7 +34,7 @@ func Init() error { return err } - store, err := models.CreateStore(SessionTableName, UsersStoreKey) + store, err := db.CreateStore(SessionTableName, UsersStoreKey) if err != nil { return err } |