fix: make sure token names are unique (#404)

* fix: make sure token names are unique * refactor: fix whitespacing and use string constants * refactor: fix whitespacing Co-authored-by: kunzheng <58841788+kunzms@users.noreply.github.com>
microsoft · Jul 13, 2020 · d8fa614 · d8fa614
1 parent 8cc421c
commit d8fa614
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/src/common/localization/en-us.ts b/src/common/localization/en-us.ts
@@ -69,6 +69,7 @@ export const english: IAppStrings = {
             key: {
                 title: "Key",
             },
+            duplicateNameErrorMessage: "Token name must be unique for all tokens",
         },
         securityTokens: {
             title: "Security Tokens",

diff --git a/src/common/localization/es-cl.ts b/src/common/localization/es-cl.ts
@@ -69,6 +69,7 @@ export const spanish: IAppStrings = {
             key: {
                 title: "Clave",
             },
+            duplicateNameErrorMessage: "El nombre del token debe ser único para todos los tokens",
         },
         securityTokens: {
             title: "Tokens de seguridad",

diff --git a/src/common/strings.ts b/src/common/strings.ts
@@ -69,6 +69,7 @@ export interface IAppStrings {
             key: {
                 title: string;
             },
+            duplicateNameErrorMessage: string,
         },
         securityTokens: {
             title: string;

diff --git a/src/react/components/pages/appSettings/appSettingsForm.tsx b/src/react/components/pages/appSettings/appSettingsForm.tsx
@@ -106,6 +106,26 @@ export class AppSettingsForm extends React.Component<IAppSettingsFormProps, IApp
     }
 
     private onFormValidate(appSettings: IAppSettings, errors: FormValidation) {
+        const tokensMap = {};
+        appSettings.securityTokens.forEach((token, index) => {
+            if (!token.name) {
+                return;
+            }
+            const tokenName = token.name;  // not trimmed because user's might already have non trimmed token names
+            if (tokensMap[tokenName] !== undefined) {
+                const initialSecurityTokenErrorName = errors.securityTokens[tokensMap[tokenName]].name;
+                const duplicateSecurityTokenErrorName = errors.securityTokens[index.toString()].name
+                if (duplicateSecurityTokenErrorName) {
+                    duplicateSecurityTokenErrorName.addError(strings.appSettings.securityToken.duplicateNameErrorMessage);
+                }
+                if (initialSecurityTokenErrorName.__errors.length === 0) {
+                    initialSecurityTokenErrorName.addError(strings.appSettings.securityToken.duplicateNameErrorMessage);
+                }
+            } else {
+                tokensMap[tokenName] = index;
+            }
+        });
+
         if (this.state.classNames.indexOf("was-validated") === -1) {
             this.setState({
                 classNames: [...this.state.classNames, "was-validated"],