@lifeready/core 8.0.11 → 8.0.13

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);
@@ -2313,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) => {
@@ -2541,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;
@@ -2587,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) {
@@ -2637,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) {
@@ -2667,7 +2674,7 @@ let LrGraphQLService = class LrGraphQLService {
         });
     }
     statsSnapshot() {
-        return cloneDeep(this.stats);
+        return lodash$1(this.stats);
     }
     addKeys(response) {
         if (response.data.keyGraph) {
@@ -5525,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* () {
@@ -8117,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,
@@ -8158,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;
                         }
@@ -8175,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,
@@ -9031,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,
@@ -9084,6 +9099,7 @@ let ScenarioService = class ScenarioService extends LrService {
             return {
                 scenarioId: options.scenarioId,
                 enabled: options.enabled,
+                inactiveSeconds: options.inactiveSeconds,
                 updateAssembly,
                 createReceivers,
                 updateReceivers,
@@ -9102,6 +9118,7 @@ let ScenarioService = class ScenarioService extends LrService {
             if (accessRole == AccessRoleChoice.DENY) {
                 const ret = {
                     accessRole,
+                    itemKeyId: null,
                     wrappedItemKey: null,
                     sharedCipherData: null,
                 };
@@ -9127,6 +9144,7 @@ let ScenarioService = class ScenarioService extends LrService {
                 wrappedItemKey = yield this.keyGraph.encryptToString(assemblyKey, wrappedItemKey);
                 const ret = {
                     accessRole,
+                    itemKeyId: itemKey.id,
                     wrappedItemKey,
                     sharedCipherData,
                 };
@@ -10262,6 +10280,30 @@ query TpCurrentUserSharedKeyQuery($id: LrRelayIdInput!) {
   }
 }
 `;
+const DirectoryShareQuery = gqlTyped `
+query DirectoryShareQuery($id: LrRelayIdInput!) {
+  directoryShare(id: $id) {
+    item {
+      id
+    }
+    tp {
+      id
+    }
+  }
+}
+`;
+const FileShareQuery = gqlTyped `
+query FileShareItemIdQuery($id: LrRelayIdInput!) {
+  fileShare(id: $id) {
+    item {
+      id
+    }
+    tp {
+      id
+    }
+  }
+}
+`;
 
 let TrustedPartyService = class TrustedPartyService extends LrService {
     constructor(ngZone, injector, keyGraph, itemService, keyService, keyFactory, encryptionService) {
@@ -10316,19 +10358,35 @@ let TrustedPartyService = class TrustedPartyService extends LrService {
     prepareCreateItemShareMutation(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const { itemId, itemKeyId, tpId, tpSharedKeyId, accessRole, isDirectory, shareType, } = options;
+            if (accessRole == AccessRoleChoice.DENY) {
+                if (itemKeyId || tpSharedKeyId) {
+                    throw new KcBadArgumentException('If accessRole is AccessRoleChoice.DENY, must not specify any of itemId, itemKeyId, or tpSharedKeyId parameters');
+                }
+                return {
+                    input: {
+                        itemId,
+                        tpId,
+                        accessRole,
+                        itemKeyId: null,
+                        wrappingKeyId: null,
+                        wrappedItemKey: null,
+                        shareType,
+                    },
+                };
+            }
             const itemKey = yield this.keyGraph.getKey(itemKeyId, () => isDirectory
                 ? this.itemService.getDirectoryKeyId(itemId)
                 : this.itemService.getFileKeyId(itemId));
             const wrappingKey = yield this.keyGraph.getKey(tpSharedKeyId, () => this.getTpCurrentUserSharedKey(tpId).then((res) => res.sharedKey.id));
-            const wrappedKey = yield this.keyGraph.wrapKey(wrappingKey, itemKey.jwk);
+            const wrappedItemKey = yield this.keyGraph.wrapKey(wrappingKey, itemKey.jwk);
             return {
                 input: {
-                    id: itemId,
+                    itemId,
                     tpId,
                     accessRole,
-                    keyId: itemKey.id,
+                    itemKeyId: itemKey.id,
                     wrappingKeyId: wrappingKey.id,
-                    wrappedKey,
+                    wrappedItemKey,
                     shareType,
                 },
             };
@@ -10343,7 +10401,7 @@ let TrustedPartyService = class TrustedPartyService extends LrService {
         return __awaiter(this, void 0, void 0, function* () {
             return new LrMutation({
                 mutation: UpdateDirectoryShareMutation,
-                variables: this.prepareUpdateItemShareMutation(options),
+                variables: yield this.prepareUpdateItemShareMutation(Object.assign(Object.assign({}, options), { isDirectory: true })),
             });
         });
     }
@@ -10356,18 +10414,81 @@ let TrustedPartyService = class TrustedPartyService extends LrService {
         return __awaiter(this, void 0, void 0, function* () {
             return new LrMutation({
                 mutation: UpdateFileShareMutation,
-                variables: this.prepareUpdateItemShareMutation(options),
+                variables: yield this.prepareUpdateItemShareMutation(Object.assign(Object.assign({}, options), { isDirectory: false })),
             });
         });
     }
-    prepareUpdateItemShareMutation(options) {
-        const { itemShareId, accessRole } = options;
-        return {
-            input: {
+    getDirectoryShare(itemShareId) {
+        return this.lrGraphQL.query({
+            query: DirectoryShareQuery,
+            variables: {
                 id: itemShareId,
-                accessRole,
             },
-        };
+        });
+    }
+    getFileShare(itemShareId) {
+        return this.lrGraphQL.query({
+            query: FileShareQuery,
+            variables: {
+                id: itemShareId,
+            },
+        });
+    }
+    prepareUpdateItemShareMutation(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { itemShareId, accessRole, isDirectory, itemId, itemKeyId, tpId, tpSharedKeyId, } = options;
+            if (accessRole == AccessRoleChoice.DENY) {
+                if (itemId || itemKeyId || tpId || tpSharedKeyId) {
+                    throw new KcBadArgumentException('If accessRole is AccessRoleChoice.DENY, must not specify any of itemId, itemKeyId, tpId, or tpSharedKeyId parameters');
+                }
+                return {
+                    input: {
+                        id: itemShareId,
+                        accessRole,
+                        itemKeyId: null,
+                        wrappingKeyId: null,
+                        wrappedItemKey: null,
+                    },
+                };
+            }
+            // Caching the result so we only need one call.
+            let itemShare;
+            const getItemShare = () => __awaiter(this, void 0, void 0, function* () {
+                if (!itemShare) {
+                    if (isDirectory) {
+                        itemShare = (yield this.getDirectoryShare(itemShareId))
+                            .directoryShare;
+                    }
+                    else {
+                        itemShare = (yield this.getFileShare(itemShareId)).fileShare;
+                    }
+                }
+                return itemShare;
+            });
+            const itemKey = yield this.keyGraph.getKey(itemKeyId, () => __awaiter(this, void 0, void 0, function* () {
+                const itemId_ = itemId || (yield getItemShare()).item.id;
+                if (isDirectory) {
+                    return this.itemService.getDirectoryKeyId(itemId_);
+                }
+                else {
+                    return this.itemService.getFileKeyId(itemId_);
+                }
+            }));
+            const wrappingKey = yield this.keyGraph.getKey(tpSharedKeyId, () => __awaiter(this, void 0, void 0, function* () {
+                const tpId_ = tpId || (yield getItemShare()).tp.id;
+                return (yield this.getTpCurrentUserSharedKey(tpId_)).sharedKey.id;
+            }));
+            const wrappedItemKey = yield this.keyGraph.wrapKey(wrappingKey, itemKey.jwk);
+            return {
+                input: {
+                    id: itemShareId,
+                    accessRole,
+                    itemKeyId: itemKey.id,
+                    wrappingKeyId: wrappingKey.id,
+                    wrappedItemKey,
+                },
+            };
+        });
     }
     deleteDirectoryShare(id) {
         return __awaiter(this, void 0, void 0, function* () {