chore: robust recovery info fetch.

logion-network/logion-internal#1135
logion-network · Jun 11, 2024 · b6e9531 · b6e9531
1 parent 67a4e99
commit b6e9531
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/src/logion/controllers/account_recovery.controller.ts b/src/logion/controllers/account_recovery.controller.ts
@@ -32,6 +32,8 @@ import { LocRequestAdapter, UserPrivateData } from "./adapters/locrequestadapter
 import { LocRequestRepository } from '../model/locrequest.model.js';
 import { ValidAccountId } from "@logion/node-api";
 import { LegalOfficerDecisionDescription } from '../model/decision.js';
+import { EMPTY_POSTAL_ADDRESS } from '../model/postaladdress.js';
+import { EMPTY_USER_IDENTITY } from '../model/useridentity.js';
 
 type CreateAccountRecoveryRequestView = components["schemas"]["CreateAccountRecoveryRequestView"];
 type AccountRecoveryRequestView = components["schemas"]["AccountRecoveryRequestView"];
@@ -257,8 +259,8 @@ export class AccountRecoveryController extends ApiController {
         if(identity1Loc) {
             const description = identity1Loc.getDescription();
             identity1 = {
-                userIdentity: description.userIdentity,
-                userPostalAddress: description.userPostalAddress,
+                userIdentity: description.userIdentity || EMPTY_USER_IDENTITY,
+                userPostalAddress: description.userPostalAddress || EMPTY_POSTAL_ADDRESS,
             };
         }
         const identity2PrivateData = await this.locRequestAdapter.getUserPrivateData(accountRecoveryRequest.requesterIdentityLocId!);

diff --git a/src/logion/controllers/secret_recovery.controller.ts b/src/logion/controllers/secret_recovery.controller.ts
@@ -25,6 +25,8 @@ import { LocalsObject } from "pug";
 import { DirectoryService } from "../services/directory.service.js";
 import { UUID, ValidAccountId } from "@logion/node-api";
 import { LegalOfficerDecisionDescription } from "../model/decision.js";
+import { EMPTY_POSTAL_ADDRESS } from "../model/postaladdress.js";
+import { EMPTY_USER_IDENTITY } from "../model/useridentity.js";
 
 type CreateSecretRecoveryRequestView = components["schemas"]["CreateSecretRecoveryRequestView"];
 type RecoveryInfoView = components["schemas"]["RecoveryInfoView"];
@@ -178,8 +180,8 @@ export class SecretRecoveryController extends ApiController {
         if(identity1Loc && identity1Loc.getOwner().equals(authenticatedUser.validAccountId)) {
             const description = identity1Loc.getDescription();
             identity1 = {
-                userIdentity: description.userIdentity,
-                userPostalAddress: description.userPostalAddress,
+                userIdentity: description.userIdentity || EMPTY_USER_IDENTITY,
+                userPostalAddress: description.userPostalAddress || EMPTY_POSTAL_ADDRESS,
             };
         }
         return {

diff --git a/src/logion/model/postaladdress.ts b/src/logion/model/postaladdress.ts
@@ -58,3 +58,11 @@ export function toPostalAddress(embedded: EmbeddablePostalAddress | undefined):
         }
         : undefined;
 }
+
+export const EMPTY_POSTAL_ADDRESS: PostalAddress = {
+    city: "",
+    country: "",
+    line1: "",
+    line2: "",
+    postalCode: "",
+}
diff --git a/src/logion/model/useridentity.ts b/src/logion/model/useridentity.ts
@@ -49,3 +49,10 @@ export function toUserIdentity(embedded: EmbeddableUserIdentity | undefined): Us
         }
         : undefined;
 }
+
+export const EMPTY_USER_IDENTITY: UserIdentity = {
+    email: "",
+    firstName: "",
+    lastName: "",
+    phoneNumber: "",
+};
diff --git a/test/unit/model/locrequest.model.spec.ts b/test/unit/model/locrequest.model.spec.ts
@@ -2437,16 +2437,6 @@ function expectSameLinks(item1: LinkDescription, item2: Partial<LinkDescription>
     }
 }
 
-function thenHasLink(name: string) {
-    expect(request.hasLink(name)).toBeTrue();
-}
-
-function thenHasExpectedLinkIndices() {
-    for(let i = 0; i < request.links!.length; ++i) {
-        expect(request.links![i].index).toBe(i);
-    }
-}
-
 function whenPreClosing() {
     request.preClose(false);
 }