[PM-2270] Renamed Fido2Key.userName to Fido2Key.userDisplayName (#6005)

* Renamed fido2key property username to userDisplayName

* Renamed username property on fido2key object to userdisplayname

* updated username to userDisplayName in fido2 export

libs/common/src/models/export/fido2key.export.ts

@@ -15,7 +15,7 @@ export class Fido2KeyExport {
     req.userHandle = "userHandle";
     req.counter = "counter";
     req.rpName = "rpName";
-    req.userName = "userName";
+    req.userDisplayName = "userDisplayName";
     return req;
   }
 
@@ -29,7 +29,7 @@ export class Fido2KeyExport {
     view.userHandle = req.userHandle;
     view.counter = parseInt(req.counter);
     view.rpName = req.rpName;
-    view.userName = req.userName;
+    view.userDisplayName = req.userDisplayName;
     return view;
   }
 
@@ -44,7 +44,8 @@ export class Fido2KeyExport {
     domain.userHandle = req.userHandle != null ? new EncString(req.userHandle) : null;
     domain.counter = req.counter != null ? new EncString(req.counter) : null;
     domain.rpName = req.rpName != null ? new EncString(req.rpName) : null;
-    domain.userName = req.userName != null ? new EncString(req.userName) : null;
+    domain.userDisplayName =
+      req.userDisplayName != null ? new EncString(req.userDisplayName) : null;
     return domain;
   }
 
@@ -57,7 +58,7 @@ export class Fido2KeyExport {
   userHandle: string;
   counter: string;
   rpName: string;
-  userName: string;
+  userDisplayName: string;
 
   constructor(o?: Fido2KeyView | Fido2KeyDomain) {
     if (o == null) {
@@ -74,7 +75,7 @@ export class Fido2KeyExport {
       this.userHandle = o.userHandle;
       this.counter = String(o.counter);
       this.rpName = o.rpName;
-      this.userName = o.userName;
+      this.userDisplayName = o.userDisplayName;
     } else {
       this.nonDiscoverableId = o.nonDiscoverableId?.encryptedString;
       this.keyType = o.keyType?.encryptedString;
@@ -85,7 +86,7 @@ export class Fido2KeyExport {
       this.userHandle = o.userHandle?.encryptedString;
       this.counter = o.counter?.encryptedString;
       this.rpName = o.rpName?.encryptedString;
-      this.userName = o.userName?.encryptedString;
+      this.userDisplayName = o.userDisplayName?.encryptedString;
     }
   }
 }

libs/common/src/vault/api/fido2-key.api.ts

@@ -12,7 +12,7 @@ export class Fido2KeyApi extends BaseResponse {
 
   // Extras
   rpName: string;
-  userName: string;
+  userDisplayName: string;
 
   constructor(data: any = null) {
     super(data);
@@ -29,6 +29,6 @@ export class Fido2KeyApi extends BaseResponse {
     this.userHandle = this.getResponseProperty("UserHandle");
     this.counter = this.getResponseProperty("Counter");
     this.rpName = this.getResponseProperty("RpName");
-    this.userName = this.getResponseProperty("UserName");
+    this.userDisplayName = this.getResponseProperty("UserDisplayName");
   }
 }

libs/common/src/vault/models/data/fido2-key.data.ts

@@ -12,7 +12,7 @@ export class Fido2KeyData {
 
   // Extras
   rpName: string;
-  userName: string;
+  userDisplayName: string;
 
   constructor(data?: Fido2KeyApi) {
     if (data == null) {
@@ -28,6 +28,6 @@ export class Fido2KeyData {
     this.userHandle = data.userHandle;
     this.counter = data.counter;
     this.rpName = data.rpName;
-    this.userName = data.userName;
+    this.userDisplayName = data.userDisplayName;
   }
 }

libs/common/src/vault/models/domain/fido2-key.ts

@@ -18,7 +18,7 @@ export class Fido2Key extends Domain {
 
   // Extras
   rpName: EncString;
-  userName: EncString;
+  userDisplayName: EncString;
   origin: EncString;
 
   constructor(obj?: Fido2KeyData) {
@@ -40,7 +40,7 @@ export class Fido2Key extends Domain {
         userHandle: null,
         counter: null,
         rpName: null,
-        userName: null,
+        userDisplayName: null,
         origin: null,
       },
       []
@@ -59,7 +59,7 @@ export class Fido2Key extends Domain {
         rpId: null,
         userHandle: null,
         rpName: null,
-        userName: null,
+        userDisplayName: null,
         origin: null,
       },
       orgId,
@@ -92,7 +92,7 @@ export class Fido2Key extends Domain {
       userHandle: null,
       counter: null,
       rpName: null,
-      userName: null,
+      userDisplayName: null,
       origin: null,
     });
     return i;
@@ -112,7 +112,7 @@ export class Fido2Key extends Domain {
     const userHandle = EncString.fromJSON(obj.userHandle);
     const counter = EncString.fromJSON(obj.counter);
     const rpName = EncString.fromJSON(obj.rpName);
-    const userName = EncString.fromJSON(obj.userName);
+    const userDisplayName = EncString.fromJSON(obj.userDisplayName);
     const origin = EncString.fromJSON(obj.origin);
 
     return Object.assign(new Fido2Key(), obj, {
@@ -125,7 +125,7 @@ export class Fido2Key extends Domain {
       userHandle,
       counter,
       rpName,
-      userName,
+      userDisplayName,
       origin,
     });
   }

libs/common/src/vault/models/domain/login.spec.ts

@@ -122,7 +122,7 @@ describe("Login DTO", () => {
           userHandle: "userHandle" as EncryptedString,
           counter: "counter" as EncryptedString,
           rpName: "rpName" as EncryptedString,
-          userName: "userName" as EncryptedString,
+          userDisplayName: "userDisplayName" as EncryptedString,
           origin: "origin" as EncryptedString,
         },
       });
@@ -143,7 +143,7 @@ describe("Login DTO", () => {
           userHandle: "userHandle_fromJSON",
           counter: "counter_fromJSON",
           rpName: "rpName_fromJSON",
-          userName: "userName_fromJSON",
+          userDisplayName: "userDisplayName_fromJSON",
           origin: "origin_fromJSON",
         },
       });

libs/common/src/vault/models/request/cipher.request.ts

@@ -100,9 +100,9 @@ export class CipherRequest {
             cipher.login.fido2Key.userHandle != null
               ? cipher.login.fido2Key.userHandle.encryptedString
               : null;
-          this.login.fido2Key.userName =
-            cipher.login.fido2Key.userName != null
-              ? cipher.login.fido2Key.userName.encryptedString
+          this.login.fido2Key.userDisplayName =
+            cipher.login.fido2Key.userDisplayName != null
+              ? cipher.login.fido2Key.userDisplayName.encryptedString
               : null;
         }
         break;
@@ -193,8 +193,10 @@ export class CipherRequest {
           cipher.fido2Key.counter != null ? cipher.fido2Key.counter.encryptedString : null;
         this.fido2Key.userHandle =
           cipher.fido2Key.userHandle != null ? cipher.fido2Key.userHandle.encryptedString : null;
-        this.fido2Key.userName =
-          cipher.fido2Key.userName != null ? cipher.fido2Key.userName.encryptedString : null;
+        this.fido2Key.userDisplayName =
+          cipher.fido2Key.userDisplayName != null
+            ? cipher.fido2Key.userDisplayName.encryptedString
+            : null;
         break;
       default:
         break;

libs/common/src/vault/models/view/fido2-key.view.ts

@@ -14,10 +14,10 @@ export class Fido2KeyView extends ItemView {
 
   // Extras
   rpName: string;
-  userName: string;
+  userDisplayName: string;
 
   get subTitle(): string {
-    return this.userName;
+    return this.userDisplayName;
   }
 
   get canLaunch(): boolean {

libs/common/src/vault/services/cipher.service.ts

@@ -1103,7 +1103,7 @@ export class CipherService implements CipherServiceAbstraction {
               rpId: null,
               rpName: null,
               userHandle: null,
-              userName: null,
+              userDisplayName: null,
               origin: null,
             },
             key
@@ -1175,7 +1175,7 @@ export class CipherService implements CipherServiceAbstraction {
             rpId: null,
             rpName: null,
             userHandle: null,
-            userName: null,
+            userDisplayName: null,
             origin: null,
           },
           key

libs/common/src/vault/services/fido2/fido2-authenticator.service.spec.ts

@@ -320,7 +320,7 @@ describe("FidoAuthenticatorService", () => {
               rpName: params.rpEntity.name,
               userHandle: Fido2Utils.bufferToString(params.userEntity.id),
               counter: 0,
-              userName: params.userEntity.displayName,
+              userDisplayName: params.userEntity.displayName,
             }),
           })
         );
@@ -419,7 +419,7 @@ describe("FidoAuthenticatorService", () => {
                 rpName: params.rpEntity.name,
                 userHandle: Fido2Utils.bufferToString(params.userEntity.id),
                 counter: 0,
-                userName: params.userEntity.displayName,
+                userDisplayName: params.userEntity.displayName,
               }),
             }),
           })

libs/common/src/vault/services/fido2/fido2-authenticator.service.ts

@@ -427,7 +427,7 @@ async function createKeyView(
   fido2Key.userHandle = Fido2Utils.bufferToString(params.userEntity.id);
   fido2Key.counter = 0;
   fido2Key.rpName = params.rpEntity.name;
-  fido2Key.userName = params.userEntity.displayName;
+  fido2Key.userDisplayName = params.userEntity.displayName;
 
   return fido2Key;
 }