Skip to content

Commit

Permalink
Add logoutURL to ace options (#617)
Browse files Browse the repository at this point in the history 
Signed-off-by: Rokibul Hasan <[email protected]>
  • Loading branch information
@RokibulHasan7
RokibulHasan7 authored Dec 10, 2024
1 parent 5078b79 commit 4edc4cc
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 4 deletions.
2 changes: 2 additions & 0 deletions apis/installer/v1alpha1/ace_ace_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions apis/installer/v1alpha1/ace_options_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions charts/ace/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 | <code>false</code> |
| settings.platform.cookieUsername | logged in username | <code>ace_awesome</code> |
| settings.platform.cookieRememberName | to auto sign in | <code>ace_incredible</code> |
| settings.platform.logoutURL | redirect url after logout | <code>https://appscode.ninja</code> |
| settings.grafana.appMode | possible values : production, development | <code>production</code> |
| settings.grafana.secretKey | | <code>4nHrUDNw00AjlhAq8hCGYPxBt6I1UCbmdC5ReY19IPWdy8qFDzTZzXkdCr5d6qwP</code> |
| settings.inboxServer.jmapURL | | <code>""</code> |
Expand Down
1 change: 1 addition & 0 deletions charts/ace/templates/platform/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 2 additions & 0 deletions charts/ace/values.openapiv3_schema.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22718,6 +22718,8 @@ properties:
type: string
logMode:
type: string
logoutURL:
type: string
otherShowFooterBranding:
type: boolean
otherShowFooterTemplateLoadTime:
Expand Down
3 changes: 3 additions & 0 deletions charts/ace/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 2 additions & 0 deletions schema/ace-options/values.openapiv3_schema.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2027,6 +2027,8 @@ properties:
items:
type: string
type: array
logoutURL:
type: string
smtp:
properties:
enabled:
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4edc4cc

Please sign in to comment.