@wireapp/core 42.25.2 → 42.26.1

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.d.ts

@@ -18,8 +18,42 @@ declare class E2EIServiceInternal {
     private init;
     private getDirectory;
     private getInitialNonce;
+    /**
+     * Start of the ACME enrollment flow
+     * Stores the received data in local storage for later use (e.g. in the continue flow)
+     *
+     * @returns authData
+     */
+    private getAndStoreInitialEnrollmentData;
+    /**
+     * Continuation of the ACME enrollment flow
+     * Needs to be called after the user has authenticated with the OIDC provider
+     * Stores the received certificate data in local storage for later use
+     *
+     * @param oAuthIdToken
+     * @returns RotateBundle
+     */
+    private getRotateBundleAndStoreCertificateData;
+    /**
+     *  This function starts a new ACME enrollment flow for either a new client
+     *  or a client that wants to refresh its certificate but has no valid refresh token
+     */
     private startNewOAuthFlow;
+    /**
+     * This function continues an ACME flow for either a new client
+     * or a client that wants to refresh its certificate but has no valid refresh token
+     *
+     * @param oAuthIdToken
+     * @returns RotateBundle | undefined
+     */
     private continueOAuthFlow;
+    /**
+     * This function starts a ACME refresh flow for an existing client with a valid refresh token
+     *
+     * @param oAuthIdToken
+     * @returns
+     */
+    startRefreshCertficateFlow(oAuthIdToken: string): Promise<RotateBundle | undefined>;
 }
 export { E2EIServiceInternal };
 //# sourceMappingURL=E2EIServiceInternal.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"E2EIServiceInternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.ts"],"names":[],"mappings":"AAyBA,OAAO,EACL,aAAa,EAKb,UAAU,EACV,YAAY,EACb,MAAM,qBAAqB,CAAC;AAW7B,cAAM,mBAAmB;IACvB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;IAC9E,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAa;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAsB;IACzD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IACnC,OAAO,CAAC,QAAQ,CAAC,CAAiB;IAClC,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO;WAea,WAAW,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAwBrE,uBAAuB,CAAC,wBAAwB,EAAE,OAAO;IAYzD,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;YAelF,YAAY;IAyB1B,OAAO,CAAC,aAAa;YAKP,IAAI;YAeJ,YAAY;YAeZ,eAAe;YAaf,iBAAiB;YA+DjB,iBAAiB;CA+EhC;AAED,OAAO,EAAC,mBAAmB,EAAC,CAAC"}
+{"version":3,"file":"E2EIServiceInternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.ts"],"names":[],"mappings":"AAyBA,OAAO,EACL,aAAa,EAKb,UAAU,EACV,YAAY,EACb,MAAM,qBAAqB,CAAC;AAW7B,cAAM,mBAAmB;IACvB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;IAC9E,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAa;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAsB;IACzD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IACnC,OAAO,CAAC,QAAQ,CAAC,CAAiB;IAClC,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO;WAea,WAAW,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAwBrE,uBAAuB,CAAC,wBAAwB,EAAE,OAAO;IAYzD,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;YAelF,YAAY;IAyB1B,OAAO,CAAC,aAAa;YAKP,IAAI;YAeJ,YAAY;YAeZ,eAAe;IAa7B;;;;;OAKG;YACW,gCAAgC;IAgD9C;;;;;;;OAOG;YACW,sCAAsC;IAsEpD;;;OAGG;YACW,iBAAiB;IA0B/B;;;;;;OAMG;YACW,iBAAiB;IAmB/B;;;;;OAKG;IACU,0BAA0B,CAAC,YAAY,EAAE,MAAM;CAkB7D;AAED,OAAO,EAAC,mBAAmB,EAAC,CAAC"}

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.js

@@ -147,22 +147,25 @@ class E2EIServiceInternal {
             throw error;
         }
     }
-    async startNewOAuthFlow() {
-        if (this.e2eServiceExternal.isEnrollmentInProgress()) {
-            return this.exitWithError('Error while trying to start OAuth flow. There is already a flow in progress');
-        }
+    /**
+     * Start of the ACME enrollment flow
+     * Stores the received data in local storage for later use (e.g. in the continue flow)
+     *
+     * @returns authData
+     */
+    async getAndStoreInitialEnrollmentData() {
         if (!this.isInitialized || !this.identity || !this.acmeService) {
-            return this.exitWithError('Error while trying to start OAuth flow. E2eIdentityService is not fully initialized');
+            throw new Error('Error while trying to start OAuth flow. E2eIdentityService is not fully initialized');
         }
         // Get the directory
         const directory = await this.getDirectory(this.identity, this.acmeService);
         if (!directory) {
-            return this.exitWithError('Error while trying to start OAuth flow. No directory received');
+            throw new Error('Error while trying to start OAuth flow. No directory received');
         }
         // Step 1: Get a new nonce from ACME server
         const nonce = await this.getInitialNonce(directory, this.acmeService);
         if (!nonce) {
-            return this.exitWithError('Error while trying to start OAuth flow. No nonce received');
+            throw new Error('Error while trying to start OAuth flow. No nonce received');
         }
         // Step 2: Create a new account
         const newAccountNonce = await (0, Account_1.createNewAccount)({
@@ -185,7 +188,92 @@ class E2EIServiceInternal {
             authzUrl: orderData.authzUrl,
             nonce: orderData.nonce,
         });
-        // Manual copy of the data because of a problem with copying the wasm object
+        // Store the values in local storage for later use (e.g. in the continue flow)
+        E2EIStorage_1.E2EIStorage.store.authData(authData);
+        E2EIStorage_1.E2EIStorage.store.orderData({ orderUrl: orderData.orderUrl });
+        return { authData };
+    }
+    /**
+     * Continuation of the ACME enrollment flow
+     * Needs to be called after the user has authenticated with the OIDC provider
+     * Stores the received certificate data in local storage for later use
+     *
+     * @param oAuthIdToken
+     * @returns RotateBundle
+     */
+    async getRotateBundleAndStoreCertificateData(oAuthIdToken) {
+        if (!this.isInitialized || !this.identity || !this.acmeService) {
+            throw new Error('Error while trying to start OAuth flow. E2eIdentityService is not fully initialized');
+        }
+        const authData = E2EIStorage_1.E2EIStorage.get.authData();
+        if (!authData.authorization.wireOidcChallenge) {
+            throw new Error('Error while trying to continue OAuth flow. No wireOidcChallenge received');
+        }
+        // Step 7: Do OIDC client challenge
+        const oidcData = await (0, OidcChallenge_1.doWireOidcChallenge)({
+            oAuthIdToken,
+            authData,
+            connection: this.acmeService,
+            identity: this.identity,
+            nonce: authData.nonce,
+        });
+        this.logger.log('received oidcData', oidcData);
+        if (!oidcData.data.validated) {
+            throw new Error('Error while trying to continue OAuth flow. OIDC challenge not validated');
+        }
+        const { user: wireUser, clientId } = E2EIStorage_1.E2EIStorage.get.initialData();
+        //Step 8: Do DPOP Challenge
+        const dpopData = await (0, DpopChallenge_1.doWireDpopChallenge)({
+            authData,
+            clientId,
+            connection: this.acmeService,
+            identity: this.identity,
+            userDomain: wireUser.domain,
+            apiClient: this.apiClient,
+            expirySecs: 30,
+            nonce: oidcData.nonce,
+        });
+        this.logger.log('acme dpopData', JSON.stringify(dpopData));
+        if (!(0, Helper_1.isResponseStatusValid)(dpopData.data.status)) {
+            throw new Error('Error while trying to continue OAuth flow. DPOP challenge not validated');
+        }
+        //Step 9: Finalize Order
+        const orderData = E2EIStorage_1.E2EIStorage.get.orderData();
+        const finalizeOrderData = await (0, Order_1.finalizeOrder)({
+            connection: this.acmeService,
+            identity: this.identity,
+            nonce: dpopData.nonce,
+            orderUrl: orderData.orderUrl,
+        });
+        if (!finalizeOrderData.certificateUrl) {
+            throw new Error('Error while trying to continue OAuth flow. No certificateUrl received');
+        }
+        // Step 9: Get certificate
+        const { certificate } = await (0, Certificate_1.getCertificate)({
+            certificateUrl: finalizeOrderData.certificateUrl,
+            nonce: finalizeOrderData.nonce,
+            connection: this.acmeService,
+            identity: this.identity,
+        });
+        if (!certificate) {
+            throw new Error('Error while trying to continue OAuth flow. No certificate received');
+        }
+        E2EIStorage_1.E2EIStorage.store.certificate(certificate);
+        // Step 10: Initialize MLS with the certificate
+        return await this.coreCryptoClient.e2eiRotateAll(this.identity, certificate, this.keyPackagesAmount);
+    }
+    /**
+     *  This function starts a new ACME enrollment flow for either a new client
+     *  or a client that wants to refresh its certificate but has no valid refresh token
+     */
+    async startNewOAuthFlow() {
+        if (this.e2eServiceExternal.isEnrollmentInProgress()) {
+            return this.exitWithError('Error while trying to start OAuth flow. There is already a flow in progress');
+        }
+        if (!this.isInitialized || !this.identity) {
+            return this.exitWithError('Error while trying to start OAuth flow. E2eIdentityService is not fully initialized');
+        }
+        const { authData } = await this.getAndStoreInitialEnrollmentData();
         // Step 6: Start E2E OAuth flow
         const { authorization: { wireOidcChallenge }, } = authData;
         if (wireOidcChallenge) {
@@ -193,13 +281,18 @@ class E2EIServiceInternal {
             const handle = await this.coreCryptoClient.e2eiEnrollmentStash(this.identity);
             // stash the handle in local storage
             E2EIStorage_1.E2EIStorage.store.handle(bazinga64_1.Encoder.toBase64(handle).asString);
-            E2EIStorage_1.E2EIStorage.store.authData(authData);
-            E2EIStorage_1.E2EIStorage.store.orderData({ orderUrl: orderData.orderUrl });
             // we need to pass back the aquired wireOidcChallenge to the UI
             return wireOidcChallenge;
         }
         return undefined;
     }
+    /**
+     * This function continues an ACME flow for either a new client
+     * or a client that wants to refresh its certificate but has no valid refresh token
+     *
+     * @param oAuthIdToken
+     * @returns RotateBundle | undefined
+     */
     async continueOAuthFlow(oAuthIdToken) {
         // If we have a handle, the user has already started the process to authenticate with the OIDC provider. We can continue the flow.
         try {
@@ -207,70 +300,36 @@ class E2EIServiceInternal {
                 return this.exitWithError('Error while trying to continue OAuth flow. AcmeService is not initialized');
             }
             const handle = E2EIStorage_1.E2EIStorage.get.handle();
-            const authData = E2EIStorage_1.E2EIStorage.get.authData();
-            if (!authData.authorization.wireOidcChallenge) {
-                return this.exitWithError('Error while trying to continue OAuth flow. No wireOidcChallenge received');
-            }
             this.identity = await this.coreCryptoClient.e2eiEnrollmentStashPop(bazinga64_1.Decoder.fromBase64(handle).asBytes);
             this.logger.log('retrieved identity from stash');
-            // Step 7: Do OIDC client challenge
-            const oidcData = await (0, OidcChallenge_1.doWireOidcChallenge)({
-                oAuthIdToken,
-                authData,
-                connection: this.acmeService,
-                identity: this.identity,
-                nonce: authData.nonce,
-            });
-            this.logger.log('received oidcData', oidcData);
-            if (!oidcData.data.validated) {
-                return this.exitWithError('Error while trying to continue OAuth flow. OIDC challenge not validated');
-            }
-            const { user: wireUser, clientId } = E2EIStorage_1.E2EIStorage.get.initialData();
-            //Step 8: Do DPOP Challenge
-            const dpopData = await (0, DpopChallenge_1.doWireDpopChallenge)({
-                authData,
-                clientId,
-                connection: this.acmeService,
-                identity: this.identity,
-                userDomain: wireUser.domain,
-                apiClient: this.apiClient,
-                expirySecs: 30,
-                nonce: oidcData.nonce,
-            });
-            this.logger.log('acme dpopData', JSON.stringify(dpopData));
-            if (!(0, Helper_1.isResponseStatusValid)(dpopData.data.status)) {
-                return this.exitWithError('Error while trying to continue OAuth flow. DPOP challenge not validated');
-            }
-            //Step 9: Finalize Order
-            const orderData = E2EIStorage_1.E2EIStorage.get.orderData();
-            const finalizeOrderData = await (0, Order_1.finalizeOrder)({
-                connection: this.acmeService,
-                identity: this.identity,
-                nonce: dpopData.nonce,
-                orderUrl: orderData.orderUrl,
-            });
-            if (!finalizeOrderData.certificateUrl) {
-                return this.exitWithError('Error while trying to continue OAuth flow. No certificateUrl received');
-            }
-            // Step 9: Get certificate
-            const { certificate } = await (0, Certificate_1.getCertificate)({
-                certificateUrl: finalizeOrderData.certificateUrl,
-                nonce: finalizeOrderData.nonce,
-                connection: this.acmeService,
-                identity: this.identity,
-            });
-            if (!certificate) {
-                return this.exitWithError('Error while trying to continue OAuth flow. No certificate received');
-            }
-            E2EIStorage_1.E2EIStorage.store.certificate(certificate);
-            // Step 10: Initialize MLS with the certificate
-            // TODO: This is not working yet (since we initialize mls beforehand) and will be replaced by a new core-crypto function later on
-            return await this.coreCryptoClient.e2eiRotateAll(this.identity, certificate, this.keyPackagesAmount);
+            return await this.getRotateBundleAndStoreCertificateData(oAuthIdToken);
         }
         catch (error) {
             this.logger.error('Error while trying to continue OAuth flow', error);
             throw error;
         }
     }
+    /**
+     * This function starts a ACME refresh flow for an existing client with a valid refresh token
+     *
+     * @param oAuthIdToken
+     * @returns
+     */
+    async startRefreshCertficateFlow(oAuthIdToken) {
+        // we dont have an oauth flow since we already get the oAuthIdToken from the client
+        try {
+            if (!this.acmeService) {
+                return this.exitWithError('Error while trying to continue OAuth flow. AcmeService is not initialized');
+            }
+            // We need to initialize the identity
+            await this.initIdentity(true);
+            await this.getAndStoreInitialEnrollmentData();
+            return await this.getRotateBundleAndStoreCertificateData(oAuthIdToken);
+        }
+        catch (error) {
+            this.logger.error('Error while trying do the certificate refresh flow', error);
+            throw error;
+        }
+    }
 }
 exports.E2EIServiceInternal = E2EIServiceInternal;

package/lib/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.d.ts

@@ -20,6 +20,7 @@ export declare const E2EIStorage: {
         certificateData: () => boolean;
     };
     remove: {
+        initialData: () => void;
         temporaryData: () => void;
         certificateData: () => void;
         all: () => void;

package/lib/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"E2EIStorage.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,QAAQ,EAAkB,WAAW,EAAqB,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAuFzG,eAAO,MAAM,WAAW;;yBA3EK,MAAM;yBAEN,QAAQ;0BADP,SAAS;4BAEP,WAAW;4BACX,MAAM;;;2BA0BX,WAAW;+BAoBP,MAAM;;wBA9BJ,QAAQ;yBAoBP,SAAS;;;;;;;;;;;;CA4D1C,CAAC"}
+{"version":3,"file":"E2EIStorage.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,QAAQ,EAAkB,WAAW,EAAqB,SAAS,EAAC,MAAM,sBAAsB,CAAC;AA2FzG,eAAO,MAAM,WAAW;;yBA/EK,MAAM;yBAEN,QAAQ;0BADP,SAAS;4BAEP,WAAW;4BACX,MAAM;;;2BA0BX,WAAW;+BAoBP,MAAM;;wBA9BJ,QAAQ;yBAoBP,SAAS;;;;;;;;;;;;;CAiE1C,CAAC"}

package/lib/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.js

@@ -79,11 +79,13 @@ const getCertificateData = () => {
     const atob = window.atob(data);
     return atob;
 };
+const removeInitialData = () => {
+    storage.remove(InitialDataKey);
+};
 const removeTemporaryData = () => {
     storage.remove(HandleKey);
     storage.remove(AuthDataKey);
     storage.remove(OderDataKey);
-    storage.remove(InitialDataKey);
 };
 const removeCertificateData = () => {
     storage.remove(CertificateDataKey);
@@ -91,6 +93,7 @@ const removeCertificateData = () => {
 const removeAll = () => {
     removeTemporaryData();
     removeCertificateData();
+    removeInitialData();
 };
 exports.E2EIStorage = {
     store: {
@@ -113,6 +116,7 @@ exports.E2EIStorage = {
         certificateData: hasCertificateData,
     },
     remove: {
+        initialData: removeInitialData,
         temporaryData: removeTemporaryData,
         certificateData: removeCertificateData,
         all: removeAll,

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

@@ -1 +1 @@
-{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}

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

@@ -620,14 +620,24 @@ class MLSService extends commons_1.TypedEventEmitter {
                 discoveryUrl,
                 keyPackagesAmount: nbPrekeys,
             });
+            // If we don't have an OAuth id token, we need to start the certificate process with Oauth
             if (!oAuthIdToken) {
                 const challengeData = await instance.startCertificateProcess(refreshActiveCertificate);
                 if (challengeData) {
                     return challengeData;
                 }
+                // If we have an OAuth id token, we can continue the certificate process / start a refresh
             }
             else {
-                const rotateBundle = await instance.continueCertificateProcess(oAuthIdToken);
+                let rotateBundle;
+                // If we are not refreshing the active certificate, we need to continue the certificate process with Oauth
+                if (!refreshActiveCertificate) {
+                    rotateBundle = await instance.continueCertificateProcess(oAuthIdToken);
+                    // If we are refreshing the active certificate, can start the refresh process
+                }
+                else {
+                    rotateBundle = await instance.startRefreshCertficateFlow(oAuthIdToken);
+                }
                 if (rotateBundle !== undefined) {
                     // upload the clients public keys
                     await this.uploadMLSPublicKeys(client);

package/package.json

@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "42.25.2",
-  "gitHead": "f2682f0b941b7c5d2f9a999c40f3c363915c5f1b"
+  "version": "42.26.1",
+  "gitHead": "ddfa3bafa658dcbb46e005fc691d32b3dde172ae"
 }