[PM-4881]: Added userName to fido2credential (#6922)

* [PM-4881]: Added userName to fido2credential

* added user.name as input params

* Fixed some type errors

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

@@ -8,6 +8,7 @@ export class Fido2CredentialData {
   keyValue: string;
   rpId: string;
   userHandle: string;
+  userName: string;
   counter: string;
   rpName: string;
   userDisplayName: string;
@@ -26,6 +27,7 @@ export class Fido2CredentialData {
     this.keyValue = data.keyValue;
     this.rpId = data.rpId;
     this.userHandle = data.userHandle;
+    this.userName = data.userName;
     this.counter = data.counter;
     this.rpName = data.rpName;
     this.userDisplayName = data.userDisplayName;

libs/common/src/vault/models/domain/fido2-credential.spec.ts

@@ -25,6 +25,7 @@ describe("Fido2Credential", () => {
         keyValue: null,
         rpId: null,
         userHandle: null,
+        userName: null,
         rpName: null,
         userDisplayName: null,
         counter: null,
@@ -42,6 +43,7 @@ describe("Fido2Credential", () => {
         keyValue: "keyValue",
         rpId: "rpId",
         userHandle: "userHandle",
+        userName: "userName",
         counter: "counter",
         rpName: "rpName",
         userDisplayName: "userDisplayName",
@@ -58,6 +60,7 @@ describe("Fido2Credential", () => {
         keyValue: { encryptedString: "keyValue", encryptionType: 0 },
         rpId: { encryptedString: "rpId", encryptionType: 0 },
         userHandle: { encryptedString: "userHandle", encryptionType: 0 },
+        userName: { encryptedString: "userName", encryptionType: 0 },
         counter: { encryptedString: "counter", encryptionType: 0 },
         rpName: { encryptedString: "rpName", encryptionType: 0 },
         userDisplayName: { encryptedString: "userDisplayName", encryptionType: 0 },
@@ -85,6 +88,7 @@ describe("Fido2Credential", () => {
       credential.keyValue = mockEnc("keyValue");
       credential.rpId = mockEnc("rpId");
       credential.userHandle = mockEnc("userHandle");
+      credential.userName = mockEnc("userName");
       credential.counter = mockEnc("2");
       credential.rpName = mockEnc("rpName");
       credential.userDisplayName = mockEnc("userDisplayName");
@@ -101,6 +105,7 @@ describe("Fido2Credential", () => {
         keyValue: "keyValue",
         rpId: "rpId",
         userHandle: "userHandle",
+        userName: "userName",
         rpName: "rpName",
         userDisplayName: "userDisplayName",
         counter: 2,
@@ -120,6 +125,7 @@ describe("Fido2Credential", () => {
         keyValue: "keyValue",
         rpId: "rpId",
         userHandle: "userHandle",
+        userName: "userName",
         counter: "2",
         rpName: "rpName",
         userDisplayName: "userDisplayName",
@@ -144,6 +150,7 @@ describe("Fido2Credential", () => {
       credential.keyValue = createEncryptedEncString("keyValue");
       credential.rpId = createEncryptedEncString("rpId");
       credential.userHandle = createEncryptedEncString("userHandle");
+      credential.userName = createEncryptedEncString("userName");
       credential.counter = createEncryptedEncString("2");
       credential.rpName = createEncryptedEncString("rpName");
       credential.userDisplayName = createEncryptedEncString("userDisplayName");

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

@@ -14,6 +14,7 @@ export class Fido2Credential extends Domain {
   keyValue: EncString;
   rpId: EncString;
   userHandle: EncString;
+  userName: EncString;
   counter: EncString;
   rpName: EncString;
   userDisplayName: EncString;
@@ -37,6 +38,7 @@ export class Fido2Credential extends Domain {
         keyValue: null,
         rpId: null,
         userHandle: null,
+        userName: null,
         counter: null,
         rpName: null,
         userDisplayName: null,
@@ -58,6 +60,7 @@ export class Fido2Credential extends Domain {
         keyValue: null,
         rpId: null,
         userHandle: null,
+        userName: null,
         rpName: null,
         userDisplayName: null,
         discoverable: null,
@@ -102,6 +105,7 @@ export class Fido2Credential extends Domain {
       keyValue: null,
       rpId: null,
       userHandle: null,
+      userName: null,
       counter: null,
       rpName: null,
       userDisplayName: null,
@@ -122,6 +126,7 @@ export class Fido2Credential extends Domain {
     const keyValue = EncString.fromJSON(obj.keyValue);
     const rpId = EncString.fromJSON(obj.rpId);
     const userHandle = EncString.fromJSON(obj.userHandle);
+    const userName = EncString.fromJSON(obj.userName);
     const counter = EncString.fromJSON(obj.counter);
     const rpName = EncString.fromJSON(obj.rpName);
     const userDisplayName = EncString.fromJSON(obj.userDisplayName);
@@ -136,6 +141,7 @@ export class Fido2Credential extends Domain {
       keyValue,
       rpId,
       userHandle,
+      userName,
       counter,
       rpName,
       userDisplayName,

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

@@ -135,6 +135,7 @@ describe("Login DTO", () => {
             keyValue: "keyValue" as EncryptedString,
             rpId: "rpId" as EncryptedString,
             userHandle: "userHandle" as EncryptedString,
+            userName: "userName" as EncryptedString,
             counter: "counter" as EncryptedString,
             rpName: "rpName" as EncryptedString,
             userDisplayName: "userDisplayName" as EncryptedString,
@@ -159,6 +160,7 @@ describe("Login DTO", () => {
             keyValue: "keyValue_fromJSON",
             rpId: "rpId_fromJSON",
             userHandle: "userHandle_fromJSON",
+            userName: "userName_fromJSON",
             counter: "counter_fromJSON",
             rpName: "rpName_fromJSON",
             userDisplayName: "userDisplayName_fromJSON",
@@ -185,6 +187,7 @@ function initializeFido2Credential<T extends Fido2CredentialLike>(key: T): T {
   key.keyValue = "keyValue";
   key.rpId = "rpId";
   key.userHandle = "userHandle";
+  key.userName = "userName";
   key.counter = "counter";
   key.rpName = "rpName";
   key.userDisplayName = "userDisplayName";
@@ -202,6 +205,7 @@ function encryptFido2Credential(key: Fido2CredentialLike): Fido2Credential {
   encrypted.keyValue = { encryptedString: key.keyValue, encryptionType: 0 } as EncString;
   encrypted.rpId = { encryptedString: key.rpId, encryptionType: 0 } as EncString;
   encrypted.userHandle = { encryptedString: key.userHandle, encryptionType: 0 } as EncString;
+  encrypted.userName = { encryptedString: key.userName, encryptionType: 0 } as EncString;
   encrypted.counter = { encryptedString: key.counter, encryptionType: 0 } as EncString;
   encrypted.rpName = { encryptedString: key.rpName, encryptionType: 0 } as EncString;
   encrypted.userDisplayName = {

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

@@ -81,6 +81,7 @@ export class CipherRequest {
             keyApi.rpName = key.rpName != null ? key.rpName.encryptedString : null;
             keyApi.counter = key.counter != null ? key.counter.encryptedString : null;
             keyApi.userHandle = key.userHandle != null ? key.userHandle.encryptedString : null;
+            keyApi.userName = key.userName != null ? key.userName.encryptedString : null;
             keyApi.userDisplayName =
               key.userDisplayName != null ? key.userDisplayName.encryptedString : null;
             keyApi.discoverable =

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

@@ -10,6 +10,7 @@ export class Fido2CredentialView extends ItemView {
   keyValue: string;
   rpId: string;
   userHandle: string;
+  userName: string;
   counter: number;
   rpName: string;
   userDisplayName: string;