Update pkglib to latest

This commit is contained in:
Tom Wiesing 2024-04-08 23:54:32 +02:00
parent 2d1f3e3819
commit 0c50b5e182
No known key found for this signature in database
10 changed files with 36 additions and 16 deletions

View file

@ -43,8 +43,9 @@ func (panel *UserPanel) routePassword(context.Context) http.Handler {
},
FieldTemplate: assets.PureCSSFieldTemplate,
Template: tpl.Template(),
TemplateContext: panel.UserFormContext(tpl, menuChangePassword),
Template: tpl.Template(),
TemplateContext: panel.UserFormContext(tpl, menuChangePassword),
LogTemplateError: tpl.LogTemplateError,
Validate: func(r *http.Request, values map[string]string) (struct{}, error) {
old, passcode, new, new2 := values["old"], values["otp"], values["new"], values["new2"]

View file

@ -160,8 +160,9 @@ func (panel *UserPanel) sshAddRoute(context.Context) http.Handler {
},
FieldTemplate: assets.PureCSSFieldTemplate,
Template: tpl.Template(),
TemplateContext: templating.FormTemplateContext(tpl),
Template: tpl.Template(),
TemplateContext: templating.FormTemplateContext(tpl),
LogTemplateError: tpl.LogTemplateError,
Validate: func(r *http.Request, values map[string]string) (ak addKeyResult, err error) {
ak.User, err = panel.dependencies.Auth.UserOfSession(r)

View file

@ -147,8 +147,9 @@ func (panel *UserPanel) tokensAddRoute(context.Context) http.Handler {
},
FieldTemplate: assets.PureCSSFieldTemplate,
Template: tplForm.Template(),
TemplateContext: templating.FormTemplateContext(tplForm),
Template: tplForm.Template(),
TemplateContext: templating.FormTemplateContext(tplForm),
LogTemplateError: tplForm.LogTemplateError,
Validate: func(r *http.Request, values map[string]string) (at addTokenResult, err error) {
at.User, err = panel.dependencies.Auth.UserOfSession(r)

View file

@ -37,8 +37,9 @@ func (panel *UserPanel) routeTOTPEnable(context.Context) http.Handler {
return struct{}{}, err == nil && user != nil && user.IsTOTPEnabled()
},
Template: tpl.Template(),
TemplateContext: panel.UserFormContext(tpl, menuTOTPEnable),
Template: tpl.Template(),
TemplateContext: panel.UserFormContext(tpl, menuTOTPEnable),
LogTemplateError: tpl.LogTemplateError,
Validate: func(r *http.Request, values map[string]string) (struct{}, error) {
password := values["password"]
@ -133,6 +134,7 @@ func (panel *UserPanel) routeTOTPEnroll(context.Context) http.Handler {
return tpl.Context(r, ctx)
},
LogTemplateError: tpl.LogTemplateError,
Validate: func(r *http.Request, values map[string]string) (struct{}, error) {
password, otp := values["password"], values["otp"]
@ -189,8 +191,9 @@ func (panel *UserPanel) routeTOTPDisable(context.Context) http.Handler {
return struct{}{}, err == nil && user != nil && !user.IsTOTPEnabled()
},
Template: tpl.Template(),
TemplateContext: panel.UserFormContext(tpl, menuTOTPDisable),
Template: tpl.Template(),
TemplateContext: panel.UserFormContext(tpl, menuTOTPDisable),
LogTemplateError: tpl.LogTemplateError,
Validate: func(r *http.Request, values map[string]string) (struct{}, error) {
password, otp := values["password"], values["otp"]