@wireapp/core 43.7.0 → 43.7.2

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

@@ -635,49 +635,45 @@ class MLSService extends commons_1.TypedEventEmitter {
             // If we don't have an OAuth id token, we need to start the certificate process with Oauth
             if (!oAuthIdToken) {
                 const data = await instance.startCertificateProcess(hasActiveCertificate);
-                if (data) {
-                    return data;
+                const oidcChallenge = data.challenge;
+                if (!oidcChallenge) {
+                    throw new Error('Not oidc challenge found');
                 }
-                // If we have an OAuth id token, we can continue the certificate process / start a refresh
+                return { status: 'authentication', authenticationChallenge: data };
             }
-            else {
-                let rotateBundle;
-                // If we are not refreshing the active certificate, we need to continue the certificate process with Oauth
-                if (!hasActiveCertificate) {
-                    rotateBundle = await instance.continueCertificateProcess(oAuthIdToken);
-                    // If we are refreshing the active certificate, can start the refresh process
-                }
-                else {
-                    rotateBundle = await instance.startRefreshCertficateFlow(oAuthIdToken, hasActiveCertificate);
-                }
-                if (rotateBundle !== undefined) {
-                    // upload the clients public keys
-                    if (!hasActiveCertificate) {
-                        // we only upload public keys for the initial certification process. Renewals do not need to upload new public keys
-                        await this.uploadMLSPublicKeys(client);
-                    }
-                    // Remove old key packages
-                    await this.deleteMLSKeyPackages(client.id, rotateBundle.keyPackageRefsToRemove);
-                    // Upload new key packages with x509 certificate
-                    await this.uploadMLSKeyPackages(client.id, rotateBundle.newKeyPackages);
-                    // Verify that we have enough key packages
-                    await this.verifyRemoteMLSKeyPackagesAmount(client.id);
-                    // 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;
-                }
+            // If we have an OAuth id token, we can continue the certificate process / start a refresh
+            const rotateBundle = !hasActiveCertificate
+                ? // If we are not refreshing the active certificate, we need to continue the certificate process with Oauth
+                    await instance.continueCertificateProcess(oAuthIdToken)
+                : // If we are refreshing the active certificate, can start the refresh process
+                    await instance.startRefreshCertficateFlow(oAuthIdToken, hasActiveCertificate);
+            if (rotateBundle === undefined) {
+                throw new Error('Could not get the rotate bundle');
+            }
+            // upload the clients public keys
+            if (!hasActiveCertificate) {
+                // we only upload public keys for the initial certification process. Renewals do not need to upload new public keys
+                await this.uploadMLSPublicKeys(client);
+            }
+            // Remove old key packages
+            await this.deleteMLSKeyPackages(client.id, rotateBundle.keyPackageRefsToRemove);
+            // Upload new key packages with x509 certificate
+            await this.uploadMLSKeyPackages(client.id, rotateBundle.newKeyPackages);
+            // Verify that we have enough key packages
+            await this.verifyRemoteMLSKeyPackagesAmount(client.id);
+            // 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 false;
+            return { status: 'successful' };
         }
         catch (error) {
             this.logger.error('E2EI - Failed to enroll', error);

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^26.10.0",
+    "@wireapp/api-client": "^26.10.1",
     "@wireapp/commons": "^5.2.4",
     "@wireapp/core-crypto": "1.0.0-rc.30",
     "@wireapp/cryptobox": "12.8.0",
@@ -44,7 +44,7 @@
     "fake-indexeddb": "^4.0.0",
     "jest": "^29.2.1",
     "jest-websocket-mock": "2.5.0",
-    "nock": "13.4.0",
+    "nock": "13.5.0",
     "rimraf": "^3.0.2",
     "typescript": "^5.0.4"
   },
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "43.7.0",
-  "gitHead": "71eefe703ca0058852ceb6fb62510fccff2c33ab"
+  "version": "43.7.2",
+  "gitHead": "368d0946bb85bb8eff2c71d91b8c4b46c14aeb1d"
 }