From d376927e5e583d816e78a26168f870ac78b071c0 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Wed, 10 Feb 2021 09:06:18 +1000
Subject: [PATCH] Improved handling of grantor access to organizations after
 takeover (refactored) (#267)

* Revert "Add policy property to TakeoverResponse"

This reverts commit 31da5081e6833cf8a9d5bb869c14600f25ca3f39.

* Add getEmergencyGrantorPolicies to api service
---
 src/abstractions/api.service.ts                | 1 +
 src/models/response/emergencyAccessResponse.ts | 4 ----
 src/services/api.service.ts                    | 5 +++++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/abstractions/api.service.ts b/src/abstractions/api.service.ts
index beb9fec305..63935f17ea 100644
--- a/src/abstractions/api.service.ts
+++ b/src/abstractions/api.service.ts
@@ -292,6 +292,7 @@ export abstract class ApiService {
     getEmergencyAccessTrusted: () => Promise<ListResponse<EmergencyAccessGranteeDetailsResponse>>;
     getEmergencyAccessGranted: () => Promise<ListResponse<EmergencyAccessGrantorDetailsResponse>>;
     getEmergencyAccess: (id: string) => Promise<EmergencyAccessGranteeDetailsResponse>;
+    getEmergencyGrantorPolicies: (id: string) => Promise<ListResponse<PolicyResponse>>;
     putEmergencyAccess: (id: string, request: EmergencyAccessUpdateRequest) => Promise<any>;
     deleteEmergencyAccess: (id: string) => Promise<any>;
     postEmergencyAccessInvite: (request: EmergencyAccessInviteRequest) => Promise<any>;
diff --git a/src/models/response/emergencyAccessResponse.ts b/src/models/response/emergencyAccessResponse.ts
index 400f16f755..fbd6084938 100644
--- a/src/models/response/emergencyAccessResponse.ts
+++ b/src/models/response/emergencyAccessResponse.ts
@@ -1,10 +1,8 @@
 import { EmergencyAccessStatusType } from '../../enums/emergencyAccessStatusType';
 import { EmergencyAccessType } from '../../enums/emergencyAccessType';
 import { KdfType } from '../../enums/kdfType';
-
 import { BaseResponse } from './baseResponse';
 import { CipherResponse } from './cipherResponse';
-import { PolicyResponse } from './policyResponse';
 
 export class EmergencyAccessGranteeDetailsResponse extends BaseResponse {
     id: string;
@@ -56,7 +54,6 @@ export class EmergencyAccessTakeoverResponse extends BaseResponse {
     keyEncrypted: string;
     kdf: KdfType;
     kdfIterations: number;
-    policy: PolicyResponse[];
 
     constructor(response: any) {
         super(response);
@@ -64,7 +61,6 @@ export class EmergencyAccessTakeoverResponse extends BaseResponse {
         this.keyEncrypted = this.getResponseProperty('KeyEncrypted');
         this.kdf = this.getResponseProperty('Kdf');
         this.kdfIterations = this.getResponseProperty('KdfIterations');
-        this.policy = this.getResponseProperty('policy');
     }
 }
 
diff --git a/src/services/api.service.ts b/src/services/api.service.ts
index 793762889d..29c94b65e8 100644
--- a/src/services/api.service.ts
+++ b/src/services/api.service.ts
@@ -933,6 +933,11 @@ export class ApiService implements ApiServiceAbstraction {
         return new EmergencyAccessGranteeDetailsResponse(r);
     }
 
+    async getEmergencyGrantorPolicies(id: string): Promise<ListResponse<PolicyResponse>> {
+        const r = await this.send('GET', '/emergency-access/' + id + '/policies', null, true, true);
+        return new ListResponse(r, PolicyResponse);
+    }
+
     putEmergencyAccess(id: string, request: EmergencyAccessUpdateRequest): Promise<any> {
         return this.send('PUT', '/emergency-access/' + id, request, true, false);
     }