From a6b9274c4ff6e4175140be2ab373b7c206221f9d Mon Sep 17 00:00:00 2001
From: Jens L
Date: Tue, 14 Nov 2023 13:05:18 +0100
Subject: [PATCH] web/admin: always show oidc well-known URL fields when
they're set (#7560)
Signed-off-by: Jens Langhammer
# Conflicts:
# web/xliff/de.xlf
# web/xliff/en.xlf
# web/xliff/es.xlf
# web/xliff/fr.xlf
# web/xliff/pl.xlf
# web/xliff/pseudo-LOCALE.xlf
# web/xliff/tr.xlf
# web/xliff/zh-Hans.xlf
# web/xliff/zh-Hant.xlf
# web/xliff/zh_TW.xlf
---
.../admin/sources/oauth/OAuthSourceForm.ts | 51 +-
web/xliff/de.xlf | 27 +
web/xliff/en.xlf | 27 +
web/xliff/es.xlf | 27 +
web/xliff/fr.xlf | 2950 +++++++++--------
web/xliff/pl.xlf | 27 +
web/xliff/pseudo-LOCALE.xlf | 27 +
web/xliff/tr.xlf | 27 +
web/xliff/zh-Hans.xlf | 68 +-
web/xliff/zh-Hant.xlf | 27 +
web/xliff/zh_TW.xlf | 27 +
11 files changed, 1759 insertions(+), 1526 deletions(-)
diff --git a/web/src/admin/sources/oauth/OAuthSourceForm.ts b/web/src/admin/sources/oauth/OAuthSourceForm.ts
index 86db82585..51b1c6e42 100644
--- a/web/src/admin/sources/oauth/OAuthSourceForm.ts
+++ b/web/src/admin/sources/oauth/OAuthSourceForm.ts
@@ -184,28 +184,31 @@ export class OAuthSourceForm extends ModelForm {
`
: html``}
- ${this.providerType.slug === ProviderTypeEnum.Openidconnect
- ? html`
-
-
-
- ${msg(
- "OIDC well-known configuration URL. Can be used to automatically configure the URLs above.",
- )}
-
-
-
+
+
+ ${msg(
+ "OIDC well-known configuration URL. Can be used to automatically configure the URLs above.",
+ )}
+
+ `
+ : html``}
+ ${this.providerType.slug === ProviderTypeEnum.Openidconnect ||
+ this.providerType.oidcJwksUrl !== ""
+ ? html`
@@ -224,7 +227,6 @@ export class OAuthSourceForm extends ModelForm {
)}
-
{
>
${msg("Raw JWKS data.")}
-
- `
+ `
: html``}
`;
diff --git a/web/xliff/de.xlf b/web/xliff/de.xlf
index 1e95e6975..fb09939a9 100644
--- a/web/xliff/de.xlf
+++ b/web/xliff/de.xlf
@@ -6037,6 +6037,33 @@ Bindings to groups/users are checked against the user of the event.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+