From c2e401818212e6dcf2e9f2807c1e70f310e3ed4a Mon Sep 17 00:00:00 2001
From: Passerino <bartosz.d.wrobel@gmail.com>
Date: Wed, 9 Mar 2022 09:23:03 +0100
Subject: [PATCH] feat(claims): remove deprecated 'fields' property

BREAKING CHANGE: backward compatible 'fields' props have been removed. Use 'requestorFields' instead
---
 docs/api/classes/ClaimsService.md       |  3 --
 e2e/domains.service/domain.migration.ts | 62 ++++++++++++-------------
 package-lock.json                       |  4 +-
 src/modules/claims/claims.service.ts    | 10 +---
 4 files changed, 34 insertions(+), 45 deletions(-)

diff --git a/docs/api/classes/ClaimsService.md b/docs/api/classes/ClaimsService.md
index 0a0bdd05..47533648 100644
--- a/docs/api/classes/ClaimsService.md
+++ b/docs/api/classes/ClaimsService.md
@@ -52,8 +52,6 @@
 
 **`description`** allows subject to request for credential
 
-**`field`** { claim: fields }  - @deprecated - use requestorFields instead
-
 #### Parameters
 
 | Name | Type |
@@ -62,7 +60,6 @@
 | `__namedParameters.claim` | `Object` |
 | `__namedParameters.claim.claimType` | `string` |
 | `__namedParameters.claim.claimTypeVersion` | `number` |
-| `__namedParameters.claim.fields?` | { `key`: `string` ; `value`: `string` \| `number`  }[] |
 | `__namedParameters.claim.issuerFields?` | { `key`: `string` ; `value`: `string` \| `number`  }[] |
 | `__namedParameters.claim.requestorFields?` | { `key`: `string` ; `value`: `string` \| `number`  }[] |
 | `__namedParameters.registrationTypes?` | [`RegistrationTypes`](../enums/RegistrationTypes.md)[] |
diff --git a/e2e/domains.service/domain.migration.ts b/e2e/domains.service/domain.migration.ts
index 0b278503..1a07a56d 100644
--- a/e2e/domains.service/domain.migration.ts
+++ b/e2e/domains.service/domain.migration.ts
@@ -1,35 +1,35 @@
-import { VOLTA_CHAIN_ID } from '@energyweb/iam-contracts';
-import { providers } from 'ethers';
-import { Wallet } from 'ethers';
-import { updateLegacyIssuers } from '../../src/utils/updateLegacyIssuers';
-import util from 'util';
+// import { VOLTA_CHAIN_ID } from '@energyweb/iam-contracts';
+// import { providers } from 'ethers';
+// import { Wallet } from 'ethers';
+// import { updateLegacyIssuers } from '../../src/utils/updateLegacyIssuers';
+// import util from 'util';
 
-const { JsonRpcProvider } = providers;
+// const { JsonRpcProvider } = providers;
 
-describe.skip('Domains migration', () => {
-  let rootOwner: Wallet;
-  const root = 'spotify.apps.dmitryfesenko.iam.ewc';
-  const ganacheUrl = 'http://localhost:8544';
+// describe.skip('Domains migration', () => {
+//   let rootOwner: Wallet;
+//   const root = 'spotify.apps.dmitryfesenko.iam.ewc';
+//   const ganacheUrl = 'http://localhost:8544';
 
-  beforeAll(async () => {
-    rootOwner = Wallet.createRandom().connect(new JsonRpcProvider(ganacheUrl));
-  });
+//   beforeAll(async () => {
+//     rootOwner = Wallet.createRandom().connect(new JsonRpcProvider(ganacheUrl));
+//   });
 
-  test(
-    'Role definitions should be migrated',
-    async () => {
-      const updatedDomains = await updateLegacyIssuers(
-        root,
-        rootOwner,
-        VOLTA_CHAIN_ID
-      );
-      updatedDomains.forEach((d) => {
-        console.group(d.domain);
-        console.log('def:', util.inspect(d.legacyDef, { depth: 5 }));
-        console.log('updated def:', util.inspect(d.updatedDef, { depth: 5 }));
-        console.groupEnd();
-      });
-    },
-    10 * 60 * 1000
-  );
-});
+//   test(
+//     'Role definitions should be migrated',
+//     async () => {
+//       const updatedDomains = await updateLegacyIssuers(
+//         root,
+//         rootOwner,
+//         VOLTA_CHAIN_ID
+//       );
+//       updatedDomains.forEach((d) => {
+//         console.group(d.domain);
+//         console.log('def:', util.inspect(d.legacyDef, { depth: 5 }));
+//         console.log('updated def:', util.inspect(d.updatedDef, { depth: 5 }));
+//         console.groupEnd();
+//       });
+//     },
+//     10 * 60 * 1000
+//   );
+// });
diff --git a/package-lock.json b/package-lock.json
index d5b388a8..ac1691f6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "iam-client-lib",
-  "version": "4.2.1-alpha.3",
+  "version": "4.2.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "iam-client-lib",
-      "version": "4.2.1-alpha.3",
+      "version": "4.2.1-alpha.4",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@energyweb/ekc": "^0.6.5",
diff --git a/src/modules/claims/claims.service.ts b/src/modules/claims/claims.service.ts
index d7c6c99b..c47b4100 100644
--- a/src/modules/claims/claims.service.ts
+++ b/src/modules/claims/claims.service.ts
@@ -167,7 +167,6 @@ export class ClaimsService {
 
   /**
    * @description allows subject to request for credential
-   * @field { claim: fields }  - @deprecated - use requestorFields instead
    */
   async createClaimRequest({
     claim,
@@ -177,7 +176,6 @@ export class ClaimsService {
     claim: {
       claimType: string;
       claimTypeVersion: number;
-      fields?: { key: string; value: string | number }[];
       requestorFields?: { key: string; value: string | number }[];
       issuerFields?: { key: string; value: string | number }[];
     };
@@ -185,13 +183,7 @@ export class ClaimsService {
     registrationTypes?: RegistrationTypes[];
   }) {
     const { claimType: role, claimTypeVersion: version } = claim;
-    const { fields, ...strippedClaim } = claim;
-    const data = {
-      ...strippedClaim,
-      requestorFields: claim.requestorFields || fields || [],
-    };
-
-    const token = await this._didRegistry.createPublicClaim({ data, subject });
+    const token = await this._didRegistry.createPublicClaim({ data: claim, subject });
 
     await this.verifyEnrolmentPrerequisites({ subject, role });