@wireapp/core 43.7.1 → 43.7.2

package/lib/Account.d.ts

@@ -13,7 +13,7 @@ import { SubconversationService } from './conversation/SubconversationService/Su
 import { GiphyService } from './giphy/';
 import { LinkPreviewService } from './linkPreview';
 import { MLSService } from './messagingProtocols/mls';
-import { E2EIServiceExternal, StartNewOAuthFlowReturnValue } from './messagingProtocols/mls/E2EIdentityService';
+import { E2EIServiceExternal } from './messagingProtocols/mls/E2EIdentityService';
 import { CoreCallbacks, CoreCryptoConfig, SecretCrypto } from './messagingProtocols/mls/types';
 import { NewClient, ProteusService } from './messagingProtocols/proteus';
 import { HandledEventPayload, NotificationService, NotificationSource } from './notification/';
@@ -118,12 +118,21 @@ export declare class Account extends TypedEventEmitter<Events> {
     useAPIVersion(min: number, max: number, allowDev?: boolean): Promise<BackendFeatures>;
     private persistCookie;
     private getE2EIStatus;
-    enrollE2EI({ displayName, handle, discoveryUrl, oAuthIdToken, }: {
+    enrollE2EI({ displayName, handle, teamId, discoveryUrl, oAuthIdToken, }: {
         displayName: string;
         handle: string;
+        teamId: string;
         discoveryUrl: string;
         oAuthIdToken?: string;
-    }): Promise<StartNewOAuthFlowReturnValue | boolean>;
+    }): Promise<{
+        status: "authentication";
+        authenticationChallenge: {
+            keyAuth: string;
+            challenge: import("./messagingProtocols/mls").AcmeChallenge;
+        };
+    } | {
+        status: "successful";
+    }>;
     get clientId(): string;
     get userId(): string;
     /**

package/lib/Account.d.ts.map

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

package/lib/Account.js

@@ -187,7 +187,7 @@ class Account extends commons_1.TypedEventEmitter {
             isFeatureEnabled: clientCanUseE2EI && teamCanUseE2EI,
         };
     }
-    async enrollE2EI({ displayName, handle, discoveryUrl, oAuthIdToken, }) {
+    async enrollE2EI({ displayName, handle, teamId, discoveryUrl, oAuthIdToken, }) {
         var _a, _b, _c;
         const context = this.apiClient.context;
         const domain = (_a = context === null || context === void 0 ? void 0 : context.domain) !== null && _a !== void 0 ? _a : '';
@@ -195,13 +195,13 @@ class Account extends commons_1.TypedEventEmitter {
             throw new Error('Client has not been initialized - please login first');
         }
         if (!((_b = this.service) === null || _b === void 0 ? void 0 : _b.mls) || !((_c = this.service) === null || _c === void 0 ? void 0 : _c.e2eIdentity)) {
-            this.logger.info('MLS not initialized, unable to enroll E2EI');
-            return false;
+            throw new Error('MLS not initialized, unable to enroll E2EI');
         }
         const user = {
             displayName,
             handle,
             domain,
+            teamId,
             id: this.userId,
         };
         return this.service.mls.enrollE2EI(discoveryUrl, this.service.e2eIdentity, user, this.currentClient, this.options.nbPrekeys, oAuthIdToken);

package/lib/messagingProtocols/mls/E2EIdentityService/Connection/AcmeServer/AcmeService.d.ts

@@ -1,4 +1,4 @@
-import { GetDirectoryReturnValue, GetInitialNonceReturnValue } from './AcmeService.types';
+import { GetDirectoryReturnValue, GetInitialNonceReturnValue, PostJoseRequestReturnValue } from './AcmeService.types';
 import { AcmeChallenge, AcmeDirectory } from '../../E2EIService.types';
 export declare class AcmeService {
     private discoveryUrl;
@@ -13,115 +13,83 @@ export declare class AcmeService {
     getDirectory(): GetDirectoryReturnValue;
     getLocalCertificateRoot(): Promise<string>;
     getInitialNonce(url: AcmeDirectory['newNonce']): GetInitialNonceReturnValue;
-    createNewAccount(url: AcmeDirectory['newAccount'], payload: Uint8Array): Promise<{
-        data: {
-            status: string;
-            orders: string;
-            contact: string[];
-        };
-        nonce: string;
-        location?: string | undefined;
-    } | undefined>;
-    createNewOrder(url: AcmeDirectory['newOrder'], payload: Uint8Array): Promise<{
-        data: {
-            status: string;
-            expires: string;
-            notBefore: string;
-            notAfter: string;
-            identifiers: {
-                type: string;
-                value: string;
-            }[];
-            authorizations: string[];
-            finalize: string;
-        };
-        nonce: string;
-        location?: string | undefined;
-    } | undefined>;
-    getAuthorization(url: string, payload: Uint8Array): Promise<{
-        data: {
-            status: string;
-            expires: string;
-            identifier: {
-                type: string;
-                value: string;
-            };
-            challenges: {
-                type: string;
-                url: string;
-                target: string;
-                status: string;
-                token: string;
-            }[];
-        };
-        nonce: string;
-        location?: string | undefined;
-    } | undefined>;
-    validateDpopChallenge(url: AcmeChallenge['url'], payload: Uint8Array): Promise<{
-        data: {
+    createNewAccount(url: AcmeDirectory['newAccount'], payload: Uint8Array): Promise<PostJoseRequestReturnValue<{
+        status: string;
+        orders: string;
+        contact: string[];
+    }>>;
+    createNewOrder(url: AcmeDirectory['newOrder'], payload: Uint8Array): Promise<PostJoseRequestReturnValue<{
+        status: string;
+        expires: string;
+        notBefore: string;
+        notAfter: string;
+        identifiers: {
             type: string;
-            url: string;
-            status: string;
-            token: string;
+            value: string;
+        }[];
+        authorizations: string[];
+        finalize: string;
+    }>>;
+    getAuthorization(url: string, payload: Uint8Array): Promise<PostJoseRequestReturnValue<{
+        status: string;
+        expires: string;
+        identifier: {
+            type: string;
+            value: string;
         };
-        nonce: string;
-        location?: string | undefined;
-    } | undefined>;
-    validateOidcChallenge(url: AcmeChallenge['url'], payload: Uint8Array): Promise<{
-        data: {
+        challenges: {
             type: string;
             url: string;
             target: string;
             status: string;
             token: string;
-            validated?: string | undefined;
-            error?: {
-                type: string;
-                detail: string;
-            } | undefined;
-        };
-        nonce: string;
-        location?: string | undefined;
-    } | undefined>;
-    checkStatusOfOrder(url: string, payload: Uint8Array): Promise<{
-        data: {
-            id: string;
-            status: string;
-            expires: string;
-            notBefore: string;
-            notAfter: string;
-            identifiers: {
-                type: string;
-                value: string;
-            }[];
-            authorizations: string[];
-            finalize: string;
-        };
-        nonce: string;
-        location?: string | undefined;
-    } | undefined>;
-    finalizeOrder(url: string, payload: Uint8Array): Promise<{
-        data: {
-            id: string;
-            certificate: string;
-            status: string;
-            expires: string;
-            notBefore: string;
-            notAfter: string;
-            identifiers: {
-                type: string;
-                value: string;
-            }[];
-            authorizations: string[];
-            finalize: string;
-        };
-        nonce: string;
-        location?: string | undefined;
-    } | undefined>;
-    getCertificate(url: string, payload: Uint8Array): Promise<{
-        data: string;
-        nonce: string;
-        location?: string | undefined;
-    } | undefined>;
+        }[];
+    }>>;
+    validateDpopChallenge(url: AcmeChallenge['url'], payload: Uint8Array): Promise<PostJoseRequestReturnValue<{
+        type: string;
+        url: string;
+        status: string;
+        token: string;
+    }>>;
+    validateOidcChallenge(url: AcmeChallenge['url'], payload: Uint8Array): Promise<PostJoseRequestReturnValue<{
+        type: string;
+        url: string;
+        target: string;
+        status: string;
+        token: string;
+        validated?: string | undefined;
+        error?: {
+            type: string;
+            detail: string;
+        } | undefined;
+    }>>;
+    checkStatusOfOrder(url: string, payload: Uint8Array): Promise<PostJoseRequestReturnValue<{
+        id: string;
+        status: string;
+        expires: string;
+        notBefore: string;
+        notAfter: string;
+        identifiers: {
+            type: string;
+            value: string;
+        }[];
+        authorizations: string[];
+        finalize: string;
+    }>>;
+    finalizeOrder(url: string, payload: Uint8Array): Promise<PostJoseRequestReturnValue<{
+        id: string;
+        certificate: string;
+        status: string;
+        expires: string;
+        notBefore: string;
+        notAfter: string;
+        identifiers: {
+            type: string;
+            value: string;
+        }[];
+        authorizations: string[];
+        finalize: string;
+    }>>;
+    getCertificate(url: string, payload: Uint8Array): Promise<PostJoseRequestReturnValue<string>>;
 }
 //# sourceMappingURL=AcmeService.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/Connection/AcmeServer/AcmeService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcmeService.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/E2EIdentityService/Connection/AcmeServer/AcmeService.ts"],"names":[],"mappings":"AAsBA,OAAO,EACL,uBAAuB,EACvB,0BAA0B,EAG3B,MAAM,qBAAqB,CAAC;AA0B7B,OAAO,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,yBAAyB,CAAC;AAErE,qBAAa,WAAW;IAOV,OAAO,CAAC,YAAY;IANhC,OAAO,CAAC,MAAM,CAAwC;IACtD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiC;IAC/D,OAAO,CAAC,QAAQ,CAAC,GAAG,CAElB;gBAEkB,YAAY,EAAE,MAAM;IAExC,OAAO,KAAK,WAAW,GAGtB;IAID,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,eAAe;YAIT,eAAe;IAgChB,YAAY,IAAI,uBAAuB;IAWvC,uBAAuB,IAAI,OAAO,CAAC,MAAM,CAAC;IAM1C,eAAe,CAAC,GAAG,EAAE,aAAa,CAAC,UAAU,CAAC,GAAG,0BAA0B;IAW3E,gBAAgB,CAAC,GAAG,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,UAAU;;;;;;;;;IAStE,cAAc,CAAC,GAAG,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,UAAU;;;;;;;;;;;;;;;;IAUlE,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;;;;;;;;;;;;;;;;;;;IASjD,qBAAqB,CAAC,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,UAAU;;;;;;;;;;IASpE,qBAAqB,CAAC,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,UAAU;;;;;;;;;;;;;;;;IASpE,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;;;;;;;;;;;;;;;;;IASnD,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;;;;;;;;;;;;;;;;;;IAS9C,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;;;;;CAQ7D"}
+{"version":3,"file":"AcmeService.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/E2EIdentityService/Connection/AcmeServer/AcmeService.ts"],"names":[],"mappings":"AAsBA,OAAO,EACL,uBAAuB,EACvB,0BAA0B,EAE1B,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAkB7B,OAAO,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,yBAAyB,CAAC;AAErE,qBAAa,WAAW;IAOV,OAAO,CAAC,YAAY;IANhC,OAAO,CAAC,MAAM,CAAwC;IACtD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiC;IAC/D,OAAO,CAAC,QAAQ,CAAC,GAAG,CAElB;gBAEkB,YAAY,EAAE,MAAM;IAExC,OAAO,KAAK,WAAW,GAGtB;IAID,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,eAAe;YAIT,eAAe;IAsBhB,YAAY,IAAI,uBAAuB;IAWvC,uBAAuB,IAAI,OAAO,CAAC,MAAM,CAAC;IAM1C,eAAe,CAAC,GAAG,EAAE,aAAa,CAAC,UAAU,CAAC,GAAG,0BAA0B;IAW3E,gBAAgB,CAAC,GAAG,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,UAAU;;;;;IAQtE,cAAc,CAAC,GAAG,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,UAAU;;;;;;;;;;;;IASlE,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;;;;;;;;;;;;;;;IAQjD,qBAAqB,CAAC,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,UAAU;;;;;;IAQpE,qBAAqB,CAAC,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,UAAU;;;;;;;;;;;;IAQpE,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;;;;;;;;;;;;;IAQnD,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;;;;;;;;;;;;;;IAQ9C,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;CAO7D"}

package/lib/messagingProtocols/mls/E2EIdentityService/Connection/AcmeServer/AcmeService.js

@@ -45,29 +45,19 @@ class AcmeService {
     extractLocation(headers) {
         return schema_1.ResponseHeaderLocationSchema.parse(headers).location;
     }
-    async postJoseRequest({ payload, schema, url, errorMessage, shouldGetLocation = false, }) {
-        try {
-            const { data, headers } = await this.axiosInstance.post(url, payload, {
-                headers: {
-                    'Content-Type': 'application/jose+json',
-                },
-            });
-            let location = undefined;
-            const nonce = this.extractNonce(headers);
-            if (shouldGetLocation) {
-                location = this.extractLocation(headers);
-            }
-            const accountData = schema.parse(data);
-            return {
-                data: accountData,
-                nonce,
-                location,
-            };
-        }
-        catch (e) {
-            this.logger.error(errorMessage, e);
-            return undefined;
-        }
+    async postJoseRequest({ payload, schema, url, shouldGetLocation = false, }) {
+        const { data, headers } = await this.axiosInstance.post(url, payload, {
+            headers: {
+                'Content-Type': 'application/jose+json',
+            },
+        });
+        const nonce = this.extractNonce(headers);
+        const accountData = schema.parse(data);
+        return {
+            data: accountData,
+            nonce,
+            location: shouldGetLocation ? this.extractLocation(headers) : undefined,
+        };
     }
     // ############ Public Functions ############
     async getDirectory() {
@@ -99,7 +89,6 @@ class AcmeService {
     }
     async createNewAccount(url, payload) {
         return this.postJoseRequest({
-            errorMessage: 'Error while creating new Account',
             payload,
             schema: schema_1.NewAccountResponseSchema,
             url,
@@ -107,7 +96,6 @@ class AcmeService {
     }
     async createNewOrder(url, payload) {
         return this.postJoseRequest({
-            errorMessage: 'Error while creating new Order',
             payload,
             schema: schema_1.NewOrderResponseSchema,
             url,
@@ -116,7 +104,6 @@ class AcmeService {
     }
     async getAuthorization(url, payload) {
         return this.postJoseRequest({
-            errorMessage: 'Error while receiving Authorization',
             payload,
             schema: schema_1.AuthorizationResponseSchema,
             url,
@@ -124,7 +111,6 @@ class AcmeService {
     }
     async validateDpopChallenge(url, payload) {
         return this.postJoseRequest({
-            errorMessage: 'Error while validating DPOP challenge',
             payload,
             schema: schema_1.DpopChallengeResponseSchema,
             url,
@@ -132,7 +118,6 @@ class AcmeService {
     }
     async validateOidcChallenge(url, payload) {
         return this.postJoseRequest({
-            errorMessage: 'Error while validating OIDC challenge',
             payload,
             schema: schema_1.OidcChallengeResponseSchema,
             url,
@@ -140,7 +125,6 @@ class AcmeService {
     }
     async checkStatusOfOrder(url, payload) {
         return this.postJoseRequest({
-            errorMessage: 'Error while checking status of Order',
             payload,
             schema: schema_1.CheckStatusOfOrderResponseSchema,
             url,
@@ -148,7 +132,6 @@ class AcmeService {
     }
     async finalizeOrder(url, payload) {
         return this.postJoseRequest({
-            errorMessage: 'Error while finalizing Order',
             payload,
             schema: schema_1.FinalizeOrderResponseSchema,
             url,
@@ -156,7 +139,6 @@ class AcmeService {
     }
     async getCertificate(url, payload) {
         return this.postJoseRequest({
-            errorMessage: 'Error while receiving Certificate',
             payload,
             schema: schema_1.GetCertificateResponseSchema,
             url,

package/lib/messagingProtocols/mls/E2EIdentityService/Connection/AcmeServer/AcmeService.types.d.ts

@@ -6,12 +6,11 @@ export interface PostJoseRequestParams<T> {
     url: string;
     payload: Uint8Array;
     schema: ZodSchema<T>;
-    errorMessage: string;
     shouldGetLocation?: boolean;
 }
-export type PostJoseRequestReturnValue<T> = Promise<{
+export type PostJoseRequestReturnValue<T> = {
     data: T;
     nonce: Nonce;
     location?: string;
-} | undefined>;
+};
 //# sourceMappingURL=AcmeService.types.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/Connection/AcmeServer/AcmeService.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcmeService.types.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/E2EIdentityService/Connection/AcmeServer/AcmeService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,KAAK,CAAC;AAE9B,OAAO,EAAC,KAAK,EAAC,MAAM,yBAAyB,CAAC;AAE9C,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;AAEtE,MAAM,MAAM,0BAA0B,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;AAErE,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,UAAU,CAAC;IACpB,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AACD,MAAM,MAAM,0BAA0B,CAAC,CAAC,IAAI,OAAO,CAC/C;IACE,IAAI,EAAE,CAAC,CAAC;IACR,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GACD,SAAS,CACZ,CAAC"}
+{"version":3,"file":"AcmeService.types.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/E2EIdentityService/Connection/AcmeServer/AcmeService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,KAAK,CAAC;AAE9B,OAAO,EAAC,KAAK,EAAC,MAAM,yBAAyB,CAAC;AAE9C,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;AAEtE,MAAM,MAAM,0BAA0B,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;AAErE,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,UAAU,CAAC;IACpB,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AACD,MAAM,MAAM,0BAA0B,CAAC,CAAC,IAAI;IAC1C,IAAI,EAAE,CAAC,CAAC;IACR,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC"}

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

@@ -7,7 +7,7 @@ import { E2EIServiceExternal } from './E2EIServiceExternal';
 type OmitFree<T> = Omit<T, 'free'>;
 type NewAcmeAuthzOriginal = OmitFree<Awaited<ReturnType<E2eiEnrollment['newAuthzResponse']>>>;
 export type AcmeDirectory = OmitFree<Awaited<ReturnType<E2eiEnrollment['directoryResponse']>>>;
-export type AcmeChallenge = OmitFree<NonNullable<NewAcmeAuthzOriginal['wireDpopChallenge']>>;
+export type AcmeChallenge = OmitFree<NonNullable<NewAcmeAuthzOriginal['wireOidcChallenge']>>;
 export type NewAcmeOrder = OmitFree<Awaited<ReturnType<E2eiEnrollment['newOrderResponse']>>>;
 export type NewAcmeAuthz = Pick<Awaited<ReturnType<E2eiEnrollment['newAuthzResponse']>>, 'identifier' | 'keyauth'> & {
     wireDpopChallenge?: AcmeChallenge;
@@ -18,6 +18,7 @@ export type User = {
     id: string;
     domain: string;
     displayName: string;
+    teamId: string;
     handle: string;
 };
 export type Account = Uint8Array;
@@ -41,8 +42,4 @@ export interface InitParams {
     discoveryUrl?: string;
     keyPackagesAmount: number;
 }
-export interface StartNewOAuthFlowReturnValue {
-    challenge: AcmeChallenge;
-    keyAuth: KeyAuth;
-}
 //# sourceMappingURL=E2EIService.types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"E2EIService.types.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EACL,cAAc,EACd,WAAW,EACX,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,qBAAqB,EACrB,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAE1D;;GAEG;AACH,KAAK,QAAQ,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AACnC,KAAK,oBAAoB,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9F,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/F,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;AAC7F,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7F,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC,GAAG;IACnH,iBAAiB,CAAC,EAAE,aAAa,CAAC;IAClC,iBAAiB,CAAC,EAAE,aAAa,CAAC;CACnC,CAAC;AACF,OAAO,EAAC,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,cAAc,EAAC,CAAC;AAEpH,MAAM,MAAM,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,MAAM,MAAM,OAAO,GAAG,UAAU,CAAC;AACjC,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC;AAC3B,MAAM,MAAM,OAAO,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;AAEtD,MAAM,WAAW,yBAAyB;IACxC,aAAa,EAAE,aAAa,CAAC;IAC7B,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,uBAAuB;IACtC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,EAAE,UAAU,CAAC;IAC5B,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,4BAA4B;IAC3C,SAAS,EAAE,aAAa,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;CAClB"}
+{"version":3,"file":"E2EIService.types.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EACL,cAAc,EACd,WAAW,EACX,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,qBAAqB,EACrB,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAE1D;;GAEG;AACH,KAAK,QAAQ,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AACnC,KAAK,oBAAoB,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9F,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/F,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;AAC7F,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7F,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC,GAAG;IACnH,iBAAiB,CAAC,EAAE,aAAa,CAAC;IAClC,iBAAiB,CAAC,EAAE,aAAa,CAAC;CACnC,CAAC;AACF,OAAO,EAAC,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,cAAc,EAAC,CAAC;AAEpH,MAAM,MAAM,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,MAAM,MAAM,OAAO,GAAG,UAAU,CAAC;AACjC,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC;AAC3B,MAAM,MAAM,OAAO,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;AAEtD,MAAM,WAAW,yBAAyB;IACxC,aAAa,EAAE,aAAa,CAAC;IAC7B,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,uBAAuB;IACtC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,EAAE,UAAU,CAAC;IAC5B,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;CAC3B"}

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

@@ -1,5 +1,5 @@
-import { InitParams, RotateBundle, StartNewOAuthFlowReturnValue } from './E2EIService.types';
-declare class E2EIServiceInternal {
+import { InitParams, RotateBundle } from './E2EIService.types';
+export declare class E2EIServiceInternal {
     private static instance;
     private readonly logger;
     private readonly coreCryptoClient;
@@ -11,10 +11,12 @@ declare class E2EIServiceInternal {
     private isInitialized;
     private constructor();
     static getInstance(params?: InitParams): Promise<E2EIServiceInternal>;
-    startCertificateProcess(hasActiveCertificate: boolean): Promise<StartNewOAuthFlowReturnValue | undefined>;
+    startCertificateProcess(hasActiveCertificate: boolean): Promise<{
+        challenge: import("./E2EIService.types").AcmeChallenge;
+        keyAuth: string;
+    }>;
     continueCertificateProcess(oAuthIdToken: string): Promise<RotateBundle | undefined>;
     private initIdentity;
-    private exitWithError;
     private init;
     private getDirectory;
     private getInitialNonce;
@@ -24,7 +26,7 @@ declare class E2EIServiceInternal {
      *
      * @returns authData
      */
-    private getAndStoreInitialEnrollmentData;
+    private getEnrollmentChallenges;
     /**
      * Continuation of the ACME enrollment flow
      * Needs to be called after the user has authenticated with the OIDC provider
@@ -53,7 +55,6 @@ declare class E2EIServiceInternal {
      * @param oAuthIdToken
      * @returns
      */
-    startRefreshCertficateFlow(oAuthIdToken: string, hasActiveCertificate: boolean): Promise<RotateBundle | undefined>;
+    startRefreshCertficateFlow(oAuthIdToken: string, hasActiveCertificate: boolean): Promise<RotateBundle>;
 }
-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,EAKL,UAAU,EACV,YAAY,EACZ,4BAA4B,EAC7B,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,oBAAoB,EAAE,OAAO;IAYrD,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;YAelF,YAAY;IA6B1B,OAAO,CAAC,aAAa;YAKP,IAAI;YAeJ,YAAY;YAeZ,eAAe;IAa7B;;;;;OAKG;YACW,gCAAgC;IAgD9C;;;;;;;OAOG;YACW,sCAAsC;IA2EpD;;;OAGG;YACW,iBAAiB;IA0B/B;;;;;;OAMG;YACW,iBAAiB;IAmB/B;;;;;OAKG;IACU,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO;CAkB5F;AAED,OAAO,EAAC,mBAAmB,EAAC,CAAC"}
+{"version":3,"file":"E2EIServiceInternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAyD,UAAU,EAAE,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAYrH,qBAAa,mBAAmB;IAC9B,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,oBAAoB,EAAE,OAAO;;;;IAOrD,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;YAUlF,YAAY;YA0BZ,IAAI;YAUJ,YAAY;YAUZ,eAAe;IAQ7B;;;;;OAKG;YACW,uBAAuB;IAiDrC;;;;;;;OAOG;YACW,sCAAsC;IAgEpD;;;OAGG;YACW,iBAAiB;IAwB/B;;;;;;OAMG;YACW,iBAAiB;IAe/B;;;;;OAKG;IACU,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO;CAa5F"}

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

@@ -66,27 +66,15 @@ class E2EIServiceInternal {
     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
-        try {
-            // Initialize the identity
-            await this.initIdentity(hasActiveCertificate);
-            return this.startNewOAuthFlow();
-        }
-        catch (error) {
-            return this.exitWithError('Error while trying to start OAuth flow with error:', error);
-        }
+        await this.initIdentity(hasActiveCertificate);
+        return this.startNewOAuthFlow();
     }
     async continueCertificateProcess(oAuthIdToken) {
         // If we don't have a handle, we need to start a new OAuth flow
         if (this.e2eServiceExternal.isEnrollmentInProgress()) {
-            try {
-                return this.continueOAuthFlow(oAuthIdToken);
-            }
-            catch (error) {
-                return this.exitWithError('Error while trying to continue OAuth flow with error:', error);
-            }
+            return this.continueOAuthFlow(oAuthIdToken);
         }
-        this.logger.error('Error while trying to continue OAuth flow. No handle found in local storage');
-        return undefined;
+        throw new Error('Error while trying to continue OAuth flow. No enrollment in progress found');
     }
     // ############ Internal Functions ############
     async initIdentity(hasActiveCertificate) {
@@ -95,63 +83,35 @@ class E2EIServiceInternal {
         const expiryDays = 90;
         const ciphersuite = E2EIService_types_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519;
         if (hasActiveCertificate) {
-            try {
-                this.identity = await this.coreCryptoClient.e2eiNewRotateEnrollment(expiryDays, ciphersuite, user.displayName, user.handle);
-            }
-            catch (error) {
-                this.logger.error('Error while trying to initIdentity e2eiNewRotateEnrollment', error);
-                throw error;
-            }
+            this.identity = await this.coreCryptoClient.e2eiNewRotateEnrollment(expiryDays, ciphersuite, user.displayName, user.handle, user.teamId);
         }
         else {
-            this.identity = await this.coreCryptoClient.e2eiNewActivationEnrollment(user.displayName, user.handle, expiryDays, ciphersuite);
+            this.identity = await this.coreCryptoClient.e2eiNewActivationEnrollment(user.displayName, user.handle, expiryDays, ciphersuite, user.teamId);
         }
     }
-    exitWithError(message, error) {
-        this.logger.error(message, error);
-        return undefined;
-    }
     async init(params) {
-        try {
-            const { user, clientId, discoveryUrl } = params;
-            if (!user || !clientId) {
-                this.logger.error('user and clientId are required to initialize E2eIdentityService');
-                throw new Error();
-            }
-            this.acmeService = new AcmeServer_1.AcmeService(discoveryUrl);
-            this.isInitialized = true;
-        }
-        catch (error) {
-            this.logger.error('Error while trying to initialize E2eIdentityService', error);
-            throw error;
+        const { user, clientId, discoveryUrl } = params;
+        if (!user || !clientId) {
+            this.logger.error('user and clientId are required to initialize E2eIdentityService');
+            throw new Error();
         }
+        this.acmeService = new AcmeServer_1.AcmeService(discoveryUrl);
+        this.isInitialized = true;
     }
     async getDirectory(identity, connection) {
-        try {
-            const directory = await connection.getDirectory();
-            if (directory) {
-                const parsedDirectory = identity.directoryResponse(directory);
-                return parsedDirectory;
-            }
-        }
-        catch (error) {
-            this.logger.error('Error while trying to receive a directory', error);
-            throw error;
+        const directory = await connection.getDirectory();
+        if (directory) {
+            const parsedDirectory = identity.directoryResponse(directory);
+            return parsedDirectory;
         }
         return undefined;
     }
     async getInitialNonce(directory, connection) {
-        try {
-            const nonce = await connection.getInitialNonce(directory.newNonce);
-            if (nonce) {
-                return nonce;
-            }
+        const nonce = await connection.getInitialNonce(directory.newNonce);
+        if (!nonce) {
             throw new Error('No initial-nonce received');
         }
-        catch (error) {
-            this.logger.error('Error while trying to receive a nonce', error);
-            throw error;
-        }
+        return nonce;
     }
     /**
      * Start of the ACME enrollment flow
@@ -159,7 +119,7 @@ class E2EIServiceInternal {
      *
      * @returns authData
      */
-    async getAndStoreInitialEnrollmentData() {
+    async getEnrollmentChallenges() {
         if (!this.isInitialized || !this.identity || !this.acmeService) {
             throw new Error('Error while trying to start OAuth flow. E2eIdentityService is not fully initialized');
         }
@@ -173,31 +133,32 @@ class E2EIServiceInternal {
         if (!nonce) {
             throw new Error('Error while trying to start OAuth flow. No nonce received');
         }
+        const { acmeService, identity } = this;
         // Step 2: Create a new account
         const newAccountNonce = await (0, Account_1.createNewAccount)({
-            connection: this.acmeService,
+            connection: acmeService,
             directory,
-            identity: this.identity,
+            identity,
             nonce,
         });
         // Step 3: Create a new order
         const orderData = await (0, Order_1.createNewOrder)({
             directory,
-            connection: this.acmeService,
-            identity: this.identity,
+            connection: acmeService,
+            identity,
             nonce: newAccountNonce,
         });
         // Step 4: Get authorization challenges
-        const authData = await (0, Authorization_1.getAuthorization)({
-            connection: this.acmeService,
-            identity: this.identity,
-            authzUrl: orderData.authzUrl,
+        const authChallenges = await (0, Authorization_1.getAuthorizationChallenges)({
+            connection: acmeService,
+            identity: identity,
+            authzUrl: orderData.authzUrls[0],
             nonce: orderData.nonce,
         });
         // 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.authData(authChallenges);
         E2EIStorage_1.E2EIStorage.store.orderData({ orderUrl: orderData.orderUrl });
-        return { authData };
+        return authChallenges;
     }
     /**
      * Continuation of the ACME enrollment flow
@@ -207,14 +168,10 @@ class E2EIServiceInternal {
      * @param oAuthIdToken
      * @returns RotateBundle
      */
-    async getRotateBundleAndStoreCertificateData(oAuthIdToken) {
+    async getRotateBundleAndStoreCertificateData(oAuthIdToken, authData) {
         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)({
             coreCryptoClient: this.coreCryptoClient,
@@ -266,13 +223,7 @@ class E2EIServiceInternal {
             throw new Error('Error while trying to continue OAuth flow. No certificate received');
         }
         // Step 10: Initialize MLS with the certificate
-        try {
-            return await this.coreCryptoClient.e2eiRotateAll(this.identity, certificate, this.keyPackagesAmount);
-        }
-        catch (error) {
-            this.logger.error('Error while e2eiRotateAll', error);
-            throw error;
-        }
+        return this.coreCryptoClient.e2eiRotateAll(this.identity, certificate, this.keyPackagesAmount);
     }
     /**
      *  This function starts a new ACME enrollment flow for either a new client
@@ -280,23 +231,21 @@ class E2EIServiceInternal {
      */
     async startNewOAuthFlow() {
         if (this.e2eServiceExternal.isEnrollmentInProgress()) {
-            return this.exitWithError('Error while trying to start OAuth flow. There is already a flow in progress');
+            throw new Error('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');
+            throw new Error('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, keyauth }, } = authData;
-        if (wireOidcChallenge && keyauth) {
-            // stash the identity for later use
-            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);
-            // we need to pass back the aquired wireOidcChallenge to the UI
-            return { challenge: wireOidcChallenge, keyAuth: keyauth };
+        const { authorization: { wireOidcChallenge, keyauth }, } = await this.getEnrollmentChallenges();
+        if (!wireOidcChallenge || !keyauth) {
+            throw new Error('missing wireOidcChallenge or keyauth');
         }
-        return undefined;
+        // stash the identity for later use
+        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);
+        // we need to pass back the aquired wireOidcChallenge to the UI
+        return { challenge: wireOidcChallenge, keyAuth: keyauth };
     }
     /**
      * This function continues an ACME flow for either a new client
@@ -307,19 +256,14 @@ class E2EIServiceInternal {
      */
     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 {
-            if (!this.acmeService) {
-                return this.exitWithError('Error while trying to continue OAuth flow. AcmeService is not initialized');
-            }
-            const handle = E2EIStorage_1.E2EIStorage.get.handle();
-            this.identity = await this.coreCryptoClient.e2eiEnrollmentStashPop(bazinga64_1.Decoder.fromBase64(handle).asBytes);
-            this.logger.log('retrieved identity from stash');
-            return await this.getRotateBundleAndStoreCertificateData(oAuthIdToken);
-        }
-        catch (error) {
-            this.logger.error('Error while trying to continue OAuth flow', error);
-            throw error;
+        if (!this.acmeService) {
+            throw new Error('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();
+        this.identity = await this.coreCryptoClient.e2eiEnrollmentStashPop(bazinga64_1.Decoder.fromBase64(handle).asBytes);
+        this.logger.log('retrieved identity from stash');
+        return this.getRotateBundleAndStoreCertificateData(oAuthIdToken, authData);
     }
     /**
      * This function starts a ACME refresh flow for an existing client with a valid refresh token
@@ -329,19 +273,13 @@ class E2EIServiceInternal {
      */
     async startRefreshCertficateFlow(oAuthIdToken, hasActiveCertificate) {
         // 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(hasActiveCertificate);
-            await this.getAndStoreInitialEnrollmentData();
-            return await this.getRotateBundleAndStoreCertificateData(oAuthIdToken);
-        }
-        catch (error) {
-            this.logger.error('Error while trying do the certificate refresh flow', error);
-            throw error;
+        if (!this.acmeService) {
+            throw new Error('Error while trying to continue OAuth flow. AcmeService is not initialized');
         }
+        // We need to initialize the identity
+        await this.initIdentity(hasActiveCertificate);
+        const authData = await this.getEnrollmentChallenges();
+        return this.getRotateBundleAndStoreCertificateData(oAuthIdToken, authData);
     }
 }
 exports.E2EIServiceInternal = E2EIServiceInternal;

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/Authorization.d.ts

@@ -6,10 +6,10 @@ interface GetAuthorizationParams {
     identity: E2eiEnrollment;
     connection: AcmeService;
 }
-export type GetAuthorizationReturnValue = {
+export type AuthorizationChallenge = {
     authorization: NewAcmeAuthz;
     nonce: Nonce;
 };
-export declare const getAuthorization: ({ authzUrl, nonce, identity, connection, }: GetAuthorizationParams) => Promise<GetAuthorizationReturnValue>;
+export declare const getAuthorizationChallenges: ({ authzUrl, nonce, identity, connection, }: GetAuthorizationParams) => Promise<AuthorizationChallenge>;
 export {};
 //# sourceMappingURL=Authorization.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/Authorization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Authorization.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/Authorization.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAE,YAAY,EAAE,KAAK,EAAC,MAAM,sBAAsB,CAAC;AAGzE,UAAU,sBAAsB;IAC9B,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;CACzB;AACD,MAAM,MAAM,2BAA2B,GAAG;IAAC,aAAa,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAC,CAAC;AAEtF,eAAO,MAAM,gBAAgB,+CAK1B,sBAAsB,KAAG,QAAQ,2BAA2B,CA4B9D,CAAC"}
+{"version":3,"file":"Authorization.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/Authorization.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAE,YAAY,EAAE,KAAK,EAAC,MAAM,sBAAsB,CAAC;AAGzE,UAAU,sBAAsB;IAC9B,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;CACzB;AACD,MAAM,MAAM,sBAAsB,GAAG;IAAC,aAAa,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAC,CAAC;AAEjF,eAAO,MAAM,0BAA0B,+CAKpC,sBAAsB,KAAG,QAAQ,sBAAsB,CA4BzD,CAAC"}

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/Authorization.js

@@ -18,9 +18,9 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAuthorization = void 0;
+exports.getAuthorizationChallenges = void 0;
 const Helper_1 = require("../Helper");
-const getAuthorization = async ({ authzUrl, nonce, identity, connection, }) => {
+const getAuthorizationChallenges = async ({ authzUrl, nonce, identity, connection, }) => {
     const reqBody = await identity.newAuthzRequest(authzUrl, nonce);
     const response = await connection.getAuthorization(authzUrl, reqBody);
     if ((response === null || response === void 0 ? void 0 : response.data) && !!response.data.status.length && !!response.nonce.length) {
@@ -47,4 +47,4 @@ const getAuthorization = async ({ authzUrl, nonce, identity, connection, }) => {
     }
     throw new Error('No authorization-data received');
 };
-exports.getAuthorization = getAuthorization;
+exports.getAuthorizationChallenges = getAuthorizationChallenges;

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/DpopChallenge/DpopChallenge.d.ts

@@ -1,12 +1,8 @@
 import { DoWireDpopChallengeParams } from './DpopChallenge.types';
-export declare const doWireDpopChallenge: ({ apiClient, clientId, authData, identity, nonce, connection, expirySecs, userDomain, }: DoWireDpopChallengeParams) => Promise<{
-    data: {
-        type: string;
-        url: string;
-        status: string;
-        token: string;
-    };
-    nonce: string;
-    location?: string | undefined;
-}>;
+export declare const doWireDpopChallenge: ({ apiClient, clientId, authData, identity, nonce, connection, expirySecs, userDomain, }: DoWireDpopChallengeParams) => Promise<import("../../Connection/AcmeServer/AcmeService.types").PostJoseRequestReturnValue<{
+    type: string;
+    url: string;
+    status: string;
+    token: string;
+}>>;
 //# sourceMappingURL=DpopChallenge.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/DpopChallenge/DpopChallenge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DpopChallenge.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/DpopChallenge/DpopChallenge.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,yBAAyB,EAAmD,MAAM,uBAAuB,CAAC;AA6BlH,eAAO,MAAM,mBAAmB,4FAS7B,yBAAyB;;;;;;;;;EA+B3B,CAAC"}
+{"version":3,"file":"DpopChallenge.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/DpopChallenge/DpopChallenge.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,yBAAyB,EAAmD,MAAM,uBAAuB,CAAC;AA6BlH,eAAO,MAAM,mBAAmB,4FAS7B,yBAAyB;;;;;GA+B3B,CAAC"}

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/DpopChallenge/DpopChallenge.types.d.ts

@@ -2,12 +2,12 @@ import { APIClient } from '@wireapp/api-client';
 import { ClientId } from '../../../types';
 import { AcmeService } from '../../Connection/AcmeServer';
 import { E2eiEnrollment, Nonce, User } from '../../E2EIService.types';
-import { GetAuthorizationReturnValue } from '../Authorization';
+import { AuthorizationChallenge } from '../Authorization';
 export interface DoWireDpopChallengeParams {
     apiClient: APIClient;
     clientId: ClientId;
     userDomain: User['domain'];
-    authData: GetAuthorizationReturnValue;
+    authData: AuthorizationChallenge;
     identity: E2eiEnrollment;
     connection: AcmeService;
     nonce: Nonce;

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/DpopChallenge/DpopChallenge.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DpopChallenge.types.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/DpopChallenge/DpopChallenge.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAC,cAAc,EAAE,KAAK,EAAE,IAAI,EAAC,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAC,2BAA2B,EAAC,MAAM,kBAAkB,CAAC;AAE7D,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3B,QAAQ,EAAE,2BAA2B,CAAC;IACtC,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,yBAAyB,EAAE,UAAU,GAAG,WAAW,CAAC,CAAC;AAE7F,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAC3C,yBAAyB,EACzB,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,YAAY,GAAG,YAAY,CACpE,GAAG;IACF,WAAW,EAAE,KAAK,CAAC;CACpB,CAAC"}
+{"version":3,"file":"DpopChallenge.types.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/DpopChallenge/DpopChallenge.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAC,cAAc,EAAE,KAAK,EAAE,IAAI,EAAC,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAC,sBAAsB,EAAC,MAAM,kBAAkB,CAAC;AAExD,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3B,QAAQ,EAAE,sBAAsB,CAAC;IACjC,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,yBAAyB,EAAE,UAAU,GAAG,WAAW,CAAC,CAAC;AAE7F,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAC3C,yBAAyB,EACzB,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,YAAY,GAAG,YAAY,CACpE,GAAG;IACF,WAAW,EAAE,KAAK,CAAC;CACpB,CAAC"}

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/OidcChallenge.d.ts

@@ -1,29 +1,25 @@
-import { GetAuthorizationReturnValue } from './Authorization';
+import { AuthorizationChallenge } from './Authorization';
 import { AcmeService } from '../Connection/AcmeServer';
 import { CoreCrypto, E2eiEnrollment, Nonce } from '../E2EIService.types';
 interface DoWireOidcChallengeParams {
     coreCryptoClient: CoreCrypto;
-    authData: GetAuthorizationReturnValue;
+    authData: AuthorizationChallenge;
     identity: E2eiEnrollment;
     connection: AcmeService;
     nonce: Nonce;
     oAuthIdToken: string;
 }
-export declare const doWireOidcChallenge: ({ coreCryptoClient, connection, authData, identity, nonce, oAuthIdToken, }: DoWireOidcChallengeParams) => Promise<{
-    data: {
+export declare const doWireOidcChallenge: ({ coreCryptoClient, connection, authData, identity, nonce, oAuthIdToken, }: DoWireOidcChallengeParams) => Promise<import("../Connection/AcmeServer/AcmeService.types").PostJoseRequestReturnValue<{
+    type: string;
+    url: string;
+    target: string;
+    status: string;
+    token: string;
+    validated?: string | undefined;
+    error?: {
         type: string;
-        url: string;
-        target: string;
-        status: string;
-        token: string;
-        validated?: string | undefined;
-        error?: {
-            type: string;
-            detail: string;
-        } | undefined;
-    };
-    nonce: string;
-    location?: string | undefined;
-}>;
+        detail: string;
+    } | undefined;
+}>>;
 export {};
 //# sourceMappingURL=OidcChallenge.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/OidcChallenge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OidcChallenge.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/OidcChallenge.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,2BAA2B,EAAC,MAAM,iBAAiB,CAAC;AAE5D,OAAO,EAAC,WAAW,EAAC,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAC,UAAU,EAAE,cAAc,EAAE,KAAK,EAAC,MAAM,sBAAsB,CAAC;AAEvE,UAAU,yBAAyB;IACjC,gBAAgB,EAAE,UAAU,CAAC;IAC7B,QAAQ,EAAE,2BAA2B,CAAC;IACtC,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,mBAAmB,+EAO7B,yBAAyB;;;;;;;;;;;;;;;EAmB3B,CAAC"}
+{"version":3,"file":"OidcChallenge.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/OidcChallenge.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,sBAAsB,EAAC,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAC,WAAW,EAAC,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAC,UAAU,EAAE,cAAc,EAAE,KAAK,EAAC,MAAM,sBAAsB,CAAC;AAEvE,UAAU,yBAAyB;IACjC,gBAAgB,EAAE,UAAU,CAAC;IAC7B,QAAQ,EAAE,sBAAsB,CAAC;IACjC,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,mBAAmB,+EAO7B,yBAAyB;;;;;;;;;;;GAmB3B,CAAC"}

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/Order.d.ts

@@ -7,13 +7,13 @@ export interface CreateNewOrderParams {
     directory: AcmeDirectory;
     connection: AcmeService;
 }
-export type CreateNewOrderReturnValue = Promise<{
+export type CreateNewOrderReturnValue = {
     order: NewAcmeOrder;
     nonce: string;
-    authzUrl: string;
+    authzUrls: string[];
     orderUrl: OrderUrl;
-}>;
-export declare const createNewOrder: ({ identity, nonce, directory, connection, }: CreateNewOrderParams) => CreateNewOrderReturnValue;
+};
+export declare const createNewOrder: ({ identity, nonce, directory, connection, }: CreateNewOrderParams) => Promise<CreateNewOrderReturnValue>;
 export interface FinalizeOrderParams {
     connection: AcmeService;
     identity: E2eiEnrollment;

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/Order.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Order.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/Order.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,KAAK,EAAC,MAAM,sBAAsB,CAAC;AAGxF,KAAK,QAAQ,GAAG,MAAM,CAAC;AAEvB,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;CACzB;AACD,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAAC;IAC9C,KAAK,EAAE,YAAY,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC,CAAC;AAEH,eAAO,MAAM,cAAc,gDAKxB,oBAAoB,8BAatB,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,WAAW,CAAC;IACxB,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;CACpB;AACD,eAAO,MAAM,aAAa,8CAAmD,mBAAmB;;;EAqB/F,CAAC"}
+{"version":3,"file":"Order.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/Order.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,KAAK,EAAC,MAAM,sBAAsB,CAAC;AAGxF,KAAK,QAAQ,GAAG,MAAM,CAAC;AAEvB,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;CACzB;AACD,MAAM,MAAM,yBAAyB,GAAG;IACtC,KAAK,EAAE,YAAY,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,cAAc,gDAKxB,oBAAoB,KAAG,QAAQ,yBAAyB,CAY1D,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,WAAW,CAAC;IACxB,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;CACpB;AACD,eAAO,MAAM,aAAa,8CAAmD,mBAAmB;;;EAqB/F,CAAC"}

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/Order.js

@@ -21,18 +21,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.finalizeOrder = exports.createNewOrder = void 0;
 const Helper_1 = require("../Helper");
 const createNewOrder = async ({ identity, nonce, directory, connection, }) => {
-    var _a;
     const reqBody = await identity.newOrderRequest(nonce);
-    const response = await connection.createNewOrder(directory.newOrder, reqBody);
-    if ((response === null || response === void 0 ? void 0 : response.data) && !!response.data.status.length && !!response.nonce.length && !!((_a = response.location) === null || _a === void 0 ? void 0 : _a.length)) {
-        return {
-            order: await identity.newOrderResponse((0, Helper_1.jsonToByteArray)(response.data)),
-            authzUrl: response.data.authorizations[0],
-            nonce: response.nonce,
-            orderUrl: response.location,
-        };
+    const { data, nonce: responseNonce, location } = await connection.createNewOrder(directory.newOrder, reqBody);
+    if (!location) {
+        throw new Error('No location header from API received for order creation');
     }
-    throw new Error('No createNewOrder-data received');
+    return {
+        order: await identity.newOrderResponse((0, Helper_1.jsonToByteArray)(data)),
+        authzUrls: data.authorizations,
+        nonce: responseNonce,
+        orderUrl: location,
+    };
 };
 exports.createNewOrder = createNewOrder;
 const finalizeOrder = async ({ identity, nonce, orderUrl, connection }) => {

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

@@ -45,8 +45,8 @@ const getAndVerifyAuthData = () => {
     if (!data) {
         throw new Error('ACME: AuthData not found');
     }
-    const atob = window.atob(data);
-    return E2EIStorage_schema_1.AuthDataSchema.parse(JSON.parse(atob));
+    const decodedData = window.atob(data);
+    return E2EIStorage_schema_1.AuthDataSchema.parse(JSON.parse(decodedData));
 };
 const getInitialData = () => {
     const data = storage.get(InitialDataKey);

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

@@ -7,16 +7,19 @@ export declare const InitialDataSchema: z.ZodObject<{
         displayName: z.ZodString;
         handle: z.ZodString;
         domain: z.ZodString;
+        teamId: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         id: string;
         domain: string;
         handle: string;
         displayName: string;
+        teamId: string;
     }, {
         id: string;
         domain: string;
         handle: string;
         displayName: string;
+        teamId: string;
     }>;
 }, "strip", z.ZodTypeAny, {
     user: {
@@ -24,6 +27,7 @@ export declare const InitialDataSchema: z.ZodObject<{
         domain: string;
         handle: string;
         displayName: string;
+        teamId: string;
     };
     clientId: string;
     discoveryUrl: string;
@@ -33,6 +37,7 @@ export declare const InitialDataSchema: z.ZodObject<{
         domain: string;
         handle: string;
         displayName: string;
+        teamId: string;
     };
     clientId: string;
     discoveryUrl: string;

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

@@ -1 +1 @@
-{"version":3,"file":"E2EIStorage.schema.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.schema.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAS5B,CAAC;AACH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAU5D,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQzB,CAAC;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAEtD,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAC;AACH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC"}
+{"version":3,"file":"E2EIStorage.schema.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.schema.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAU5B,CAAC;AACH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAU5D,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQzB,CAAC;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAEtD,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAC;AACH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC"}

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

@@ -28,6 +28,7 @@ exports.InitialDataSchema = zod_1.z.object({
         displayName: zod_1.z.string(),
         handle: zod_1.z.string(),
         domain: zod_1.z.string(),
+        teamId: zod_1.z.string(),
     }),
 });
 const Uint8ArraySchema = zod_1.z.custom(value => value instanceof Uint8Array ? { success: true } : { success: false, message: 'Expected Uint8Array' });

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

@@ -10,9 +10,18 @@ import { MLSServiceConfig } from './MLSService.types';
 import { KeyPackageClaimUser } from '../../../conversation';
 import { CoreDatabase } from '../../../storage/CoreDB';
 import { RecurringTaskScheduler } from '../../../util/RecurringTaskScheduler';
-import { E2EIServiceExternal, StartNewOAuthFlowReturnValue, User } from '../E2EIdentityService';
+import { AcmeChallenge, E2EIServiceExternal, User } from '../E2EIdentityService';
 import { ClientId, CommitPendingProposalsParams, HandlePendingProposalsParams } from '../types';
 export declare const optionalToUint8Array: (array: Uint8Array | []) => Uint8Array;
+type EnrollmentProcessState = {
+    status: 'authentication';
+    authenticationChallenge: {
+        keyAuth: string;
+        challenge: AcmeChallenge;
+    };
+} | {
+    status: 'successful';
+};
 interface LocalMLSServiceConfig extends MLSServiceConfig {
     /**
      * minimum number of key packages client should have available (configured to half of nbKeyPackages)
@@ -208,7 +217,7 @@ export declare class MLSService extends TypedEventEmitter<Events> {
      * @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
      */
-    enrollE2EI(discoveryUrl: string, e2eiServiceExternal: E2EIServiceExternal, user: User, client: RegisteredClient, nbPrekeys: number, oAuthIdToken?: string): Promise<StartNewOAuthFlowReturnValue | boolean>;
+    enrollE2EI(discoveryUrl: string, e2eiServiceExternal: E2EIServiceExternal, user: User, client: RegisteredClient, nbPrekeys: number, oAuthIdToken?: string): Promise<EnrollmentProcessState>;
 }
 export {};
 //# sourceMappingURL=MLSService.d.ts.map

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":"AAmBA,OAAO,KAAK,EAAqB,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AACzF,OAAO,EAAC,sBAAsB,EAAE,kBAAkB,EAAC,MAAM,sCAAsC,CAAC;AAChG,OAAO,EAAC,8BAA8B,EAAE,2BAA2B,EAAC,MAAM,+BAA+B,CAAC;AAE1G,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAW,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACL,eAAe,EAIf,cAAc,EACd,UAAU,EAEV,gBAAgB,EAChB,YAAY,EACZ,YAAY,EACZ,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAC,gBAAgB,EAAsB,MAAM,oBAAoB,CAAC;AAEzE,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAGrD,OAAO,EAAC,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AAE5E,OAAO,EAAC,mBAAmB,EAAE,4BAA4B,EAAE,IAAI,EAAC,MAAM,uBAAuB,CAAC;AAQ9F,OAAO,EAAC,QAAQ,EAAE,4BAA4B,EAAE,4BAA4B,EAAC,MAAM,UAAU,CAAC;AAK9F,eAAO,MAAM,oBAAoB,UAAW,UAAU,GAAG,EAAE,KAAG,UAE7D,CAAC;AAEF,UAAU,qBAAsB,SAAQ,gBAAgB;IACtD;;OAEG;IACH,uCAAuC,EAAE,MAAM,CAAC;CACjD;AAQD,KAAK,MAAM,GAAG;IACZ,QAAQ,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAAC;CAC5C,CAAC;AACF,qBAAa,UAAW,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAOrD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IATzC,MAAM,iBAAuC;IAC7C,MAAM,EAAE,qBAAqB,CAAC;IAC9B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IACjD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;gBAG9B,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,UAAU,EAC5B,YAAY,EAAE,YAAY,EAC1B,sBAAsB,EAAE,sBAAsB,EAC/D,EACE,6BAA2E,EAC3E,aAA2C,EAC3C,WAAuC,GACxC,EAAE,OAAO,CAAC,gBAAgB,CAAC;IAWjB,UAAU,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,qBAAqB,UAAQ;YAyBtF,iBAAiB;IAM/B,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CA0CjC;IAEF;;;;;;OAMG;IACI,8BAA8B,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE;IAWnE,qBAAqB,CAAC,cAAc,EAAE,mBAAmB,EAAE;;;;IA2CjE,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU;IAK/B,WAAW,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,GAAG,eAAe,GAAG,kBAAkB;IAIjG,oBAAoB,CAAC,YAAY,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC;IAyB5D,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMpE,qBAAqB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC;IAI1E,cAAc,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAiB9F,cAAc,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAIrG;;;;;;;;;OASG;YACW,mBAAmB;IAQjC,OAAO,CAAC,oBAAoB;IAK5B;;;OAGG;IACU,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IActE;;;;;OAKG;IACU,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,WAAW,EAAE,EACpB,OAAO,CAAC,EAAE;QAAC,IAAI,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAC,GAC7C,OAAO,CAAC,sBAAsB,CAAC;IAiClC;;;;;OAKG;IACH,SAAgB,uBAAuB,YAAmB,MAAM,KAAG,QAAQ,OAAO,CAAC,CA2BjF;IAEF;;;;OAIG;IACI,6BAA6B,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE;YAW7D,eAAe;IAK7B;;;OAGG;IACU,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKlE;;;;OAIG;IACU,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK5D,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;IAK9C,iBAAiB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAK9E;;;;OAIG;IACU,gBAAgB,CAAC,OAAO,EAAE,MAAM;IAc7C,OAAO,CAAC,sCAAsC;IAI9C;;;OAGG;IACU,uBAAuB,CAAC,OAAO,EAAE,MAAM;IAKpD;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IAIhC;;;OAGG;IACI,0BAA0B,CAAC,OAAO,EAAE,MAAM;IAUjD;;;OAGG;IACI,mCAAmC,CAAC,QAAQ,EAAE,MAAM,EAAE;IAQ7D;;;;OAIG;IACI,sCAAsC,CAAC,QAAQ,EAAE,MAAM;IAQ9D;;;;OAIG;YACW,+BAA+B;YAQ/B,gCAAgC;YAYhC,2BAA2B;IAIzC;;;;;OAKG;YACW,mBAAmB;YAQnB,oBAAoB;IAOrB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAe7D;;;;;;;OAOG;IACU,sBAAsB,CAAC,EAAC,SAAS,EAAE,OAAO,EAAE,SAAS,EAAC,EAAE,4BAA4B;YAWnF,4BAA4B;YAU5B,0BAA0B;IAKxC,OAAO,CAAC,6BAA6B;IAIrC;;;;;OAKG;IACU,sBAAsB,CAAC,EAAC,OAAO,EAAE,UAAkB,EAAC,EAAE,4BAA4B;IAY/F;;;;OAIG;IACU,+BAA+B;IAiB5C;;;;OAIG;IACU,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;IAY9F,wBAAwB,CACnC,KAAK,EAAE,8BAA8B,EACrC,yBAAyB,EAAE,CACzB,cAAc,EAAE,WAAW,EAC3B,iBAAiB,CAAC,EAAE,kBAAkB,KACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAgBrB,4BAA4B,CAAC,KAAK,EAAE,2BAA2B,EAAE,QAAQ,EAAE,MAAM;IAcjF,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,UAAU,EAAE;IASjF;;;;;;;;OAQG;IACU,UAAU,CACrB,YAAY,EAAE,MAAM,EACpB,mBAAmB,EAAE,mBAAmB,EACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gBAAgB,EACxB,SAAS,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,4BAA4B,GAAG,OAAO,CAAC;CAiEnD"}
+{"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

@@ -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.1",
-  "gitHead": "71d7fbccc5d96be760960eae95ded8410ed5a936"
+  "version": "43.7.2",
+  "gitHead": "368d0946bb85bb8eff2c71d91b8c4b46c14aeb1d"
 }