diff options
Diffstat (limited to 'internal/route')
-rw-r--r-- | internal/route/admin/admin.go | 2 | ||||
-rw-r--r-- | internal/route/admin/auths.go | 32 | ||||
-rw-r--r-- | internal/route/admin/users.go | 8 | ||||
-rw-r--r-- | internal/route/api/v1/admin/user.go | 2 | ||||
-rw-r--r-- | internal/route/user/auth.go | 4 |
5 files changed, 25 insertions, 23 deletions
diff --git a/internal/route/admin/admin.go b/internal/route/admin/admin.go index 325876d9..8fde8da8 100644 --- a/internal/route/admin/admin.go +++ b/internal/route/admin/admin.go @@ -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 diff --git a/internal/route/admin/auths.go b/internal/route/admin/auths.go index ff8fd656..014da37a 100644 --- a/internal/route/admin/auths.go +++ b/internal/route/admin/auths.go @@ -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 { diff --git a/internal/route/admin/users.go b/internal/route/admin/users.go index 8a09690d..26619516 100644 --- a/internal/route/admin/users.go +++ b/internal/route/admin/users.go @@ -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 diff --git a/internal/route/api/v1/admin/user.go b/internal/route/api/v1/admin/user.go index ef004261..543220db 100644 --- a/internal/route/api/v1/admin/user.go +++ b/internal/route/api/v1/admin/user.go @@ -22,7 +22,7 @@ func parseLoginSource(c *context.APIContext, u *db.User, sourceID int64, loginNa return } - source, err := db.LoginSources.GetByID(sourceID) + source, err := db.LoginSources.GetByID(c.Req.Context(), sourceID) if err != nil { if db.IsErrLoginSourceNotExist(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) diff --git a/internal/route/user/auth.go b/internal/route/user/auth.go index 87e23b4b..f8bbe7ab 100644 --- a/internal/route/user/auth.go +++ b/internal/route/user/auth.go @@ -102,7 +102,7 @@ func Login(c *context.Context) { } // Display normal login page - loginSources, err := db.LoginSources.List(db.ListLoginSourceOpts{OnlyActivated: true}) + loginSources, err := db.LoginSources.List(c.Req.Context(), db.ListLoginSourceOpts{OnlyActivated: true}) if err != nil { c.Error(err, "list activated login sources") return @@ -149,7 +149,7 @@ func afterLogin(c *context.Context, u *db.User, remember bool) { func LoginPost(c *context.Context, f form.SignIn) { c.Title("sign_in") - loginSources, err := db.LoginSources.List(db.ListLoginSourceOpts{OnlyActivated: true}) + loginSources, err := db.LoginSources.List(c.Req.Context(), db.ListLoginSourceOpts{OnlyActivated: true}) if err != nil { c.Error(err, "list activated login sources") return |