rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

footer: Add a semi-flexible template system

Browse source
This commit is contained in:
Tom Wiesing 2023-01-06 22:52:47 +01:00
parent bda763725e
commit 021fc3cc7e
No known key found for this signature in database
26 changed files with 239 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/dis/component/auth/panel/panel.go
View file

@ -79,7 +79,7 @@ func (panel *UserPanel) UserFormContext(ctx httpx.FormContext, r *http.Request)
user, err := panel.Dependencies.Auth.UserOf(r)
uctx := userFormContext{FormContext: ctx}
panel.Dependencies.Custom.Update(&uctx)
panel.Dependencies.Custom.Update(&uctx, r)
if err == nil {
uctx.User = &user.User
}

2
internal/dis/component/auth/panel/totp.go
View file

@ -98,7 +98,7 @@ func (panel *UserPanel) routeTOTPEnroll(ctx context.Context) http.Handler {
FormContext: context,
},
}
panel.Dependencies.Custom.Update(&ctx.userFormContext)
panel.Dependencies.Custom.Update(&ctx.userFormContext, r)
if err == nil && user != nil {
ctx.userFormContext.User = &user.User

4
internal/dis/component/auth/panel/user.go
View file

@ -28,9 +28,9 @@ func (panel *UserPanel) routeUser(ctx context.Context) http.Handler {
userTemplate := panel.Dependencies.Custom.Template(userTemplate)
return &httpx.HTMLHandler[routeUserContext]{
Handler: func(r *http.Request) (ruc routeUserContext, err error) {
panel.Dependencies.Custom.Update(&ruc)
panel.Dependencies.Custom.Update(&ruc, r)
ruc.AuthUser, err = panel.Dependencies.Auth.UserOf(r)
return routeUserContext{}, err
return ruc, err
},
Template: userTemplate,
}