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

Update to new goprogram version

Browse source
This commit is contained in:
Tom Wiesing 2023-11-01 22:01:24 +01:00
parent 7bd9570bc0
commit 873fdcd5c2
No known key found for this signature in database
106 changed files with 478 additions and 825 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/dis/component/resolver/api.go
View file

@ -13,7 +13,7 @@ import (
type API struct {
component.Base
Dependencies struct {
dependencies struct {
Auth *auth.Auth
Resolver *Resolver
}
@ -33,7 +33,7 @@ func (api *API) Routes() component.Routes {
func (a *API) HandleRoute(ctx context.Context, path string) (http.Handler, error) {
return &api.Handler[string]{
Config: a.Config,
Auth: a.Dependencies.Auth,
Auth: a.dependencies.Auth,
Methods: []string{"GET"},
@ -43,7 +43,7 @@ func (a *API) HandleRoute(ctx context.Context, path string) (http.Handler, error
if uri == "" {
return "", httpx.ErrBadRequest
}
target := a.Dependencies.Resolver.Target(uri)
target := a.dependencies.Resolver.Target(uri)
if target == "" {
return "", httpx.ErrNotFound
}

2
internal/dis/component/resolver/prefixes.go
View file

@ -21,7 +21,7 @@ func (resolver *Resolver) Cron(ctx context.Context) error {
// AllPrefixes returns a list of all prefixes from the server.
// Prefixes may be cached on the server
func (resolver *Resolver) AllPrefixes(ctx context.Context) (map[string]string, error) {
instances, err := resolver.Dependencies.Instances.All(ctx)
instances, err := resolver.dependencies.Instances.All(ctx)
if err != nil {
return nil, err
}

6
internal/dis/component/resolver/resolver.go
View file

@ -24,7 +24,7 @@ import (
type Resolver struct {
component.Base
Dependencies struct {
dependencies struct {
Instances *instances.Instances
Templating *templating.Templating
Auth *auth.Auth
@ -71,7 +71,7 @@ var (
func (resolver *Resolver) HandleRoute(ctx context.Context, route string) (http.Handler, error) {
// get the resolver template
tpl := resolverTemplate.Prepare(
resolver.Dependencies.Templating,
resolver.dependencies.Templating,
templating.Crumbs(
menuResolver,
),
@ -103,7 +103,7 @@ func (resolver *Resolver) HandleRoute(ctx context.Context, route string) (http.H
IndexContext: context,
}
if resolver.Dependencies.Auth.CheckScope("", scopes.ScopeUserValid, r) != nil {
if resolver.dependencies.Auth.CheckScope("", scopes.ScopeUserValid, r) != nil {
ctx.IndexContext.Prefixes = nil
}
httpx.WriteHTML(tpl.Context(r, ctx), nil, t, "", w, r)