@wireapp/core 42.11.0 → 42.12.0

package/lib/messagingProtocols/mls/MLSService/MLSService.js

@@ -46,6 +46,7 @@ const messageSender_1 = require("../../../conversation/message/messageSender");
 const fullyQualifiedClientIdUtils_1 = require("../../../util/fullyQualifiedClientIdUtils");
 const numberToHex_1 = require("../../../util/numberToHex");
 const TaskScheduler_1 = require("../../../util/TaskScheduler");
+const E2EIdentityService_1 = require("../E2EIdentityService");
 const events_1 = require("../EventHandler/events");
 //@todo: this function is temporary, we wait for the update from core-crypto side
 //they are returning regular array instead of Uint8Array for commit and welcome messages
@@ -667,5 +668,64 @@ class MLSService extends commons_1.TypedEventEmitter {
         }
         return (0, events_1.handleMLSWelcomeMessage)({ event, mlsService: this });
     }
+    async deleteMLSKeyPackages(clientId, keyPackagRefs) {
+        return this.apiClient.api.client.deleteMLSKeyPackages(clientId, keyPackagRefs.map(keypackage => btoa(bazinga64_1.Converter.arrayBufferViewToBaselineString(keypackage))));
+    }
+    // E2E Identity Service related methods below this line
+    /**
+     *
+     * @param discoveryUrl URL of the acme server
+     * @param user User object
+     * @param clientId The client id of the current device
+     * @param nbPrekeys Amount of prekeys to generate
+     * @param oAuthIdToken The OAuth id token if the user is already authenticated
+     * @returns AcmeChallenge if the user is not authenticated, true if the user is authenticated
+     */
+    async enrollE2EI(discoveryUrl, e2eiServiceExternal, user, clientId, nbPrekeys, oAuthIdToken) {
+        try {
+            const instance = await E2EIdentityService_1.E2EIServiceInternal.getInstance({
+                apiClient: this.apiClient,
+                coreCryptClient: this.coreCryptoClient,
+                e2eiServiceExternal,
+                user,
+                clientId,
+                discoveryUrl,
+                keyPackagesAmount: nbPrekeys,
+            });
+            if (!oAuthIdToken) {
+                const challengeData = await instance.startCertificateProcess();
+                if (challengeData) {
+                    return challengeData;
+                }
+            }
+            else {
+                const rotateBundle = await instance.continueCertificateProcess(oAuthIdToken);
+                if (rotateBundle !== undefined) {
+                    // Remove old key packages
+                    await this.deleteMLSKeyPackages(clientId, rotateBundle.keyPackageRefsToRemove);
+                    // Upload new key packages with x509 certificate
+                    await this.uploadMLSKeyPackages(clientId, rotateBundle.newKeyPackages);
+                    // Update keying material
+                    for (const [groupId, commitBundle] of rotateBundle.commits) {
+                        const groupIdAsBytes = bazinga64_1.Converter.hexStringToArrayBufferView(groupId);
+                        // manual copy of the commit bundle data because of a problem while cloning it
+                        const newCommitBundle = {
+                            commit: commitBundle.commit,
+                            // @ts-ignore
+                            groupInfo: (commitBundle === null || commitBundle === void 0 ? void 0 : commitBundle.group_info) || commitBundle.groupInfo,
+                            welcome: commitBundle === null || commitBundle === void 0 ? void 0 : commitBundle.welcome,
+                        };
+                        await this.uploadCommitBundle(groupIdAsBytes, newCommitBundle);
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+        catch (error) {
+            this.logger.error('E2EI - Failed to enroll', error);
+            throw error;
+        }
+    }
 }
 exports.MLSService = MLSService;

package/lib/messagingProtocols/mls/MLSService/MLSService.types.d.ts

@@ -26,5 +26,9 @@ export interface MLSServiceConfig {
      * default credential type to use for MLS (Basic = 1 by default)
      */
     defaultCredentialType: CredentialType;
+    /**
+     * signals if the E2E - Identity process should be used
+     */
+    useE2EI?: boolean;
 }
 //# sourceMappingURL=MLSService.types.d.ts.map

package/lib/messagingProtocols/mls/MLSService/MLSService.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MLSService.types.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAC,WAAW,EAAE,YAAY,EAAE,cAAc,EAAC,MAAM,sBAAsB,CAAC;AAEpF,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,sBAAsB,CAAC,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;IAErD;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,6BAA6B,EAAE,MAAM,CAAC;IACtC;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,kBAAkB,EAAE,WAAW,CAAC;IAChC;;OAEG;IACH,qBAAqB,EAAE,cAAc,CAAC;CACvC"}
+{"version":3,"file":"MLSService.types.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAC,WAAW,EAAE,YAAY,EAAE,cAAc,EAAC,MAAM,sBAAsB,CAAC;AAEpF,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,sBAAsB,CAAC,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;IAErD;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,6BAA6B,EAAE,MAAM,CAAC;IACtC;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,kBAAkB,EAAE,WAAW,CAAC;IAChC;;OAEG;IACH,qBAAqB,EAAE,cAAc,CAAC;IACtC;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}

package/lib/messagingProtocols/mls/types.d.ts

@@ -1,6 +1,7 @@
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { CoreCryptoCallbacks } from '@wireapp/core-crypto';
 import { MLSServiceConfig } from './MLSService/MLSService.types';
+export type ClientId = string;
 export type SecretCrypto = {
     encrypt: (value: Uint8Array) => Promise<Uint8Array>;
     decrypt: (payload: Uint8Array) => Promise<Uint8Array>;

package/lib/messagingProtocols/mls/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/messagingProtocols/mls/types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,mBAAmB,EAAC,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAE/D,MAAM,MAAM,YAAY,GACpB;IACE,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACpD,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACtD,OAAO,EAAE,SAAS,CAAC;CACpB,GACD;IACE,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAChD,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,OAAO,EAAE,CAAC,CAAC;CACZ,CAAC;AAEN,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,mBAAmB,EAAE,WAAW,GAAG,eAAe,CAAC;IAC5F;;;;;OAKG;IACH,yBAAyB,EAAE,CAAC,cAAc,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACzF;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,SAAS,CAAC;AAEd,MAAM,MAAM,4BAA4B,GAAG;IACzC,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG,SAAS,CAAC;AAEd,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAE9B,uEAAuE;IACvE,GAAG,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEhC,oKAAoK;IACpK,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,OAAO,EAAC,WAAW,EAAE,cAAc,EAAC,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/messagingProtocols/mls/types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,mBAAmB,EAAC,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAE/D,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE9B,MAAM,MAAM,YAAY,GACpB;IACE,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACpD,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACtD,OAAO,EAAE,SAAS,CAAC;CACpB,GACD;IACE,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAChD,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,OAAO,EAAE,CAAC,CAAC;CACZ,CAAC;AAEN,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,mBAAmB,EAAE,WAAW,GAAG,eAAe,CAAC;IAC5F;;;;;OAKG;IACH,yBAAyB,EAAE,CAAC,cAAc,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACzF;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,SAAS,CAAC;AAEd,MAAM,MAAM,4BAA4B,GAAG;IACzC,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG,SAAS,CAAC;AAEd,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAE9B,uEAAuE;IACvE,GAAG,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEhC,oKAAoK;IACpK,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,OAAO,EAAC,WAAW,EAAE,cAAc,EAAC,MAAM,sBAAsB,CAAC"}

package/lib/util/LocalStorageStore/index.d.ts

@@ -0,0 +1,7 @@
+export declare const LocalStorageStore: <T = string>(pKey: string) => {
+    get: (key: string) => T | undefined;
+    add: (key: string, value: T) => void;
+    remove: (key: string) => void;
+    has: (key: string) => boolean;
+};
+//# sourceMappingURL=index.d.ts.map

package/lib/util/LocalStorageStore/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/util/LocalStorageStore/index.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,iBAAiB,qBAAsB,MAAM;eAC7C,MAAM;eAUN,MAAM;kBACH,MAAM;eACT,MAAM;CACjB,CAAC"}

package/lib/util/LocalStorageStore/index.js

@@ -0,0 +1,38 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LocalStorageStore = void 0;
+const prependKey = (key, pKey) => `${pKey}_${key}`;
+const LocalStorageStore = (pKey) => ({
+    get: (key) => {
+        const value = localStorage.getItem(prependKey(key, pKey));
+        if (value) {
+            if (!Number.isNaN(Number(value))) {
+                return Number(value);
+            }
+            return value;
+        }
+        return undefined;
+    },
+    add: (key, value) => localStorage.setItem(prependKey(key, pKey), String(value)),
+    remove: (key) => localStorage.removeItem(prependKey(key, pKey)),
+    has: (key) => !!localStorage.getItem(prependKey(key, pKey)),
+});
+exports.LocalStorageStore = LocalStorageStore;

package/lib/util/TaskScheduler/TaskScheduler.store.d.ts

@@ -1,6 +1,6 @@
 export declare const TaskSchedulerStore: {
     get: (key: string) => number | undefined;
-    add: (key: string, firingDate: number) => void;
+    add: (key: string, value: number) => void;
     remove: (key: string) => void;
     has: (key: string) => boolean;
 };

package/lib/util/TaskScheduler/TaskScheduler.store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TaskScheduler.store.d.ts","sourceRoot":"","sources":["../../../src/util/TaskScheduler/TaskScheduler.store.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,kBAAkB;eAClB,MAAM;eAON,MAAM,cAAc,MAAM;kBACvB,MAAM;eACT,MAAM;CAClB,CAAC"}
+{"version":3,"file":"TaskScheduler.store.d.ts","sourceRoot":"","sources":["../../../src/util/TaskScheduler/TaskScheduler.store.ts"],"names":[],"mappings":"AAuBA,eAAO,MAAM,kBAAkB;;;;;CAAwC,CAAC"}

package/lib/util/TaskScheduler/TaskScheduler.store.js

@@ -19,16 +19,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskSchedulerStore = void 0;
-const prependKey = (key) => `TaskScheduler_${key}`;
-exports.TaskSchedulerStore = {
-    get: (key) => {
-        const value = localStorage.getItem(prependKey(key));
-        if (value) {
-            return Number(value);
-        }
-        return undefined;
-    },
-    add: (key, firingDate) => localStorage.setItem(prependKey(key), String(firingDate)),
-    remove: (key) => localStorage.removeItem(prependKey(key)),
-    has: (key) => !!localStorage.getItem(prependKey(key)),
-};
+const LocalStorageStore_1 = require("../LocalStorageStore");
+const prependKey = `TaskScheduler`;
+exports.TaskSchedulerStore = (0, LocalStorageStore_1.LocalStorageStore)(prependKey);

package/lib/util/index.d.ts

@@ -1,2 +1,3 @@
 export * from './TypePredicateUtil';
+export * from './TaskScheduler';
 //# sourceMappingURL=index.d.ts.map

package/lib/util/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAmBA,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAmBA,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC"}

package/lib/util/index.js

@@ -33,3 +33,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./TypePredicateUtil"), exports);
+__exportStar(require("./TaskScheduler"), exports);

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^26.2.5",
+    "@wireapp/api-client": "^26.3.0",
     "@wireapp/commons": "^5.2.1",
     "@wireapp/core-crypto": "1.0.0-rc.13",
     "@wireapp/cryptobox": "12.8.0",
@@ -27,7 +27,8 @@
     "idb": "7.1.1",
     "logdown": "3.3.1",
     "long": "^5.2.0",
-    "uuidjs": "4.2.13"
+    "uuidjs": "4.2.13",
+    "zod": "3.21.4"
   },
   "devDependencies": {
     "@faker-js/faker": "^8.0.0",
@@ -60,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "42.11.0",
-  "gitHead": "97e31b0ed7b2b65505a8dd9af52907b5d9123233"
+  "version": "42.12.0",
+  "gitHead": "03058b9323c4afec84e6c85c4614c3b599ebcb71"
 }