@lifeready/core 8.0.10 → 8.0.12

package/fesm2015/lifeready-core.js

@@ -2,11 +2,14 @@ import { __awaiter, __decorate, __rest } from 'tslib';
 import { ɵɵdefineInjectable, ɵɵinject, Injectable, InjectionToken, isDevMode, INJECTOR, Injector, Inject, NgZone, APP_INITIALIZER, NgModule } from '@angular/core';
 import { Apollo, APOLLO_OPTIONS } from 'apollo-angular';
 import graphlib, { Graph } from '@dagrejs/graphlib';
-import _, { cloneDeep } from 'lodash';
 import { JWE, JWS, JWK } from 'node-jose';
 import { AuthClass } from '@aws-amplify/auth/lib-esm/Auth';
 import gql from 'graphql-tag';
 import * as moment_ from 'moment';
+import lodash$1 from 'lodash/cloneDeep';
+import lodash$2 from 'lodash/isEqual';
+import 'lodash/keyBy';
+import lodash from 'lodash/omit';
 import { ApolloLink, createHttpLink, from, InMemoryCache } from '@apollo/client/core';
 import { setContext } from '@apollo/client/link/context';
 import { RetryLink } from '@apollo/client/link/retry';
@@ -35,6 +38,8 @@ var PayloadType;
     PayloadType["UINT_8_ARRAY"] = "UINT_8_ARRAY";
 })(PayloadType || (PayloadType = {}));
 
+// This file is in the "lr-lodash" directory so that we can use the barrel file
+
 function handleApolloError(errors) {
     if (!errors || !errors.length)
         return;
@@ -42,6 +47,7 @@ function handleApolloError(errors) {
         return new KcError({
             code: x.extensions && x.extensions.code,
             source: x.extensions && x.extensions.source,
+            data: x.extensions && lodash(x.extensions, ['code', 'source']),
             message: x.message,
             debug: {
                 locations: x.locations,
@@ -69,6 +75,7 @@ class KcError {
         this._type = 'KcError';
         this.code = options.code;
         this.source = options.source;
+        this.data = options.data;
         this.message = options.message;
         this.debug = options.debug;
     }
@@ -1283,7 +1290,7 @@ class KeyGraphService {
                 }
                 const node = {
                     type: KeyGraphNodeType.Key,
-                    data: _.cloneDeep(key),
+                    data: lodash$1(key),
                 };
                 this.graph.setNode(key.id, node);
             }
@@ -1296,7 +1303,7 @@ class KeyGraphService {
                 }
                 const edge = {
                     type: KeyGraphEdgeType.KeyLink,
-                    data: _.cloneDeep(keyLink),
+                    data: lodash$1(keyLink),
                 };
                 // Edge goes from wrapping key to wrapped key.
                 this.graph.setEdge(keyLink.wrappingKeyId, keyLink.keyId, edge);
@@ -1310,7 +1317,7 @@ class KeyGraphService {
                 }
                 const edge = {
                     type: KeyGraphEdgeType.PassKeyLink,
-                    data: _.cloneDeep(passKeyLink),
+                    data: lodash$1(passKeyLink),
                 };
                 // Edge goes from wrapping key to wrapped key.
                 this.graph.setEdge(passKeyLink.passKeyId, passKeyLink.keyId, edge);
@@ -1996,12 +2003,24 @@ let QueryProcessorService = class QueryProcessorService {
                 getKeyId: ({ field }) => field.sharedKey.id,
             }),
         ]));
+        this.registerProcessor('SharedScenarioReceiverDirectoryNode', common.series([
+            common.makeDecryptionProcessor({
+                cipherFieldName: 'sharedCipherData',
+                getKeyId: ({ field }) => field.sharedKey.id,
+            }),
+        ]));
         this.registerProcessor('ScenarioReceiverFileNode', common.series([
             common.makeDecryptionProcessor({
                 cipherFieldName: 'sharedCipherData',
                 getKeyId: ({ field }) => field.sharedKey.id,
             }),
         ]));
+        this.registerProcessor('SharedScenarioReceiverFileNode', common.series([
+            common.makeDecryptionProcessor({
+                cipherFieldName: 'sharedCipherData',
+                getKeyId: ({ field }) => field.sharedKey.id,
+            }),
+        ]));
         this.registerProcessor('SharedScenarioReceiverNode', common.series([
             common.makeDecryptionProcessor({
                 cipherFieldName: 'sharedCipherData',
@@ -2301,7 +2320,7 @@ class LrMutation extends LrMutationBase {
      */
     select(fragments) {
         // Don't touch the original
-        const mutationDoc = cloneDeep(this.mutation);
+        const mutationDoc = lodash$1(this.mutation);
         const mutationNode = getMutation(mutationDoc);
         const fragmentMap = {};
         getFragments(fragments).forEach((fragment) => {
@@ -2529,7 +2548,7 @@ class LrMergedMutation extends LrMutationBase {
                 ...this.renameFragmentDefinitions(fragments, prefix),
             ];
         });
-        const mergedMutation = cloneDeep(lrMergedMutationDoc);
+        const mergedMutation = lodash$1(lrMergedMutationDoc);
         const mutationNode = getMutation(mergedMutation);
         // Add in the mutation selections
         mutationNode.selectionSet.selections = selections;
@@ -2575,7 +2594,7 @@ let LrGraphQLService = class LrGraphQLService {
     query(options) {
         return __awaiter(this, void 0, void 0, function* () {
             // Make copies to avoid side effect.
-            options = cloneDeep(options);
+            options = lodash$1(options);
             // Append the key graph query
             const includeKeyGraph = this.isIncludeKeyGraph(options.includeKeyGraph);
             if (includeKeyGraph) {
@@ -2625,7 +2644,7 @@ let LrGraphQLService = class LrGraphQLService {
     apolloMutate(options) {
         return __awaiter(this, void 0, void 0, function* () {
             // Make copies to avoid side effect.
-            options = Object.assign(Object.assign({}, options), { mutation: cloneDeep(options.mutation) });
+            options = Object.assign(Object.assign({}, options), { mutation: lodash$1(options.mutation) });
             // Append the key graph query
             const includeKeyGraph = this.isIncludeKeyGraph(options.includeKeyGraph);
             if (includeKeyGraph) {
@@ -2655,7 +2674,7 @@ let LrGraphQLService = class LrGraphQLService {
         });
     }
     statsSnapshot() {
-        return cloneDeep(this.stats);
+        return lodash$1(this.stats);
     }
     addKeys(response) {
         if (response.data.keyGraph) {
@@ -5513,10 +5532,17 @@ let AuthService = AuthService_1 = class AuthService extends LrService {
     // Debug utilities
     // ------------------------------------------------------
     debugLogin(username, password) {
-        // This will fail if debug is null. But when debug is null, this function
-        // should not be called.
-        this.kcConfig.debug.username = username;
-        return this.debugLoadUser(password);
+        return __awaiter(this, void 0, void 0, function* () {
+            // This will fail if debug is null. But when debug is null, this function
+            // should not be called.
+            this.kcConfig.debug.username = username;
+            // This mechanism only works in a browser session because it needs to set cookies etc.
+            // But it sets the last_login field for the users which we need in some tests.
+            yield this.http
+                .get(`${this.kcConfig.authUrl}debug_only/users/login/?username=${encodeURIComponent(username)}`)
+                .toPromise();
+            return this.debugLoadUser(password);
+        });
     }
     debugLoadUser(password) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -8105,7 +8131,7 @@ class ProfileDetailsService {
                             oldValue: oldValue.value,
                         });
                     }
-                    else if (!_.isEqual(newValue.value, oldValue.value)) {
+                    else if (!lodash$2(newValue.value, oldValue.value)) {
                         changes.push({
                             field,
                             id: oldValue.id,
@@ -8146,7 +8172,7 @@ class ProfileDetailsService {
                         break;
                     default: {
                         const value = details[change.field];
-                        if (_.isEqual(value, change.oldValue)) {
+                        if (lodash$2(value, change.oldValue)) {
                             hasChanged = true;
                             details[change.field] = change.newValue;
                         }
@@ -8163,7 +8189,7 @@ class ProfileDetailsService {
         property = property || { value: field, hasMultiple: false };
         property.values = property.values || [];
         if (property.values.length === 0 ||
-            property.values.every((x) => !_.isEqual(field, x.value))) {
+            property.values.every((x) => !lodash$2(field, x.value))) {
             property.values.push({
                 id: `${label}-${new Date().getTime()}`,
                 label,
@@ -8647,12 +8673,6 @@ query ScenarioQuery(
                     id
                   }
                   accessRole
-
-                  # The itemKey is the same as directory.keyId. It's here so we can detect
-                  # when the directory key has been rotated.
-                  itemKey {
-                    id
-                  }
                   directory {
                     id
                     keyId
@@ -8669,12 +8689,6 @@ query ScenarioQuery(
                     id
                   }
                   accessRole
-
-                  # The itemKey is the same as file.keyId. It's here so we can detect
-                  # when the file key has been rotated.
-                  itemKey {
-                    id
-                  }
                   file {
                     id
                     keyId
@@ -8715,7 +8729,6 @@ query SharedScenarioQuery($scenarioId: LrRelayIdInput!) {
           edges {
             node {
               id
-              wrappedItemKey
             }
           }
         }
@@ -9032,6 +9045,7 @@ let ScenarioService = class ScenarioService extends LrService {
             const createClaimants = yield Promise.all(createClaimantsOptions.map((x) => this.prepareCreateClaimant(x)));
             return {
                 enabled: options.enabled,
+                inactiveSeconds: options.inactiveSeconds,
                 createAssembly,
                 createReceivers,
                 createClaimants,
@@ -9085,6 +9099,7 @@ let ScenarioService = class ScenarioService extends LrService {
             return {
                 scenarioId: options.scenarioId,
                 enabled: options.enabled,
+                inactiveSeconds: options.inactiveSeconds,
                 updateAssembly,
                 createReceivers,
                 updateReceivers,
@@ -9317,33 +9332,40 @@ let ScenarioService = class ScenarioService extends LrService {
             };
         });
     }
-    prepareReceiveClaim(scenarioId, sharedClaimId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Get all the shared items
-            const sharedScenario = (yield this.getSharedScenario(scenarioId, sharedClaimId)).sharedScenario;
-            if (sharedScenario.state !== ScenarioState.APPROVED) {
-                throwClaimNotApproved();
-            }
-            const approvals = mapEdges(sharedScenario.sharedClaim.asClaimReceiver.approvals);
-            const assemblyKey = yield this.recoverAssemblyKey(approvals);
-            // Decrypt all items
-            const receiverDirectories = yield Promise.all(sharedScenario.asReceiver.receiverItems.receiverDirectories.edges
-                .map((edge) => edge.node)
-                .map((receiverDirectory) => __awaiter(this, void 0, void 0, function* () {
-                const wrappedItemKey = yield this.encryptionService.decrypt(assemblyKey, receiverDirectory.wrappedItemKey);
-                return {
-                    receiverDirectoryId: receiverDirectory.id,
-                    // Looks like receiverDirectory.wrappedItemKey has no other content in side it except a wrapped key.
-                    // So we can turn this in to a doubly wrapped key and just release the assembly key.
-                    receiverSharedKeyWrappedItemKey: wrappedItemKey,
-                };
-            })));
-            return {
-                scenarioClaimId: sharedClaimId,
-                receiverDirectories,
-            };
-        });
-    }
+    // async prepareReceiveClaim(scenarioId: string, sharedClaimId: string) {
+    //   // Get all the shared items
+    //   const sharedScenario = (
+    //     await this.getSharedScenario(scenarioId, sharedClaimId)
+    //   ).sharedScenario;
+    //   if (sharedScenario.state !== ScenarioState.APPROVED) {
+    //     throwClaimNotApproved();
+    //   }
+    //   const approvals = mapEdges(
+    //     sharedScenario.sharedClaim.asClaimReceiver.approvals
+    //   );
+    //   const assemblyKey = await this.recoverAssemblyKey(approvals);
+    //   // Decrypt all items
+    //   const receiverDirectories = await Promise.all(
+    //     sharedScenario.asReceiver.receiverItems.receiverDirectories.edges
+    //       .map((edge) => edge.node)
+    //       .map(async (receiverDirectory) => {
+    //         const wrappedItemKey = await this.encryptionService.decrypt(
+    //           assemblyKey,
+    //           receiverDirectory.wrappedItemKey
+    //         );
+    //         return {
+    //           receiverDirectoryId: receiverDirectory.id,
+    //           // Looks like receiverDirectory.wrappedItemKey has no other content in side it except a wrapped key.
+    //           // So we can turn this in to a doubly wrapped key and just release the assembly key.
+    //           receiverSharedKeyWrappedItemKey: wrappedItemKey, // the wrappedItemKey is already wrapped by receiverSharedKey
+    //         };
+    //       })
+    //   );
+    //   return {
+    //     scenarioClaimId: sharedClaimId,
+    //     receiverDirectories,
+    //   };
+    // }
     recoverAssemblyKey(approvals) {
         return __awaiter(this, void 0, void 0, function* () {
             const partials = yield Promise.all(approvals.map((approval) => this.keyGraph.decryptFromString(approval.pxk.id, approval.receiverCipherPartialAssemblyKey)));