From c5ea9b3b8a0de2f51eda5c857fcec94458e7b77a Mon Sep 17 00:00:00 2001 From: thfries Date: Wed, 9 Oct 2024 08:49:44 +0200 Subject: [PATCH] UI - bugfix for create new environment Signed-off-by: thfries --- ui/modules/environments/environments.ts | 40 +++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/ui/modules/environments/environments.ts b/ui/modules/environments/environments.ts index 6f64630c84..7b78bdbbcb 100644 --- a/ui/modules/environments/environments.ts +++ b/ui/modules/environments/environments.ts @@ -133,6 +133,45 @@ type Environment = { recentPolicyIds?: string[], } +const DEFAULT_AUTH_SETTINGS: AuthSettings = { + main: { + method: AuthMethod.basic, + oidc: { + enabled: false, + defaultProvider: null, + autoSso: false + }, + basic: { + enabled: true, + defaultUsernamePassword: "ditto:ditto" + }, + bearer: { + enabled: true + }, + pre: { + enabled: false, + defaultDittoPreAuthenticatedUsername: null + } + }, + devops: { + method: AuthMethod.basic, + oidc: { + enabled: false, + defaultProvider: null, + autoSso: false + }, + basic: { + enabled: true, + defaultUsernamePassword: "devops:foobar" + }, + bearer: { + enabled: false + } + }, + "oidc": { + } +} + let environments: Record; let selectedEnvName: string; @@ -158,6 +197,7 @@ document.getElementById('environmentsHTML').innerHTML = environmentsHTML; function Environment(env: Environment): void { Object.assign(this, env); + this.authSettings || (this.authSettings = DEFAULT_AUTH_SETTINGS); this.authSettings.main.oidc.provider = env.authSettings?.main?.oidc?.defaultProvider; fillMainUsernamePassword(env.authSettings?.main?.basic?.defaultUsernamePassword); this.authSettings.main.pre.dittoPreAuthenticatedUsername = env.authSettings?.main?.pre?.defaultDittoPreAuthenticatedUsername;