From 5056c12b385096af81983bd0126dd3333e3e3f74 Mon Sep 17 00:00:00 2001 From: Kerry Date: Thu, 19 Oct 2023 19:00:29 +1300 Subject: [PATCH] configure feature_oidc_native_flow as a feature setting, update copy (#11773) --- src/i18n/strings/en_EN.json | 3 ++- src/settings/Settings.tsx | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 12982b9117..d71de029d8 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1427,7 +1427,8 @@ "notification_settings_beta_caption": "Introducing a simpler way to change your notification settings. Customize your %(brand)s, just the way you like.", "notification_settings_beta_title": "Notification Settings", "notifications": "Enable the notifications panel in the room header", - "oidc_native_flow": "Enable new native OIDC flows (Under active development)", + "oidc_native_flow": "OIDC native authentication", + "oidc_native_flow_description": "⚠ WARNING: Experimental. Use OIDC native authentication when supported by the server.", "pinning": "Message Pinning", "render_reaction_images": "Render custom images in reactions", "render_reaction_images_description": "Sometimes referred to as \"custom emojis\".", diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx index cc4758eccb..7f92f0413f 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -444,8 +444,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { default: false, }, [Features.OidcNativeFlow]: { + isFeature: true, + labsGroup: LabGroup.Developer, supportedLevels: LEVELS_FEATURE, displayName: _td("labs|oidc_native_flow"), + description: _td("labs|oidc_native_flow_description"), default: false, }, "feature_rust_crypto": {