@wireapp/core 43.14.1 → 43.14.2

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

@@ -1,5 +1,6 @@
 import { AcmeService } from './Connection/AcmeServer';
 import { InitParams, RotateBundle } from './E2EIService.types';
+import { InitialData } from './Storage/E2EIStorage.schema';
 export declare class E2EIServiceInternal {
     private readonly coreCryptoClient;
     private readonly apiClient;
@@ -11,9 +12,11 @@ export declare class E2EIServiceInternal {
     private static instance;
     private readonly logger;
     private _acmeService?;
+    private _initialData?;
     private constructor();
     static getInstance(params?: InitParams): Promise<E2EIServiceInternal>;
     get acmeService(): AcmeService;
+    get initialData(): InitialData;
     startCertificateProcess(hasActiveCertificate: boolean): Promise<{
         challenge: {
             url: string;
@@ -23,6 +26,13 @@ export declare class E2EIServiceInternal {
         keyAuth: string;
     }>;
     continueCertificateProcess(oAuthIdToken: string): Promise<RotateBundle | undefined>;
+    /**
+     * This function starts a ACME refresh flow for an existing client with a valid refresh token
+     *
+     * @param oAuthIdToken
+     * @returns
+     */
+    renewCertificate(oAuthIdToken: string, hasActiveCertificate: boolean): Promise<RotateBundle>;
     private initIdentity;
     private init;
     private getDirectory;
@@ -56,12 +66,5 @@ export declare class E2EIServiceInternal {
      * @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, hasActiveCertificate: boolean): Promise<RotateBundle>;
 }
 //# 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":"AAwBA,OAAO,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAyD,UAAU,EAAE,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAcrH,qBAAa,mBAAmB;IAM5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,wDAAwD;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gCAAgC;IAXnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;IAC9E,OAAO,CAAC,YAAY,CAAC,CAAc;IAEnC,OAAO;WAYa,WAAW,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAkClF,IAAI,WAAW,IAAI,WAAW,CAK7B;IAEY,uBAAuB,CAAC,oBAAoB,EAAE,OAAO;;;;;;;;IAOrD,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;YAUlF,YAAY;YAuBZ,IAAI;YASJ,YAAY;YAUZ,eAAe;IAQ7B;;;;;OAKG;YACW,uBAAuB;IA6CrC;;;;;;;OAOG;YACW,sCAAsC;IAiEpD;;;OAGG;YACW,iBAAiB;IAoB/B;;;;;;OAMG;YACW,iBAAiB;IAU/B;;;;;OAKG;IACU,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO;CAQ5F"}
+{"version":3,"file":"E2EIServiceInternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAyD,UAAU,EAAE,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAUrH,OAAO,EAAW,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAInE,qBAAa,mBAAmB;IAO5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,wDAAwD;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gCAAgC;IAZnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;IAC9E,OAAO,CAAC,YAAY,CAAC,CAAc;IACnC,OAAO,CAAC,YAAY,CAAC,CAAc;IAEnC,OAAO;WAYa,WAAW,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAiClF,IAAI,WAAW,IAAI,WAAW,CAK7B;IAED,IAAI,WAAW,IAAI,WAAW,CAK7B;IAEY,uBAAuB,CAAC,oBAAoB,EAAE,OAAO;;;;;;;;IAOrD,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAQhG;;;;;OAKG;IACU,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO;YASnE,YAAY;YAuBZ,IAAI;YASJ,YAAY;YAUZ,eAAe;IAQ7B;;;;;OAKG;YACW,uBAAuB;IAyCrC;;;;;;;OAOG;YACW,sCAAsC;IAiEpD;;;OAGG;YACW,iBAAiB;IAyB/B;;;;;;OAMG;YACW,iBAAiB;CAShC"}

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

@@ -59,7 +59,6 @@ class E2EIServiceInternal {
                 if (!discoveryUrl || !user || !clientId) {
                     throw new Error('discoveryUrl, user and clientId are required to initialize E2EIServiceInternal');
                 }
-                E2EIStorage_1.E2EIStorage.store.initialData({ discoveryUrl, user, clientId });
                 await E2EIServiceInternal.instance.init({ clientId, discoveryUrl, user });
             }
         }
@@ -71,6 +70,12 @@ class E2EIServiceInternal {
         }
         return this._acmeService;
     }
+    get initialData() {
+        if (!this._initialData) {
+            throw new Error('Error while trying to get InitialData. E2EIServiceInternal has not been initialized');
+        }
+        return this._initialData;
+    }
     async startCertificateProcess(hasActiveCertificate) {
         // Step 0: Check if we have a handle in local storage
         // If we don't have a handle, we need to start a new OAuth flow
@@ -84,9 +89,20 @@ class E2EIServiceInternal {
         }
         throw new Error('Error while trying to continue OAuth flow. No enrollment in progress found');
     }
+    /**
+     * This function starts a ACME refresh flow for an existing client with a valid refresh token
+     *
+     * @param oAuthIdToken
+     * @returns
+     */
+    async renewCertificate(oAuthIdToken, hasActiveCertificate) {
+        const identity = await this.initIdentity(hasActiveCertificate);
+        const authData = await this.getEnrollmentChallenges(identity);
+        return this.getRotateBundleAndStoreCertificateData(identity, oAuthIdToken, authData.authChallenges);
+    }
     // ############ Internal Functions ############
     async initIdentity(hasActiveCertificate) {
-        const { user } = E2EIStorage_1.E2EIStorage.get.initialData();
+        const { user } = this.initialData;
         // How long the issued certificate should be maximal valid
         const ciphersuite = E2EIService_types_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519;
         return hasActiveCertificate
@@ -96,9 +112,9 @@ class E2EIServiceInternal {
     async init(params) {
         const { user, clientId, discoveryUrl } = params;
         if (!user || !clientId) {
-            this.logger.error('user and clientId are required to initialize E2eIdentityService');
-            throw new Error();
+            throw new Error('user and clientId are required to initialize E2eIdentityService');
         }
+        this._initialData = { user, clientId, discoveryUrl };
         this._acmeService = new AcmeServer_1.AcmeService(discoveryUrl);
     }
     async getDirectory(identity, connection) {
@@ -155,10 +171,7 @@ class E2EIServiceInternal {
             authzUrls: orderData.authzUrls,
             nonce: orderData.nonce,
         });
-        // Store the values in local storage for later use (e.g. in the continue flow)
-        E2EIStorage_1.E2EIStorage.store.authData(authChallenges);
-        E2EIStorage_1.E2EIStorage.store.orderData({ orderUrl: orderData.orderUrl });
-        return authChallenges;
+        return { authChallenges, orderUrl: orderData.orderUrl };
     }
     /**
      * Continuation of the ACME enrollment flow
@@ -181,7 +194,7 @@ class E2EIServiceInternal {
         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();
+        const { user: wireUser, clientId } = this.initialData;
         //Step 8: Do DPOP Challenge
         const dpopData = await (0, DpopChallenge_1.doWireDpopChallenge)({
             authData,
@@ -231,14 +244,17 @@ class E2EIServiceInternal {
         if (this.e2eiServiceExternal.isEnrollmentInProgress()) {
             throw new Error('Error while trying to start OAuth flow. There is already a flow in progress');
         }
-        const { authorization: { oidcChallenge: wireOidcChallenge, keyauth }, } = await this.getEnrollmentChallenges(identity);
+        const { authChallenges, orderUrl } = await this.getEnrollmentChallenges(identity);
+        const { authorization: { oidcChallenge: wireOidcChallenge, keyauth }, } = authChallenges;
         if (!wireOidcChallenge || !keyauth) {
             throw new Error('missing wireOidcChallenge or keyauth');
         }
         // stash the identity for later use
         const handle = await this.coreCryptoClient.e2eiEnrollmentStash(identity);
-        // stash the handle in local storage
+        // Store the values in local storage for later use (e.g. in the continue flow)
         E2EIStorage_1.E2EIStorage.store.handle(bazinga64_1.Encoder.toBase64(handle).asString);
+        E2EIStorage_1.E2EIStorage.store.authData(authChallenges);
+        E2EIStorage_1.E2EIStorage.store.orderData({ orderUrl });
         // we need to pass back the aquired wireOidcChallenge to the UI
         return { challenge: wireOidcChallenge, keyAuth: keyauth };
     }
@@ -256,17 +272,5 @@ class E2EIServiceInternal {
         this.logger.log('retrieved identity from stash');
         return this.getRotateBundleAndStoreCertificateData(identity, oAuthIdToken, authData);
     }
-    /**
-     * This function starts a ACME refresh flow for an existing client with a valid refresh token
-     *
-     * @param oAuthIdToken
-     * @returns
-     */
-    async startRefreshCertficateFlow(oAuthIdToken, hasActiveCertificate) {
-        // We need to initialize the identity
-        const identity = await this.initIdentity(hasActiveCertificate);
-        const authData = await this.getEnrollmentChallenges(identity);
-        return this.getRotateBundleAndStoreCertificateData(identity, oAuthIdToken, authData);
-    }
 }
 exports.E2EIServiceInternal = E2EIServiceInternal;

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

@@ -1,23 +1,19 @@
-import { AuthData, InitialData, OrderData } from './E2EIStorage.schema';
+import { AuthData, OrderData } from './E2EIStorage.schema';
 export declare const E2EIStorage: {
     store: {
         handle: (handle: string) => void;
         authData: (data: AuthData) => void;
         orderData: (data: OrderData) => void;
-        initialData: (data: InitialData) => void;
     };
     get: {
-        initialData: () => InitialData;
         handle: () => string;
         authData: () => AuthData;
         orderData: () => OrderData;
     };
     has: {
         handle: () => boolean;
-        initialData: () => boolean;
     };
     remove: {
-        initialData: () => void;
         temporaryData: () => 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":"AAqBA,OAAO,EAAC,QAAQ,EAAkB,WAAW,EAAqB,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAuEzG,eAAO,MAAM,WAAW;;yBA5DK,MAAM;yBAEN,QAAQ;0BADP,SAAS;4BAEP,WAAW;;;2BAwBhB,WAAW;;wBATL,QAAQ;yBAkBP,SAAS;;;;;;;;;;;CA8C1C,CAAC"}
+{"version":3,"file":"E2EIStorage.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,QAAQ,EAAkB,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAqDzE,eAAO,MAAM,WAAW;;yBA3CK,MAAM;yBAEN,QAAQ;0BADP,SAAS;;;;wBAcN,QAAQ;yBASP,SAAS;;;;;;;;;CAqC1C,CAAC"}

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

@@ -25,14 +25,11 @@ const LocalStorageStore_1 = require("../../../../util/LocalStorageStore");
 const HandleKey = 'Handle';
 const AuthDataKey = 'AuthData';
 const OderDataKey = 'OrderData';
-const InitialDataKey = 'InitialData';
 const storage = (0, LocalStorageStore_1.LocalStorageStore)('E2EIStorage');
 const storeHandle = (handle) => storage.add(HandleKey, bazinga64_1.Encoder.toBase64(handle).asString);
 const storeOrderData = (data) => storage.add(OderDataKey, bazinga64_1.Encoder.toBase64(JSON.stringify(data)).asString);
 const storeAuthData = (data) => storage.add(AuthDataKey, bazinga64_1.Encoder.toBase64(JSON.stringify(data)).asString);
-const storeInitialData = (data) => storage.add(InitialDataKey, bazinga64_1.Encoder.toBase64(JSON.stringify(data)).asString);
 const hasHandle = () => storage.has(HandleKey);
-const hasInitialData = () => storage.has(InitialDataKey);
 const getAndVerifyHandle = () => {
     const handle = storage.get(HandleKey);
     if (!handle) {
@@ -48,14 +45,6 @@ const getAndVerifyAuthData = () => {
     const decodedData = bazinga64_1.Decoder.fromBase64(data).asString;
     return E2EIStorage_schema_1.AuthDataSchema.parse(JSON.parse(decodedData));
 };
-const getInitialData = () => {
-    const data = storage.get(InitialDataKey);
-    if (!data) {
-        throw new Error('ACME: InitialData not found');
-    }
-    const decodedData = bazinga64_1.Decoder.fromBase64(data).asString;
-    return E2EIStorage_schema_1.InitialDataSchema.parse(JSON.parse(decodedData));
-};
 const getAndVerifyOrderData = () => {
     const data = storage.get(OderDataKey);
     if (!data) {
@@ -64,9 +53,6 @@ const getAndVerifyOrderData = () => {
     const decodedData = bazinga64_1.Decoder.fromBase64(data).asString;
     return JSON.parse(decodedData);
 };
-const removeInitialData = () => {
-    storage.remove(InitialDataKey);
-};
 const removeTemporaryData = () => {
     storage.remove(HandleKey);
     storage.remove(AuthDataKey);
@@ -74,27 +60,22 @@ const removeTemporaryData = () => {
 };
 const removeAll = () => {
     removeTemporaryData();
-    removeInitialData();
 };
 exports.E2EIStorage = {
     store: {
         handle: storeHandle,
         authData: storeAuthData,
         orderData: storeOrderData,
-        initialData: storeInitialData,
     },
     get: {
-        initialData: getInitialData,
         handle: getAndVerifyHandle,
         authData: getAndVerifyAuthData,
         orderData: getAndVerifyOrderData,
     },
     has: {
         handle: hasHandle,
-        initialData: hasInitialData,
     },
     remove: {
-        initialData: removeInitialData,
         temporaryData: removeTemporaryData,
         all: removeAll,
     },

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

@@ -662,7 +662,7 @@ class MLSService extends commons_1.TypedEventEmitter {
             ? // 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);
+                await instance.renewCertificate(oAuthIdToken, hasActiveCertificate);
         if (rotateBundle === undefined) {
             throw new Error('Could not get the rotate bundle');
         }

package/package.json

@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "43.14.1",
-  "gitHead": "be5c29911af8df6a7ba7367d927a32e8354387fb"
+  "version": "43.14.2",
+  "gitHead": "8dff9b9df3cb21e6a9b23ca848da33ca60c193d0"
 }