Repository navigation
[SAML Configuration] Show confirm modal when turning off SAML required if Okta SCIM is enabled - #76549
Conversation
|
Hey, I noticed you changed If you want to automatically generate translations for other locales, an Expensify employee will have to:
Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running: npx ts-node ./scripts/generateTranslations.ts --helpTypically, you'd want to translate only what you changed by running |
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
🦜 Polyglot Parrot! 🦜Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues: View the translation diffdiff --git a/src/languages/de.ts b/src/languages/de.ts
index 07b8b95f..8156fb36 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -1190,7 +1190,7 @@ const translations: TranslationDeepObject<typeof en> = {
findExpense: 'Ausgabe finden',
deletedTransaction: ({amount, merchant}: DeleteTransactionParams) => `hat eine Ausgabe gelöscht (${amount} für ${merchant})`,
movedFromReport: ({reportName}: MovedFromReportParams) => `verschob eine Ausgabe${reportName ? `von ${reportName}` : ''}`,
- movedTransaction: ({reportUrl, reportName}: MovedTransactionParams) => `verschob diese Ausgabe${reportName ? `to <a href="${reportUrl}">${reportName}</a>` : ''}`,
+ movedTransaction: ({reportUrl, reportName}: MovedTransactionParams) => `hat diese Ausgabe verschoben${reportName ? `zu <a href="${reportUrl}">${reportName}</a>` : ''}`,
unreportedTransaction: ({reportUrl}: MovedTransactionParams) => `diese Ausgabe in Ihren <a href="${reportUrl}">persönlichen Bereich</a> verschoben`,
movedAction: ({shouldHideMovedReportUrl, movedReportUrl, newParentReportUrl, toPolicyName}: MovedActionParams) => {
if (shouldHideMovedReportUrl) {
@@ -7737,6 +7737,8 @@ ${
anyMemberWillBeRequired: 'Jedes Mitglied, das sich mit einer anderen Methode angemeldet hat, muss sich mithilfe von SAML erneut authentifizieren.',
enableError: 'Konnte die SAML-Aktivierungseinstellung nicht aktualisieren',
requireError: 'Die SAML-Anforderungseinstellung konnte nicht aktualisiert werden.',
+ disableSamlRequired: 'SAML-Pflicht deaktivieren',
+ oktaWarningPrompt: 'Bist du sicher? Dadurch wird auch Okta SCIM deaktiviert.',
},
samlConfigurationDetails: {
title: 'SAML-Konfigurationsdetails',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index de9b3d21..70fd93a3 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -1192,7 +1192,15 @@ const translations: TranslationDeepObject<typeof en> = {
findExpense: 'Trouver une dépense',
deletedTransaction: ({amount, merchant}: DeleteTransactionParams) => `supprimé une dépense (${amount} pour ${merchant})`,
movedFromReport: ({reportName}: MovedFromReportParams) => `a déplacé une dépense${reportName ? `de ${reportName}` : ''}`,
- movedTransaction: ({reportUrl, reportName}: MovedTransactionParams) => `déplacé cette dépense${reportName ? `à <a href="${reportUrl}">${reportName}</a>` : ''}`,
+ movedTransaction: ({reportUrl, reportName}: MovedTransactionParams) =>
+ `a déplacé cette dépense${
+ reportName
+ ? `à <a href="${reportUrl}">${
+ //_/\__/_/ \_,_/\__/\__/\_,_/
+ reportName
+ }</a>`
+ : ''
+ }`,
unreportedTransaction: ({reportUrl}: MovedTransactionParams) => `déplacé cette dépense vers votre <a href="${reportUrl}">espace personnel</a>`,
movedAction: ({shouldHideMovedReportUrl, movedReportUrl, newParentReportUrl, toPolicyName}: MovedActionParams) => {
if (shouldHideMovedReportUrl) {
@@ -7741,6 +7749,8 @@ ${
anyMemberWillBeRequired: 'Tout membre connecté avec une autre méthode devra se réauthentifier via SAML.',
enableError: 'Impossible de mettre à jour le paramètre d’activation SAML',
requireError: 'Impossible de mettre à jour le paramètre d’exigence SAML',
+ disableSamlRequired: 'Désactiver SAML requis',
+ oktaWarningPrompt: 'Êtes-vous sûr ? Cela désactivera également Okta SCIM.',
},
samlConfigurationDetails: {
title: 'Détails de la configuration SAML',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 0d4898c6..1b0e1882 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -1187,7 +1187,7 @@ const translations: TranslationDeepObject<typeof en> = {
findExpense: 'Trova spesa',
deletedTransaction: ({amount, merchant}: DeleteTransactionParams) => `ha eliminato una spesa (${amount} per ${merchant})`,
movedFromReport: ({reportName}: MovedFromReportParams) => `ha spostato una spesa${reportName ? `da ${reportName}` : ''}`,
- movedTransaction: ({reportUrl, reportName}: MovedTransactionParams) => `spostato questa spesa${reportName ? `a <a href="${reportUrl}">${reportName}</a>` : ''}`,
+ movedTransaction: ({reportUrl, reportName}: MovedTransactionParams) => `ha spostato questa spesa${reportName ? `a <a href="${reportUrl}">${reportName}</a>` : ''}`,
unreportedTransaction: ({reportUrl}: MovedTransactionParams) => `spostato questa spesa nel tuo <a href="${reportUrl}">spazio personale</a>`,
movedAction: ({shouldHideMovedReportUrl, movedReportUrl, newParentReportUrl, toPolicyName}: MovedActionParams) => {
if (shouldHideMovedReportUrl) {
@@ -7721,6 +7721,8 @@ ${
anyMemberWillBeRequired: 'Qualsiasi membro che ha effettuato l’accesso con un metodo diverso dovrà autenticarsi nuovamente tramite SAML.',
enableError: "Impossibile aggiornare l'impostazione di abilitazione SAML",
requireError: "Impossibile aggiornare l'impostazione del requisito SAML",
+ disableSamlRequired: 'Disattiva SAML obbligatorio',
+ oktaWarningPrompt: 'Sei sicuro? Questo disattiverà anche Okta SCIM.',
},
samlConfigurationDetails: {
title: 'Dettagli della configurazione SAML',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 643b434a..c74281b5 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -1189,7 +1189,7 @@ const translations: TranslationDeepObject<typeof en> = {
findExpense: '経費を検索',
deletedTransaction: ({amount, merchant}: DeleteTransactionParams) => `経費を削除しました (${merchant}の${amount})`,
movedFromReport: ({reportName}: MovedFromReportParams) => `費用${reportName ? `${reportName} から` : ''}を移動しました`,
- movedTransaction: ({reportUrl, reportName}: MovedTransactionParams) => `この経費${reportName ? `to <a href="${reportUrl}">${reportName}</a>` : ''}を移動しました`,
+ movedTransaction: ({reportUrl, reportName}: MovedTransactionParams) => `この経費を移動しました${reportName ? `へ <a href="${reportUrl}">${reportName}</a>` : ''}`,
unreportedTransaction: ({reportUrl}: MovedTransactionParams) => `この経費をあなたの<a href="${reportUrl}">個人スペース</a>に移動しました。`,
movedAction: ({shouldHideMovedReportUrl, movedReportUrl, newParentReportUrl, toPolicyName}: MovedActionParams) => {
if (shouldHideMovedReportUrl) {
@@ -7646,6 +7646,8 @@ ${
anyMemberWillBeRequired: '別の方法でサインインしたメンバーは、SAMLを使用して再認証する必要があります。',
enableError: 'SAMLの有効化設定を更新できませんでした',
requireError: 'SAML の要件設定を更新できませんでした',
+ disableSamlRequired: 'SAML 必須を無効にする',
+ oktaWarningPrompt: '本当に実行しますか?これによりOkta SCIMも無効になります。',
},
samlConfigurationDetails: {
title: 'SAML 設定の詳細',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 374626fa..a6c94730 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -7690,6 +7690,8 @@ ${
anyMemberWillBeRequired: 'Elk lid dat met een andere methode is aangemeld, moet zich opnieuw authenticeren via SAML.',
enableError: 'Kon de instelling voor SAML-inschakeling niet bijwerken',
requireError: 'Kan SAML-vereiste-instelling niet bijwerken',
+ disableSamlRequired: 'SAML vereist uitschakelen',
+ oktaWarningPrompt: 'Weet je het zeker? Dit schakelt ook Okta SCIM uit.',
},
samlConfigurationDetails: {
title: 'SAML-configuratiedetails',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index a35a7c6f..d5077d47 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -1186,7 +1186,12 @@ const translations: TranslationDeepObject<typeof en> = {
findExpense: 'Znajdź wydatek',
deletedTransaction: ({amount, merchant}: DeleteTransactionParams) => `usunął wydatek (${amount} dla ${merchant})`,
movedFromReport: ({reportName}: MovedFromReportParams) => `przeniósł wydatek${reportName ? `z ${reportName}` : ''}`,
- movedTransaction: ({reportUrl, reportName}: MovedTransactionParams) => `przeniesiono ten wydatek${reportName ? `do <a href="${reportUrl}">${reportName}</a>` : ''}`,
+ movedTransaction: ({reportUrl, reportName}: MovedTransactionParams) =>
+ `przeniesiono ten wydatek${
+ reportName
+ ? `do <a href="${reportUrl}">${reportName}</a>` //_/\__/_/ \_,_/\__/\__/\_,_/
+ : ''
+ }`,
unreportedTransaction: ({reportUrl}: MovedTransactionParams) => `przeniósł ten wydatek do twojej <a href="${reportUrl}">przestrzeni osobistej</a>`,
movedAction: ({shouldHideMovedReportUrl, movedReportUrl, newParentReportUrl, toPolicyName}: MovedActionParams) => {
if (shouldHideMovedReportUrl) {
@@ -7681,6 +7686,8 @@ ${
anyMemberWillBeRequired: 'Każdy członek, który zalogował się inną metodą, będzie musiał ponownie się uwierzytelnić za pomocą SAML.',
enableError: 'Nie udało się zaktualizować ustawienia włączenia SAML',
requireError: 'Nie udało się zaktualizować ustawienia wymogu SAML',
+ disableSamlRequired: 'Wyłącz wymóg SAML',
+ oktaWarningPrompt: 'Czy na pewno? To również wyłączy Okta SCIM.',
},
samlConfigurationDetails: {
title: 'Szczegóły konfiguracji SAML',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 6ff4bba8..2ded869a 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -7697,6 +7697,8 @@ ${
anyMemberWillBeRequired: 'Qualquer membro que tiver feito login com um método diferente precisará se autenticar novamente usando SAML.',
enableError: 'Não foi possível atualizar a configuração de habilitação do SAML',
requireError: 'Não foi possível atualizar a configuração de obrigatoriedade do SAML',
+ disableSamlRequired: 'Desativar exigência de SAML',
+ oktaWarningPrompt: 'Tem certeza? Isso também desativará o Okta SCIM.',
},
samlConfigurationDetails: {
title: 'Detalhes da configuração do SAML',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 7c3cf9e4..018344b4 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -1173,7 +1173,7 @@ const translations: TranslationDeepObject<typeof en> = {
findExpense: '查找费用',
deletedTransaction: ({amount, merchant}: DeleteTransactionParams) => `删除了一笔费用 (${merchant} 的 ${amount})`,
movedFromReport: ({reportName}: MovedFromReportParams) => `移动了一笔费用${reportName ? `来自${reportName}` : ''}`,
- movedTransaction: ({reportUrl, reportName}: MovedTransactionParams) => `移动了此费用${reportName ? `至 <a href="${reportUrl}">${reportName}</a>` : ''}`,
+ movedTransaction: ({reportUrl, reportName}: MovedTransactionParams) => `已移动此笔费用${reportName ? `到 <a href="${reportUrl}">${reportName}</a>` : ''}`,
unreportedTransaction: ({reportUrl}: MovedTransactionParams) => `已将此费用移动到您的<a href="${reportUrl}">个人空间</a>`,
movedAction: ({shouldHideMovedReportUrl, movedReportUrl, newParentReportUrl, toPolicyName}: MovedActionParams) => {
if (shouldHideMovedReportUrl) {
@@ -7524,6 +7524,8 @@ ${
anyMemberWillBeRequired: '使用不同方式登录的任何成员将被要求使用 SAML 重新进行身份验证。',
enableError: '无法更新 SAML 启用设置',
requireError: '无法更新 SAML 要求设置',
+ disableSamlRequired: '禁用 SAML 要求',
+ oktaWarningPrompt: '你确定吗?这也会禁用 Okta SCIM。',
},
samlConfigurationDetails: {
title: 'SAML 配置详细信息',
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
|
@dannymcclain @abdulrahuman5196 One of you needs to copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
|
cc: @ZhenjaHorbach |
Reviewer Checklist
Screenshots/VideosAndroid: HybridApp2025-12-04.10.34.12.movAndroid: mWeb Chrome2025-12-04.10.35.34.moviOS: HybridApp2025-12-04.10.30.41.moviOS: mWeb Safari2025-12-04.10.29.31.movMacOS: Chrome / Safari2025-12-04.10.24.28.mov |
|
the tests fail on main too |
|
The toggle sometimes behaves strange And looks like it's a web-specific issue 2025-12-04.10.25.36.mov |
|
But just updated nodes |
mountiny
left a comment
There was a problem hiding this comment.
Thanks @NikkiWines all yours
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/NikkiWines in version: 9.2.72-0 🚀
|
|
🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.2.72-2 🚀
|
Explanation of Change
When the user clicks on the toggle to turn off SAML login being required, if they have Okta SCIM enabled, we now show a confirmation modal.
Fixed Issues
$ #76390
PROPOSAL: N/A
Tests
Offline tests
Same as tests, but offline. After turning the setting off, the row should be greyed out. If never clicked "disabled" (always cancelled) it should not be greyed out.
QA Steps
Same as tests.
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Nagranie.z.ekranu.2025-12-3.o.18.11.51.mov
Android: mWeb Chrome
Nagranie.z.ekranu.2025-12-3.o.14.15.41.mov
iOS: Native
Simulator.Screen.Recording.-.iPhone.16.Pro.Max.-.2025-12-03.at.18.09.49.mp4
iOS: mWeb Safari
Simulator.Screen.Recording.-.iPhone.16.Pro.Max.-.2025-12-03.at.18.16.05.mp4
MacOS: Chrome / Safari
Nagranie.z.ekranu.2025-12-3.o.13.30.46.mov