Change presentation of config data (#9224)

apps/web/src/app/auth/settings/two-factor-duo.component.html

@@ -29,9 +29,9 @@
               {{ "twoStepLoginProviderEnabled" | i18n }}
             </app-callout>
             <img class="float-right ml-3 mfaType2" alt="Duo logo" />
-            <strong>{{ "twoFactorDuoIntegrationKey" | i18n }}:</strong> {{ ikey }}
+            <strong>{{ "twoFactorDuoClientId" | i18n }}:</strong> {{ clientId }}
             <br />
-            <strong>{{ "twoFactorDuoSecretKey" | i18n }}:</strong> {{ skey }}
+            <strong>{{ "twoFactorDuoClientSecret" | i18n }}:</strong> {{ clientSecret }}
             <br />
             <strong>{{ "twoFactorDuoApiHostname" | i18n }}:</strong> {{ host }}
           </ng-container>
@@ -39,25 +39,25 @@
             <img class="float-right ml-3 mfaType2" alt="Duo logo" />
             <p>{{ "twoFactorDuoDesc" | i18n }}</p>
             <div class="form-group">
-              <label for="ikey">{{ "twoFactorDuoIntegrationKey" | i18n }}</label>
+              <label for="ClientId">{{ "twoFactorDuoClientId" | i18n }}</label>
               <input
-                id="ikey"
+                id="ClientId"
                 type="text"
-                name="IntegrationKey"
+                name="ClientId"
                 class="form-control"
-                [(ngModel)]="ikey"
+                [(ngModel)]="clientId"
                 required
                 appInputVerbatim
               />
             </div>
             <div class="form-group">
-              <label for="skey">{{ "twoFactorDuoSecretKey" | i18n }}</label>
+              <label for="ClientSecret">{{ "twoFactorDuoClientSecret" | i18n }}</label>
               <input
-                id="skey"
+                id="ClientSecret"
                 type="password"
-                name="SecretKey"
+                name="ClientSecret"
                 class="form-control"
-                [(ngModel)]="skey"
+                [(ngModel)]="clientSecret"
                 required
                 appInputVerbatim
                 autocomplete="new-password"

apps/web/src/app/auth/settings/two-factor-duo.component.ts

@@ -19,8 +19,8 @@ import { TwoFactorBaseComponent } from "./two-factor-base.component";
 })
 export class TwoFactorDuoComponent extends TwoFactorBaseComponent {
   type = TwoFactorProviderType.Duo;
-  ikey: string;
+  clientId: string;
-  skey: string;
+  clientSecret: string;
   host: string;
   formPromise: Promise<TwoFactorDuoResponse>;
 
@@ -59,8 +59,8 @@ export class TwoFactorDuoComponent extends TwoFactorBaseComponent {
 
   protected async enable() {
     const request = await this.buildRequestModel(UpdateTwoFactorDuoRequest);
-    request.integrationKey = this.ikey;
+    request.integrationKey = this.clientId;
-    request.secretKey = this.skey;
+    request.secretKey = this.clientSecret;
     request.host = this.host;
 
     return super.enable(async () => {
@@ -78,8 +78,8 @@ export class TwoFactorDuoComponent extends TwoFactorBaseComponent {
   }
 
   private processResponse(response: TwoFactorDuoResponse) {
-    this.ikey = response.integrationKey;
+    this.clientId = response.integrationKey;
-    this.skey = response.secretKey;
+    this.clientSecret = response.secretKey;
     this.host = response.host;
     this.enabled = response.enabled;
   }

apps/web/src/locales/en/messages.json

@@ -1710,11 +1710,11 @@
   "twoFactorDuoDesc": {
     "message": "Enter the Bitwarden application information from your Duo Admin panel."
   },
-  "twoFactorDuoIntegrationKey": {
+  "twoFactorDuoClientId": {
-    "message": "Integration key"
+    "message": "Client Id"
   },
-  "twoFactorDuoSecretKey": {
+  "twoFactorDuoClientSecret": {
-    "message": "Secret key"
+    "message": "Client Secret"
   },
   "twoFactorDuoApiHostname": {
     "message": "API hostname"