diff --git a/apis/installer/v1alpha1/ace_ace_types.go b/apis/installer/v1alpha1/ace_ace_types.go index fc18fc9e3..c40ed9098 100644 --- a/apis/installer/v1alpha1/ace_ace_types.go +++ b/apis/installer/v1alpha1/ace_ace_types.go @@ -407,6 +407,8 @@ type PlatformSettings struct { OtherShowFooterVersion bool `json:"otherShowFooterVersion"` OtherShowFooterTemplateLoadTime bool `json:"otherShowFooterTemplateLoadTime"` EnableCSRFCookieHttpOnly bool `json:"enableCSRFCookieHttpOnly"` + // +optional + LogoutURL string `json:"logoutURL"` } type SecuritySettings struct { diff --git a/apis/installer/v1alpha1/ace_options_types.go b/apis/installer/v1alpha1/ace_options_types.go index 7eb5b7ef9..09a538f4c 100644 --- a/apis/installer/v1alpha1/ace_options_types.go +++ b/apis/installer/v1alpha1/ace_options_types.go @@ -308,6 +308,8 @@ type AceOptionsSettings struct { // such as 'example.com' or 'appscode.com' etc. // +optional DomainWhiteList []string `json:"domainWhiteList"` + // +optional + LogoutURL string `json:"logoutURL"` } type AceOptionsDBSettings struct { diff --git a/charts/ace/README.md b/charts/ace/README.md index 0e5e456f1..fdd2acd0e 100644 --- a/charts/ace/README.md +++ b/charts/ace/README.md @@ -179,6 +179,7 @@ The following table lists the configurable parameters of the `ace` chart and the | settings.platform.enableCSRFCookieHttpOnly | csrf cookie http only enable | false | | settings.platform.cookieUsername | logged in username | ace_awesome | | settings.platform.cookieRememberName | to auto sign in | ace_incredible | +| settings.platform.logoutURL | redirect url after logout | https://appscode.ninja | | settings.grafana.appMode | possible values : production, development | production | | settings.grafana.secretKey | | 4nHrUDNw00AjlhAq8hCGYPxBt6I1UCbmdC5ReY19IPWdy8qFDzTZzXkdCr5d6qwP | | settings.inboxServer.jmapURL | | "" | diff --git a/charts/ace/templates/platform/config.yaml b/charts/ace/templates/platform/config.yaml index da053bd14..2dfb044ef 100644 --- a/charts/ace/templates/platform/config.yaml +++ b/charts/ace/templates/platform/config.yaml @@ -15,6 +15,7 @@ stringData: PROTOCOL = http DOMAIN = {{ .Values.global.platform.host }} BASE_URL = https://{{ .Values.global.platform.host }}/ + LOGOUT_URL = {{ .Values.settings.platform.logoutURL }} LANDING_PAGE = {{ .Values.settings.platform.serverLandingPage }} APP_DATA_PATH = /data {{- if .Values.global.infra.tls.ca.cert }} diff --git a/charts/ace/values.openapiv3_schema.yaml b/charts/ace/values.openapiv3_schema.yaml index a2257ae46..8448a5eef 100644 --- a/charts/ace/values.openapiv3_schema.yaml +++ b/charts/ace/values.openapiv3_schema.yaml @@ -22718,6 +22718,8 @@ properties: type: string logMode: type: string + logoutURL: + type: string otherShowFooterBranding: type: boolean otherShowFooterTemplateLoadTime: diff --git a/charts/ace/values.yaml b/charts/ace/values.yaml index c6ac3fdff..d31c26c37 100644 --- a/charts/ace/values.yaml +++ b/charts/ace/values.yaml @@ -406,6 +406,9 @@ settings: # to auto sign in cookieRememberName: ace_incredible + # redirect url after logout + logoutURL: https://appscode.ninja + grafana: # possible values : production, development appMode: production diff --git a/go.mod b/go.mod index 9fbf06b9c..be1841301 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.2 require ( go.bytebuilders.dev/catalog v0.0.10 go.bytebuilders.dev/resource-model v0.1.1-0.20241023004602-2c43ef3bb37b - go.bytebuilders.dev/ui-wizards v0.11.1-0.20241202040940-6efda032196a + go.bytebuilders.dev/ui-wizards v0.11.1-0.20241209083751-5641d115da22 go.openviz.dev/installer v0.0.0-20240731074805-a62b13eaedb0 gomodules.xyz/go-sh v0.1.0 k8s.io/api v0.30.2 diff --git a/go.sum b/go.sum index 823dfb9b0..c13eb42b4 100644 --- a/go.sum +++ b/go.sum @@ -190,8 +190,8 @@ go.bytebuilders.dev/catalog v0.0.10 h1:j+ai/xmvqnipxnc/4zcdMBlKJwCaBzb4czZvI/+jT go.bytebuilders.dev/catalog v0.0.10/go.mod h1:xzfRUZPNBMwmw+en9Y5o6xAq8EOfx8VXJP57oLLllBM= go.bytebuilders.dev/resource-model v0.1.1-0.20241023004602-2c43ef3bb37b h1:loq3wv7NQY9givjW8djFMqe/1d+8j2wE4k5hueDIWC0= go.bytebuilders.dev/resource-model v0.1.1-0.20241023004602-2c43ef3bb37b/go.mod h1:/uMIfxqPIrDmiYWA28OW3xzogijxpwkicR4kK7jam9g= -go.bytebuilders.dev/ui-wizards v0.11.1-0.20241202040940-6efda032196a h1:fCYDYE8KORmKt4muB24K17qn6ZhR1teWf6MwWF2cJrI= -go.bytebuilders.dev/ui-wizards v0.11.1-0.20241202040940-6efda032196a/go.mod h1:IygAkCSiRohg0lT+nbUGoIqzUy7PdSL+hkG90Cbik5g= +go.bytebuilders.dev/ui-wizards v0.11.1-0.20241209083751-5641d115da22 h1:Lp56zljfbLNxm46aXI9gMi0zeV084J0gMcrjAxgmlr8= +go.bytebuilders.dev/ui-wizards v0.11.1-0.20241209083751-5641d115da22/go.mod h1:IygAkCSiRohg0lT+nbUGoIqzUy7PdSL+hkG90Cbik5g= go.openviz.dev/installer v0.0.0-20240731074805-a62b13eaedb0 h1:zA5/psft6xJPNZZfDh7VpOlEEzqVOWoLQlXRFyOeyjc= go.openviz.dev/installer v0.0.0-20240731074805-a62b13eaedb0/go.mod h1:5q9Z38No4Xw0RGJnWYqAWPpXSG4XQYqiLzGHMv4pTPI= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/schema/ace-options/values.openapiv3_schema.yaml b/schema/ace-options/values.openapiv3_schema.yaml index bcabddf7f..e2aeffe33 100644 --- a/schema/ace-options/values.openapiv3_schema.yaml +++ b/schema/ace-options/values.openapiv3_schema.yaml @@ -2027,6 +2027,8 @@ properties: items: type: string type: array + logoutURL: + type: string smtp: properties: enabled: diff --git a/vendor/modules.txt b/vendor/modules.txt index 51cba0cce..79f8fe69b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -275,7 +275,7 @@ go.bytebuilders.dev/resource-model/apis/cloud go.bytebuilders.dev/resource-model/apis/cloud/v1alpha1 go.bytebuilders.dev/resource-model/apis/config/v1alpha1 go.bytebuilders.dev/resource-model/crds -# go.bytebuilders.dev/ui-wizards v0.11.1-0.20241202040940-6efda032196a +# go.bytebuilders.dev/ui-wizards v0.11.1-0.20241209083751-5641d115da22 ## explicit; go 1.22.0 go.bytebuilders.dev/ui-wizards/apis/wizards go.bytebuilders.dev/ui-wizards/apis/wizards/v1alpha1