From a327b36bc066a868a9ead55280ea0332fcf93a9e Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Wed, 16 Apr 2025 14:28:45 +0200 Subject: [PATCH] add missing variables Signed-off-by: Christian Richter --- go.mod | 2 +- go.sum | 4 ++-- .../libregraph/lico/bootstrap/backends/ldap/ldap.go | 9 +++++---- .../lico/bootstrap/backends/libregraph/libregraph.go | 9 +++++---- vendor/github.com/libregraph/lico/identifier/api.go | 9 +++++---- vendor/github.com/libregraph/lico/identifier/config.go | 9 +++++---- .../libregraph/lico/identifier/meta/branding.go | 9 +++++---- vendor/modules.txt | 4 ++-- 8 files changed, 30 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 68b16bcb0..96ede60dc 100644 --- a/go.mod +++ b/go.mod @@ -345,7 +345,7 @@ replace github.com/go-micro/plugins/v4/store/nats-js-kv => github.com/kobergj/pl replace go-micro.dev/v4 => github.com/butonic/go-micro/v4 v4.11.1-0.20241115112658-b5d4de5ed9b3 -replace github.com/libregraph/lico => github.com/dragonchaser/lico v0.0.0-20250416114507-5a6cbb7004e8 +replace github.com/libregraph/lico => github.com/dragonchaser/lico v0.0.0-20250416122745-696f1eb05e9c // exclude the v2 line of go-sqlite3 which was released accidentally and prevents pulling in newer versions of go-sqlite3 // see https://github.com/mattn/go-sqlite3/issues/965 for more details diff --git a/go.sum b/go.sum index f9b8ed9cc..411c7cc20 100644 --- a/go.sum +++ b/go.sum @@ -279,8 +279,8 @@ github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnsimple/dnsimple-go v0.63.0/go.mod h1:O5TJ0/U6r7AfT8niYNlmohpLbCSG+c71tQlGr9SeGrg= -github.com/dragonchaser/lico v0.0.0-20250416114507-5a6cbb7004e8 h1:VGvosYciKneejSTsOvbZ04Mjebz4trryst/cDL5cbMM= -github.com/dragonchaser/lico v0.0.0-20250416114507-5a6cbb7004e8/go.mod h1:GLIhLiUD3QUvbdZ+d7tKdkTwaotVQ3qhC8t1biWzFf8= +github.com/dragonchaser/lico v0.0.0-20250416122745-696f1eb05e9c h1:JeR9yGofF08fNQthvr1DekPg0Ug7FGYNkFoJe7dfemg= +github.com/dragonchaser/lico v0.0.0-20250416122745-696f1eb05e9c/go.mod h1:GLIhLiUD3QUvbdZ+d7tKdkTwaotVQ3qhC8t1biWzFf8= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e h1:rcHHSQqzCgvlwP0I/fQ8rQMn/MpHE5gWSLdtpxtP6KQ= diff --git a/vendor/github.com/libregraph/lico/bootstrap/backends/ldap/ldap.go b/vendor/github.com/libregraph/lico/bootstrap/backends/ldap/ldap.go index 943a55e70..31c225e19 100644 --- a/vendor/github.com/libregraph/lico/bootstrap/backends/ldap/ldap.go +++ b/vendor/github.com/libregraph/lico/bootstrap/backends/ldap/ldap.go @@ -143,10 +143,11 @@ func NewIdentityManager(bs bootstrap.Bootstrap) (identity.Manager, error) { AuthorizationEndpointURI: fullAuthorizationEndpointURL, SignedOutEndpointURI: fullSignedOutEndpointURL, - DefaultBannerLogo: config.IdentifierDefaultBannerLogo, - DefaultSignInPageText: config.IdentifierDefaultSignInPageText, - DefaultUsernameHintText: config.IdentifierDefaultUsernameHintText, - UILocales: config.IdentifierUILocales, + DefaultBannerLogo: config.IdentifierDefaultBannerLogo, + DefaultSignInPageText: config.IdentifierDefaultSignInPageText, + DefaultSignInPageLogoUri: config.IdentifierDefaultLogoTargetURI, + DefaultUsernameHintText: config.IdentifierDefaultUsernameHintText, + UILocales: config.IdentifierUILocales, Backend: identifierBackend, }) diff --git a/vendor/github.com/libregraph/lico/bootstrap/backends/libregraph/libregraph.go b/vendor/github.com/libregraph/lico/bootstrap/backends/libregraph/libregraph.go index 0fe760c04..4b8b2a4d8 100644 --- a/vendor/github.com/libregraph/lico/bootstrap/backends/libregraph/libregraph.go +++ b/vendor/github.com/libregraph/lico/bootstrap/backends/libregraph/libregraph.go @@ -126,10 +126,11 @@ func NewIdentityManager(bs bootstrap.Bootstrap) (identity.Manager, error) { AuthorizationEndpointURI: fullAuthorizationEndpointURL, SignedOutEndpointURI: fullSignedOutEndpointURL, - DefaultBannerLogo: config.IdentifierDefaultBannerLogo, - DefaultSignInPageText: config.IdentifierDefaultSignInPageText, - DefaultUsernameHintText: config.IdentifierDefaultUsernameHintText, - UILocales: config.IdentifierUILocales, + DefaultBannerLogo: config.IdentifierDefaultBannerLogo, + DefaultSignInPageText: config.IdentifierDefaultSignInPageText, + DefaultSignInPageLogoUri: config.IdentifierDefaultLogoTargetURI, + DefaultUsernameHintText: config.IdentifierDefaultUsernameHintText, + UILocales: config.IdentifierUILocales, Backend: identifierBackend, }) diff --git a/vendor/github.com/libregraph/lico/identifier/api.go b/vendor/github.com/libregraph/lico/identifier/api.go index ea553dedf..5caaebcc7 100644 --- a/vendor/github.com/libregraph/lico/identifier/api.go +++ b/vendor/github.com/libregraph/lico/identifier/api.go @@ -47,10 +47,11 @@ func (i Identifier) writeHelloResponse(rw http.ResponseWriter, req *http.Request response := &HelloResponse{ State: r.State, Branding: &meta.Branding{ - BannerLogo: i.defaultBannerLogo, - UsernameHintText: i.Config.DefaultUsernameHintText, - SignInPageText: i.Config.DefaultSignInPageText, - Locales: i.Config.UILocales, + BannerLogo: i.defaultBannerLogo, + UsernameHintText: i.Config.DefaultUsernameHintText, + SignInPageText: i.Config.DefaultSignInPageText, + SignInPageLogoUri: i.Config.DefaultSignInPageLogoUri, + Locales: i.Config.UILocales, }, } diff --git a/vendor/github.com/libregraph/lico/identifier/config.go b/vendor/github.com/libregraph/lico/identifier/config.go index 715560f40..4fc69f06a 100644 --- a/vendor/github.com/libregraph/lico/identifier/config.go +++ b/vendor/github.com/libregraph/lico/identifier/config.go @@ -46,10 +46,11 @@ type Config struct { AuthorizationEndpointURI *url.URL SignedOutEndpointURI *url.URL - DefaultBannerLogo []byte - DefaultSignInPageText *string - DefaultUsernameHintText *string - UILocales []string + DefaultBannerLogo []byte + DefaultSignInPageText *string + DefaultSignInPageLogoUri *string + DefaultUsernameHintText *string + UILocales []string Backend backends.Backend } diff --git a/vendor/github.com/libregraph/lico/identifier/meta/branding.go b/vendor/github.com/libregraph/lico/identifier/meta/branding.go index af5989447..760f9b8c7 100644 --- a/vendor/github.com/libregraph/lico/identifier/meta/branding.go +++ b/vendor/github.com/libregraph/lico/identifier/meta/branding.go @@ -19,8 +19,9 @@ package meta // Branding is a container to hold identifier branding meta data. type Branding struct { - BannerLogo *string `json:"bannerLogo,omitempty"` - SignInPageText *string `json:"signinPageText,omitempty"` - UsernameHintText *string `json:"usernameHintText,omitempty"` - Locales []string `json:"locales,omitempty"` + BannerLogo *string `json:"bannerLogo,omitempty"` + SignInPageText *string `json:"signinPageText,omitempty"` + UsernameHintText *string `json:"usernameHintText,omitempty"` + SignInPageLogoUri *string `json:"signinPageLogoUri,omitempty"` + Locales []string `json:"locales,omitempty"` } diff --git a/vendor/modules.txt b/vendor/modules.txt index 0e200adbf..e03b2139c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -870,7 +870,7 @@ github.com/libregraph/idm/server github.com/libregraph/idm/server/handler github.com/libregraph/idm/server/handler/boltdb github.com/libregraph/idm/server/handler/ldif -# github.com/libregraph/lico v0.65.1 => github.com/dragonchaser/lico v0.0.0-20250416114507-5a6cbb7004e8 +# github.com/libregraph/lico v0.65.1 => github.com/dragonchaser/lico v0.0.0-20250416122745-696f1eb05e9c ## explicit; go 1.18 github.com/libregraph/lico github.com/libregraph/lico/bootstrap @@ -2434,4 +2434,4 @@ stash.kopano.io/kgol/rndm # github.com/unrolled/secure => github.com/DeepDiver1975/secure v0.0.0-20240611112133-abc838fb797c # github.com/go-micro/plugins/v4/store/nats-js-kv => github.com/kobergj/plugins/v4/store/nats-js-kv v0.0.0-20240807130109-f62bb67e8c90 # go-micro.dev/v4 => github.com/butonic/go-micro/v4 v4.11.1-0.20241115112658-b5d4de5ed9b3 -# github.com/libregraph/lico => github.com/dragonchaser/lico v0.0.0-20250416114507-5a6cbb7004e8 +# github.com/libregraph/lico => github.com/dragonchaser/lico v0.0.0-20250416122745-696f1eb05e9c