opensource/gitea
1
0
Fork 0
mirror of https://gitcode.com/gitea/gitea.git synced 2025-06-09 06:14:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move user related model into models/user ()

Browse Source 
* Move user related model into models/user

* Fix lint for windows

* Fix windows lint

* Fix windows lint

* Move some tests in models

* Merge
This commit is contained in:
Lunny Xiao
2021-11-24 17:49:20 +08:00
committed by GitHub
parent 4e7ca946da
commit a666829a37
345 changed files with 4230 additions and 3813 deletions
cmd
admin.gomigrate_storage.go
integrations
admin_user_test.goapi_admin_org_test.goapi_admin_test.goapi_comment_test.goapi_issue_label_test.goapi_issue_milestone_test.goapi_issue_reaction_test.goapi_issue_stopwatch_test.goapi_issue_subscription_test.goapi_issue_test.goapi_issue_tracked_time_test.goapi_keys_test.goapi_notification_test.goapi_oauth2_apps_test.goapi_org_test.goapi_pull_test.goapi_releases_test.goapi_repo_archive_test.goapi_repo_edit_test.goapi_repo_file_create_test.goapi_repo_file_delete_test.goapi_repo_file_helpers.goapi_repo_file_update_test.goapi_repo_get_contents_list_test.goapi_repo_get_contents_test.goapi_repo_git_blobs_test.goapi_repo_git_commits_test.goapi_repo_git_hook_test.goapi_repo_git_notes_test.goapi_repo_git_ref_test.goapi_repo_git_tags_test.goapi_repo_git_trees_test.goapi_repo_lfs_locks_test.goapi_repo_lfs_migrate_test.goapi_repo_lfs_test.goapi_repo_raw_test.goapi_repo_tags_test.goapi_repo_teams_test.goapi_repo_test.goapi_repo_topic_test.goapi_team_test.goapi_team_user_test.goapi_token_test.goapi_user_orgs_test.goapi_user_search_test.gochange_default_branch_test.godelete_user_test.goempty_repo_test.goeventsource_test.gogit_test.gogpg_git_test.goissue_test.gomigrate_test.gomirror_pull_test.gomirror_push_test.goorg_count_test.goprivateactivity_test.gopull_merge_test.gopull_update_test.gorepo_fork_test.gorepo_generate_test.gorepo_tag_test.gosignin_test.gosignup_test.gouser_avatar_test.gouser_test.goxss_test.go
models
access.goaccess_test.goaction.goaction_list.goaction_test.gobranches.gocommit.gocommit_status.goconsistency.go
db
error.goname.gosearch.go
error.goexternal_login_user.gogpg_key.gogpg_key_commit_verification.gogpg_key_test.gogpg_key_verify.gohelper.gohelper_environment.goissue.goissue_assignees.goissue_assignees_test.goissue_comment.goissue_comment_list.goissue_comment_test.goissue_dependency.goissue_dependency_test.goissue_label.goissue_label_test.goissue_list.goissue_lock.goissue_milestone.goissue_milestone_test.goissue_reaction.goissue_reaction_test.goissue_stopwatch.goissue_stopwatch_test.goissue_test.goissue_tracked_time.goissue_tracked_time_test.goissue_watch.goissue_xref.goissue_xref_test.golfs.golfs_lock.gomain_test.gonotification.gonotification_test.goorg.goorg_team.goorg_team_test.goorg_test.goproject_issue.gopull.gopull_list.gopull_sign.gopull_test.gorelease.gorepo.gorepo_activity.gorepo_collaboration.gorepo_collaboration_test.gorepo_list.gorepo_permission.gorepo_permission_test.gorepo_sign.gorepo_test.gorepo_transfer.gorepo_transfer_test.gorepo_watch.goreview.goreview_test.gossh_key.gossh_key_deploy.gossh_key_principals.gostar.gostatistic.gotask.gouser.go
user
avatar.goerror.gomain_test.gosearch.gouser.gouser_test.go
user_email.gouser_email_test.gouser_heatmap.gouser_heatmap_test.gouser_test.gouserlist.gowiki.go
modules
context
context.goorg.gorepo.go
convert
convert.gogit_commit.goissue.gopull.gopull_review.gostatus.gouser.gouser_test.go
doctor
misc.go
gitgraph
graph_models.go
indexer/issues
indexer.go
notification
action
action.goaction_test.go
base
notifier.gonull.go
indexer
indexer.go
mail
mail.go
notification.go
ui
ui.go
webhook
webhook.go
private
serv.go
repofiles
commit_status.go
repository
commits.gocreate.gocreate_test.gogenerate.goinit.gorepo.go
templates
helper.go
test
context_tests.go
routers
api/v1
admin
adopt.goorg.gouser.go
api.go
org
org.go
repo
branch.gocollaborators.gocommits.gofork.goissue.goissue_subscription.goissue_tracked_time.gomigrate.gopull.gopull_review.gorepo.gotransfer.go
user
follower.gohelper.gokey.gorepo.gosettings.gostar.gouser.gowatch.go
install
install.go
private
hook_pre_receive.gomail.goserv.go
web
admin
orgs.gorepos.gousers.gousers_test.go
dev
template.go
explore
org.gorepo.gouser.go
feed
profile.go
org
home.goorg.gosetting.goteams.go
repo
blame.gocommit.gocompare.gohttp.goissue.golfs.gomiddlewares.gomigrate.gopull.gorelease.gorepo.gosetting.gosettings_test.goview.gowebhook.go
user
auth.goauth_openid.goavatar.gohome.gooauth.gooauth_test.goprofile.go
setting
account.goadopt.goprofile.go
services
agit
agit.go
attachment
attachment_test.go
auth
auth.gobasic.gogroup.gointerface.gologin_source.gooauth2.goreverseproxy.gosession.gosignin.go
source
db
authenticate.gosource.go
ldap
source_authenticate.gosource_sync.go
oauth2
providers.gosource_authenticate.go
pam
source_authenticate.go
smtp
auth.gosource_authenticate.go
sspi_windows.go
comments
comments.go
cron
setting.gotasks.gotasks_basic.gotasks_extended.go
externalaccount
user.go
gitdiff
gitdiff.gogitdiff_test.go
issue
assignee.goassignee_test.gocommit.gocommit_test.gocontent.goissue.golabel.golabel_test.gomilestone.gostatus.go
lfs
locks.goserver.go
mailer
mail.gomail_comment.gomail_issue.gomail_release.gomail_repo.gomail_test.go
migrations
dump.gogitea_uploader.gogitea_uploader_test.gomigrate.gomigrate_test.go
org
org.goorg_test.go
pull
check.gomerge.gopull.goreview.goupdate.go
release
release.gorelease_test.go
repository
adopt.gobranch.gocheck.go
files
commit.godelete.gofile.gotemp_repo.goupdate.goupload.go
fork.gofork_test.gogenerate.gopush.gorepository.gotransfer.gotransfer_test.go
task
migrate.gotask.go
user
user.gouser_test.go
wiki
wiki.gowiki_test.go

9
services/auth/basic.go

@ -10,6 +10,7 @@ import (
"strings"
"code.gitea.io/gitea/models"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
@ -41,7 +42,7 @@ func (b *Basic) Name() string {
// "Authorization" header of the request and returns the corresponding user object for that
// name/token on successful validation.
// Returns nil if header is empty or validation fails.
func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore, sess SessionStore) *models.User {
func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore, sess SessionStore) *user_model.User {
// Basic authentication should only fire on API, Download or on Git or LFSPaths
if !middleware.IsAPIPath(req) && !isAttachmentDownload(req) && !isGitRawReleaseOrLFSPath(req) {
return nil
@ -75,7 +76,7 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore
if uid != 0 {
log.Trace("Basic Authorization: Valid OAuthAccessToken for user[%d]", uid)
u, err := models.GetUserByID(uid)
u, err := user_model.GetUserByID(uid)
if err != nil {
log.Error("GetUserByID: %v", err)
return nil
@ -88,7 +89,7 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore
token, err := models.GetAccessTokenBySHA(authToken)
if err == nil {
log.Trace("Basic Authorization: Valid AccessToken for user[%d]", uid)
u, err := models.GetUserByID(token.UID)
u, err := user_model.GetUserByID(token.UID)
if err != nil {
log.Error("GetUserByID: %v", err)
return nil
@ -112,7 +113,7 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore
log.Trace("Basic Authorization: Attempting SignIn for %s", uname)
u, source, err := UserSignIn(uname, passwd)
if err != nil {
if !models.IsErrUserNotExist(err) {
if !user_model.IsErrUserNotExist(err) {
log.Error("UserSignIn: %v", err)
}
return nil