Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2026-02-02 04:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

db: use context and go-mockgen for login sources (#7041)

Browse Source
This commit is contained in:
Joe Chen
2022-06-10 19:54:36 +08:00
committed by GitHub
parent 94059f291d
commit 9776bdc9b8
14 changed files with 2175 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/route/admin/admin.go
View File

@@ -119,7 +119,7 @@ func Dashboard(c *context.Context) {
c.Data["BuildTime"] = conf.BuildTime
c.Data["BuildCommit"] = conf.BuildCommit
c.Data["Stats"] = db.GetStatistic()
c.Data["Stats"] = db.GetStatistic(c.Req.Context())
// FIXME: update periodically
updateSystemStatus()
c.Data["SysStatus"] = sysStatus

32
internal/route/admin/auths.go
View File

@@ -35,13 +35,13 @@ func Authentications(c *context.Context) {
c.PageIs("AdminAuthentications")
var err error
c.Data["Sources"], err = db.LoginSources.List(db.ListLoginSourceOpts{})
c.Data["Sources"], err = db.LoginSources.List(c.Req.Context(), db.ListLoginSourceOpts{})
if err != nil {
c.Error(err, "list login sources")
return
}
c.Data["Total"] = db.LoginSources.Count()
c.Data["Total"] = db.LoginSources.Count(c.Req.Context())
c.Success(AUTHS)
}
@@ -159,13 +159,15 @@ func NewAuthSourcePost(c *context.Context, f form.Authentication) {
return
}
source, err := db.LoginSources.Create(db.CreateLoginSourceOpts{
Type: auth.Type(f.Type),
Name: f.Name,
Activated: f.IsActive,
Default: f.IsDefault,
Config: config,
})
source, err := db.LoginSources.Create(c.Req.Context(),
db.CreateLoginSourceOpts{
Type: auth.Type(f.Type),
Name: f.Name,
Activated: f.IsActive,
Default: f.IsDefault,
Config: config,
},
)
if err != nil {
if db.IsErrLoginSourceAlreadyExist(err) {
c.FormErr("Name")
@@ -177,7 +179,7 @@ func NewAuthSourcePost(c *context.Context, f form.Authentication) {
}
if source.IsDefault {
err = db.LoginSources.ResetNonDefault(source)
err = db.LoginSources.ResetNonDefault(c.Req.Context(), source)
if err != nil {
c.Error(err, "reset non-default login sources")
return
@@ -198,7 +200,7 @@ func EditAuthSource(c *context.Context) {
c.Data["SecurityProtocols"] = securityProtocols
c.Data["SMTPAuths"] = smtp.AuthTypes
source, err := db.LoginSources.GetByID(c.ParamsInt64(":authid"))
source, err := db.LoginSources.GetByID(c.Req.Context(), c.ParamsInt64(":authid"))
if err != nil {
c.Error(err, "get login source by ID")
return
@@ -216,7 +218,7 @@ func EditAuthSourcePost(c *context.Context, f form.Authentication) {
c.Data["SMTPAuths"] = smtp.AuthTypes
source, err := db.LoginSources.GetByID(c.ParamsInt64(":authid"))
source, err := db.LoginSources.GetByID(c.Req.Context(), c.ParamsInt64(":authid"))
if err != nil {
c.Error(err, "get login source by ID")
return
@@ -255,13 +257,13 @@ func EditAuthSourcePost(c *context.Context, f form.Authentication) {
source.IsActived = f.IsActive
source.IsDefault = f.IsDefault
source.Provider = provider
if err := db.LoginSources.Save(source); err != nil {
if err := db.LoginSources.Save(c.Req.Context(), source); err != nil {
c.Error(err, "update login source")
return
}
if source.IsDefault {
err = db.LoginSources.ResetNonDefault(source)
err = db.LoginSources.ResetNonDefault(c.Req.Context(), source)
if err != nil {
c.Error(err, "reset non-default login sources")
return
@@ -276,7 +278,7 @@ func EditAuthSourcePost(c *context.Context, f form.Authentication) {
func DeleteAuthSource(c *context.Context) {
id := c.ParamsInt64(":authid")
if err := db.LoginSources.DeleteByID(id); err != nil {
if err := db.LoginSources.DeleteByID(c.Req.Context(), id); err != nil {
if db.IsErrLoginSourceInUse(err) {
c.Flash.Error(c.Tr("admin.auths.still_in_used"))
} else {

8
internal/route/admin/users.go
View File

@@ -46,7 +46,7 @@ func NewUser(c *context.Context) {
c.Data["login_type"] = "0-0"
sources, err := db.LoginSources.List(db.ListLoginSourceOpts{})
sources, err := db.LoginSources.List(c.Req.Context(), db.ListLoginSourceOpts{})
if err != nil {
c.Error(err, "list login sources")
return
@@ -62,7 +62,7 @@ func NewUserPost(c *context.Context, f form.AdminCrateUser) {
c.Data["PageIsAdmin"] = true
c.Data["PageIsAdminUsers"] = true
sources, err := db.LoginSources.List(db.ListLoginSourceOpts{})
sources, err := db.LoginSources.List(c.Req.Context(), db.ListLoginSourceOpts{})
if err != nil {
c.Error(err, "list login sources")
return
@@ -127,7 +127,7 @@ func prepareUserInfo(c *context.Context) *db.User {
c.Data["User"] = u
if u.LoginSource > 0 {
c.Data["LoginSource"], err = db.LoginSources.GetByID(u.LoginSource)
c.Data["LoginSource"], err = db.LoginSources.GetByID(c.Req.Context(), u.LoginSource)
if err != nil {
c.Error(err, "get login source by ID")
return nil
@@ -136,7 +136,7 @@ func prepareUserInfo(c *context.Context) *db.User {
c.Data["LoginSource"] = &db.LoginSource{}
}
sources, err := db.LoginSources.List(db.ListLoginSourceOpts{})
sources, err := db.LoginSources.List(c.Req.Context(), db.ListLoginSourceOpts{})
if err != nil {
c.Error(err, "list login sources")
return nil