@wireapp/core 36.2.0 → 36.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/lib/conversation/ConversationService/ConversationService.d.ts +5 -4
  2. package/lib/conversation/ConversationService/ConversationService.js +20 -17
  3. package/lib/conversation/ConversationService/ConversationService.js.map +1 -1
  4. package/lib/mls/MLSService/MLSService.d.ts +1 -0
  5. package/lib/mls/MLSService/MLSService.js +23 -1
  6. package/lib/mls/MLSService/MLSService.js.map +1 -1
  7. package/package.json +3 -3
package/lib/conversation/ConversationService/ConversationService.d.ts CHANGED
@@ -112,14 +112,15 @@ export declare class ConversationService {
112
112
  private sendMLSMessage;
113
113
  addUsersToMLSConversation({ qualifiedUserIds, groupId, conversationId, }: Required<AddUsersParams>): Promise<MLSReturnType>;
114
114
  removeUsersFromMLSConversation({ groupId, conversationId, qualifiedUserIds, }: RemoveUsersParams): Promise<MLSReturnType>;
115
+ joinByExternalCommit(conversationId: QualifiedId): Promise<import("@wireapp/api-client/lib/conversation").PostMlsMessageResponse | null>;
115
116
  /**
116
117
  * Will send an external proposal for the current device to join a specific conversation.
117
118
  * In order for the external proposal to be sent correctly, the underlying mls conversation needs to be in a non-established state
118
- * @param conversationGroupId The conversation to join
119
+ * @param groupId The conversation to join
119
120
  * @param epoch The current epoch of the local conversation
120
121
  */
121
- sendExternalJoinProposal(conversationGroupId: string, epoch: number): Promise<void>;
122
- isMLSConversationEstablished(conversationGroupId: string): Promise<boolean>;
123
- wipeMLSConversation(conversationId: Uint8Array): Promise<void>;
122
+ sendExternalJoinProposal(groupId: string, epoch: number): Promise<void>;
123
+ isMLSConversationEstablished(groupId: string): Promise<boolean>;
124
+ wipeMLSConversation(groupId: Uint8Array): Promise<void>;
124
125
  }
125
126
  export {};
package/lib/conversation/ConversationService/ConversationService.js CHANGED
@@ -386,7 +386,7 @@ class ConversationService {
386
386
  if (!groupId) {
387
387
  throw new Error('No group_id found in response which is required for creating MLS conversations.');
388
388
  }
389
- const groupIdDecodedFromBase64 = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
389
+ const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
390
390
  const { qualified_users: qualifiedUsers = [], selfUserId } = conversationData;
391
391
  if (!selfUserId) {
392
392
  throw new Error('You need to pass self user qualified id in order to create an MLS conversation');
@@ -397,7 +397,7 @@ class ConversationService {
397
397
  externalSenders: mlsKeyBytes,
398
398
  ciphersuite: 1, // TODO: Use the correct ciphersuite enum.
399
399
  };
400
- await this.mlsService.createConversation(groupIdDecodedFromBase64, config);
400
+ await this.mlsService.createConversation(groupIdBytes, config);
401
401
  const coreCryptoKeyPackagesPayload = await this.mlsService.getKeyPackagesPayload([
402
402
  {
403
403
  id: selfUserId.id,
@@ -412,7 +412,7 @@ class ConversationService {
412
412
  ]);
413
413
  let response;
414
414
  if (coreCryptoKeyPackagesPayload.length !== 0) {
415
- response = await this.mlsService.addUsersToExistingConversation(groupIdDecodedFromBase64, coreCryptoKeyPackagesPayload);
415
+ response = await this.mlsService.addUsersToExistingConversation(groupIdBytes, coreCryptoKeyPackagesPayload);
416
416
  }
417
417
  // We schedule a key material renewal
418
418
  this.mlsService.scheduleKeyMaterialRenewal(groupId);
@@ -441,9 +441,9 @@ class ConversationService {
441
441
  };
442
442
  }
443
443
  async addUsersToMLSConversation({ qualifiedUserIds, groupId, conversationId, }) {
444
- const groupIdDecodedFromBase64 = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
444
+ const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
445
445
  const coreCryptoKeyPackagesPayload = await this.mlsService.getKeyPackagesPayload([...qualifiedUserIds]);
446
- const response = await this.mlsService.addUsersToExistingConversation(groupIdDecodedFromBase64, coreCryptoKeyPackagesPayload);
446
+ const response = await this.mlsService.addUsersToExistingConversation(groupIdBytes, coreCryptoKeyPackagesPayload);
447
447
  const conversation = await this.getConversations(conversationId.id);
448
448
  //We store the info when user was added (and key material was created), so we will know when to renew it
449
449
  this.mlsService.resetKeyMaterialRenewal(groupId);
@@ -453,10 +453,10 @@ class ConversationService {
453
453
  };
454
454
  }
455
455
  async removeUsersFromMLSConversation({ groupId, conversationId, qualifiedUserIds, }) {
456
- const groupIdDecodedFromBase64 = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
456
+ const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
457
457
  const clientsToRemove = await this.apiClient.api.user.postListClients({ qualified_users: qualifiedUserIds });
458
458
  const fullyQualifiedClientIds = (0, fullyQualifiedClientIdUtils_1.mapQualifiedUserClientIdsToFullyQualifiedClientIds)(clientsToRemove.qualified_user_map);
459
- const messageResponse = await this.mlsService.removeClientsFromConversation(groupIdDecodedFromBase64, fullyQualifiedClientIds);
459
+ const messageResponse = await this.mlsService.removeClientsFromConversation(groupIdBytes, fullyQualifiedClientIds);
460
460
  //key material gets updated after removing a user from the group, so we can reset last key update time value in the store
461
461
  this.mlsService.resetKeyMaterialRenewal(groupId);
462
462
  const conversation = await this.getConversations(conversationId.id);
@@ -465,32 +465,35 @@ class ConversationService {
465
465
  conversation,
466
466
  };
467
467
  }
468
+ async joinByExternalCommit(conversationId) {
469
+ return this.mlsService.joinByExternalCommit(() => this.apiClient.api.conversation.getGroupInfo(conversationId));
470
+ }
468
471
  /**
469
472
  * Will send an external proposal for the current device to join a specific conversation.
470
473
  * In order for the external proposal to be sent correctly, the underlying mls conversation needs to be in a non-established state
471
- * @param conversationGroupId The conversation to join
474
+ * @param groupId The conversation to join
472
475
  * @param epoch The current epoch of the local conversation
473
476
  */
474
- async sendExternalJoinProposal(conversationGroupId, epoch) {
477
+ async sendExternalJoinProposal(groupId, epoch) {
475
478
  return (0, messageSender_1.sendMessage)(async () => {
476
- const groupIdDecodedFromBase64 = bazinga64_1.Decoder.fromBase64(conversationGroupId).asBytes;
479
+ const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
477
480
  const externalProposal = await this.mlsService.newExternalProposal(core_crypto_1.ExternalProposalType.Add, {
478
481
  epoch,
479
- conversationId: groupIdDecodedFromBase64,
482
+ conversationId: groupIdBytes,
480
483
  });
481
484
  await this.apiClient.api.conversation.postMlsMessage(
482
485
  //@todo: it's temporary - we wait for core-crypto fix to return the actual Uint8Array instead of regular array
483
486
  (0, mls_1.optionalToUint8Array)(externalProposal));
484
487
  //We store the info when user was added (and key material was created), so we will know when to renew it
485
- this.mlsService.resetKeyMaterialRenewal(conversationGroupId);
488
+ this.mlsService.resetKeyMaterialRenewal(groupId);
486
489
  });
487
490
  }
488
- async isMLSConversationEstablished(conversationGroupId) {
489
- const groupIdDecodedFromBase64 = bazinga64_1.Decoder.fromBase64(conversationGroupId).asBytes;
490
- return this.mlsService.conversationExists(groupIdDecodedFromBase64);
491
+ async isMLSConversationEstablished(groupId) {
492
+ const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
493
+ return this.mlsService.conversationExists(groupIdBytes);
491
494
  }
492
- async wipeMLSConversation(conversationId) {
493
- return this.mlsService.wipeConversation(conversationId);
495
+ async wipeMLSConversation(groupId) {
496
+ return this.mlsService.wipeConversation(groupId);
494
497
  }
495
498
  }
496
499
  exports.ConversationService = ConversationService;
package/lib/conversation/ConversationService/ConversationService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ConversationService.js","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AAEH,sDAAqF;AAErF,uEAU8C;AAC9C,oEAA4G;AAG5G,oEAA2D;AAE3D,sDAAwF;AAIxF,4EAAkE;AAClE,oEAAsH;AACtH,8DAAyD;AAEzD,2EAOqC;AACrC,yCAAkC;AAClC,wFAA0G;AAC1G,mCAA+C;AAC/C,4DAAqD;AAUrD,MAAa,mBAAmB;IAI9B,YACmB,SAAoB,EACrC,mBAAwC,EACvB,MAAmC,EACnC,UAAsB;QAHtB,cAAS,GAAT,SAAS,CAAW;QAEpB,WAAM,GAAN,MAAM,CAA6B;QACnC,eAAU,GAAV,UAAU,CAAY;QAEvC,IAAI,CAAC,YAAY,GAAG,IAAI,2BAAY,EAAE,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;IAChF,CAAC;IAEO,KAAK,CAAC,+BAA+B,CAAC,cAAoC;QAChF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QAC3F;;;;WAIG;QACH,OAAO,YAAY,CAAC,OAAO,CAAC,MAAM;aAC/B,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;aACvC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,YAAa,CAAC;aACnC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,YAAa,CAAC,CAAC;IACrD,CAAC;IAED;;;;;;;OAOG;IACK,KAAK,CAAC,wBAAwB,CACpC,OAA6C;QAG7C,IAAI,OAAO,GAAa,EAAE,CAAC;QAE3B,IAAI,OAAO,EAAE;YACX,IAAI,IAAA,sCAAkB,EAAC,OAAO,CAAC,EAAE;gBAC/B,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAC,EAAE,EAAC,CAAC,CAAC,CAAC;aACrC;iBAAM;gBACL,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAW,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,EAAE;oBACxF,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE;wBAChC,WAAW,CAAC,IAAI,CAAC,EAAC,EAAE,EAAE,EAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAC,EAAE,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC;qBAC5E;oBACD,OAAO,WAAW,CAAC;gBACrB,CAAC,EAAE,EAAE,CAAC,CAAC;aACR;SACF;QAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAC,EAAE,EAAE;YAC1C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC1E,+GAA+G;YAC/G,MAAM,WAAW,GAAG,OAAO;gBACzB,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACxE,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC;YACzB,OAAO,EAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAC,CAAC;QAC9C,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,OAAO,CAAC,MAAM,CAA+B,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE;;YACjF,SAAS,MAAC,eAAe,CAAC,IAAI,CAAC,MAAM,MAArC,SAAS,OAAkC,EAAE,EAAC;YAC9C,KAAK,MAAM,MAAM,IAAI,eAAe,CAAC,OAAO,EAAE;gBAC5C,MAAA,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,OAAC,eAAe,CAAC,IAAI,CAAC,EAAE,eAAM,EAAE,EAAC;gBACvE,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;aAChG;YACD,OAAO,SAAS,CAAC;QACnB,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,cAA2B,EAC3B,OAAgC;QAEhC,IAAI,OAAO,GAAa,EAAE,CAAC;QAE3B,IAAI,OAAO,EAAE;YACX,IAAI,IAAA,iCAAa,EAAC,OAAO,CAAC,EAAE;gBAC1B,OAAO,GAAG,OAAO,CAAC;aACnB;iBAAM,IAAI,IAAA,iCAAa,EAAC,OAAO,CAAC,EAAE;gBACjC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAChC;SACF;QAED,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACnB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;YAC3F;;;;eAIG;YACH,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACrG;QAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAEzG,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,SAA8B,EAAE,MAAM,EAAE,EAAE;YAC/D,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;YAC3B,SAAS,CAAC,MAAM,MAAhB,SAAS,CAAC,MAAM,IAAM,EAAE,EAAC;YACzB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;gBACnC,SAAS,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;aAClD;YACD,OAAO,SAAS,CAAC;QACnB,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAEO,KAAK,CAAC,qCAAqC,CACjD,cAA2B,EAC3B,OAA8C;QAE9C,IAAI,IAAA,0CAAsB,EAAC,OAAO,CAAC,EAAE;YACnC,OAAO,OAAO,CAAC;SAChB;QACD,MAAM,YAAY,GAAG,OAAO,IAAI,CAAC,MAAM,IAAI,CAAC,+BAA+B,CAAC,cAAc,CAAC,CAAC,CAAC;QAC7F,OAAO,IAAI,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC;IACrD,CAAC;IAEO,KAAK,CAAC,4BAA4B,CACxC,cAA2B,EAC3B,OAAgC;QAEhC,IAAI,IAAA,iCAAa,EAAC,OAAO,CAAC,EAAE;YAC1B,OAAO,OAAO,CAAC;SAChB;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED;;;;;;;OAOG;IACK,KAAK,CAAC,kBAAkB,CAC9B,cAA2B,EAC3B,eAAuB,EACvB,cAA8B,EAC9B,EACE,OAAO,EACP,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,UAAU,GAAG,6CAAiB,CAAC,IAAI,MACV,EAAE;QAE7B,MAAM,SAAS,GAAG,mCAAc,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,EAAE,CAAC;QACjE,IAAI,UAAU,KAAK,6CAAiB,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;YACrD,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;SAC5E;QAED,IAAI,cAAc,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YACxD,IAAI,IAAA,iCAAa,EAAC,OAAO,CAAC,IAAI,IAAA,iCAAa,EAAC,OAAO,CAAC,EAAE;gBACpD,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;aAC5E;YACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,qCAAqC,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAC7F,IAAI,aAAa,CAAC;YAClB,IAAI,UAAU,KAAK,6CAAiB,CAAC,IAAI,EAAE;gBACzC,aAAa,GAAG,IAAA,0CAAsB,EAAC,OAAO,CAAC,CAAC,CAAC,qFAAqF;aACvI;iBAAM,IAAI,UAAU,KAAK,6CAAiB,CAAC,KAAK,EAAE;gBACjD,aAAa,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;aACvD;iBAAM;gBACL,4HAA4H;gBAC5H,aAAa,GAAG,KAAK,CAAC;aACvB;YACD,OAAO,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,eAAe,EAAE,UAAU,EAAE,SAAS,EAAE;gBACtF,cAAc;gBACd,UAAU;gBACV,aAAa;gBACb,gBAAgB,EAAE,QAAQ,CAAC,EAAE,CAAC,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,QAAQ,EAAE,KAAK,CAAC;aAClE,CAAC,CAAC;SACJ;QAED,IAAI,IAAA,sCAAkB,EAAC,OAAO,CAAC,IAAI,IAAA,0CAAsB,EAAC,OAAO,CAAC,EAAE;YAClE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QACpF,IAAI,aAAa,CAAC;QAClB,IAAI,UAAU,KAAK,6CAAiB,CAAC,IAAI,EAAE;YACzC,aAAa,GAAG,IAAA,iCAAa,EAAC,OAAO,CAAC,CAAC,CAAC,qFAAqF;SAC9H;aAAM,IAAI,UAAU,KAAK,6CAAiB,CAAC,KAAK,EAAE;YACjD,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SAC9C;aAAM;YACL,4HAA4H;YAC5H,aAAa,GAAG,KAAK,CAAC;SACvB;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,eAAe,EAAE,UAAU,EAAE,SAAS,EAAE;YAC7E,cAAc;YACd,cAAc;YACd,UAAU;YACV,aAAa;YACb,gBAAgB,EAAE,SAAS,CAAC,EAAE,CAAC,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,SAAS,EAAE,KAAK,CAAC;SACpE,CAAC,CAAC;IACL,CAAC;IAEO,cAAc,CAAC,OAAgC;QACrD,IAAI,IAAA,iCAAa,EAAC,OAAO,CAAC,EAAE;YAC1B,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC7B;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,uBAAuB,CAAC,OAA8C;QAC5E,IAAI,IAAA,0CAAsB,EAAC,OAAO,CAAC,EAAE;YACnC,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAgB,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,EAAE;gBAClF,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAC,MAAM,EAAE,EAAE,EAAE,MAAM,EAAC,CAAC,CAAC,CAAC,CAAC;YACpF,CAAC,EAAE,EAAE,CAAC,CAAC;SACR;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;;;;;;OASG;IACI,yBAAyB,CAAC,cAA2B;QAC1D,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC;QACzD,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,MAAM,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;QAC9B,OAAO,IAAI,OAAO,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;YACjC,MAAM,gBAAgB,GAAG,CAAC,QAA+C,EAAE,EAAE;gBAC3E,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAC1B,6EAA6E;gBAC7E,OAAO,KAAK,CAAC;YACf,CAAC,CAAC;YAEF,IAAI,cAAc,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;gBACxD,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,eAAe,EAAE,UAAU,EAAE,IAAI,EAAE;oBAChF,cAAc;oBACd,gBAAgB;oBAChB,aAAa,EAAE,IAAI;iBACpB,CAAC,CAAC;aACJ;iBAAM;gBACL,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,eAAe,EAAE,UAAU,EAAE,IAAI,EAAE;oBACvE,cAAc;oBACd,gBAAgB;iBACjB,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,2BAA2B,CACtC,cAAsB,EACtB,kBAA2B;QAE3B,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,+BAA+B,CACjE,kBAAkB,CAAC,CAAC,CAAC,EAAC,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,kBAAkB,EAAC,CAAC,CAAC,CAAC,cAAc,CACvF,CAAC;QACF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,EAAC,eAAe,EAAE,gBAAgB,EAAC,CAAC,CAAC;QACtG,MAAM,oBAAoB,GAAyB,EAAE,CAAC;QAEtD,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,EAAE,CAC5E,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE;YAC5D,oBAAoB,CAAC,MAAM,MAA3B,oBAAoB,CAAC,MAAM,IAAM,EAAE,EAAC;YACpC,oBAAoB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1E,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAoBM,yBAAyB,CAC9B,gBAA0C,EAC1C,YAAgC;QAEhC,IAAI,OAAwB,CAAC;QAC7B,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;YACxC,MAAM,GAAG,GAAG,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;YAE7E,OAAO,GAAG;gBACR,IAAI,EAAE,gBAAgB;gBACtB,YAAY,EAAE,IAAI;gBAClB,KAAK,EAAE,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,EAAE;aACjB,CAAC;SACH;aAAM;YACL,OAAO,GAAG,gBAAgB,CAAC;SAC5B;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACnE,CAAC;IAIM,KAAK,CAAC,gBAAgB,CAAC,eAAmC;QAC/D,IAAI,CAAC,eAAe,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE;YAC/C,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;SAC9D;QACD,IAAI,OAAO,eAAe,KAAK,QAAQ,EAAE;YACvC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;SACzE;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;IAChF,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,EAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAa;QACrE,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACzE,MAAM,eAAe,GAAG,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;QAExD,OAAO,IAAA,gCAAY,EAAC;YAClB,UAAU,EAAE,IAAI,UAAU,CAAC,eAAe,CAAC;YAC3C,QAAQ,EAAE,MAAM;YAChB,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,OAAe,EAAE,UAAmB;QACnE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC/E,OAAO,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,6BAA6B,CAAC,EAAC,cAAc,EAAE,gBAAgB,EAAkC;QAC5G,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;IACvF,CAAC;IAEM,KAAK,CAAC,0BAA0B,CACrC,cAA2B,EAC3B,MAAmB;QAEnB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IAC9E,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,EAC/B,OAAO,EACP,cAAc,EACd,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,gBAAgB,GACS;QACzB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,OAAO,EAAE;YACxG,OAAO;YACP,cAAc;YACd,UAAU;YACV,UAAU;YACV,gBAAgB;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;YACrB,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,EAAE;gBACvC,qFAAqF;gBACrF,MAAM,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,QAAQ,EAAE,IAAI,CAAC,CAAA,CAAC;aAC1C;SACF;QAED,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,SAAS;YACrB,MAAM,EAAE,QAAQ,CAAC,IAAI;YACrB,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,iCAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,iCAAkB,CAAC,aAAa;SAC1F,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,IAAI,CAAC,MAA2D;QAC3E,SAAS,KAAK,CAAC,MAAuD;YACpE,OAAO,MAAM,CAAC,QAAQ,KAAK,mCAAoB,CAAC,GAAG,CAAC;QACtD,CAAC;QACD,OAAO,IAAA,2BAAW,EAAC,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC5G,CAAC;IAEM,eAAe,CAAC,cAAsB;QAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,cAAc,EAAE,EAAC,MAAM,EAAE,0BAAmB,CAAC,OAAO,EAAC,CAAC,CAAC;IAC3G,CAAC;IAEM,cAAc,CAAC,cAAsB;QAC1C,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,cAAc,EAAE,EAAC,MAAM,EAAE,0BAAmB,CAAC,OAAO,EAAC,CAAC,CAAC;IAC3G,CAAC;IAEM,0BAA0B,CAC/B,cAAsB,EACtB,MAAmB,EACnB,aAA4B;QAE5B,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;YACrC,aAAa,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC;SACzC;QAED,MAAM,OAAO,GAAiC;YAC5C,aAAa,EAAE,aAAa,CAAC,WAAW,EAAE;YAC1C,gBAAgB,EAAE,MAAM;SACzB,CAAC;QAEF,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,uBAAuB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC1F,CAAC;IAEM,yBAAyB,CAC9B,cAAsB,EACtB,QAAiB,EACjB,mBAAkC,IAAI,IAAI,EAAE;QAE5C,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;YACxC,gBAAgB,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAAC,CAAC;SAC/C;QAED,MAAM,OAAO,GAAiC;YAC5C,YAAY,EAAE,QAAQ;YACtB,gBAAgB,EAAE,gBAAgB,CAAC,WAAW,EAAE;SACjD,CAAC;QAEF,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,uBAAuB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC1F,CAAC;IAEM,yBAAyB,CAC9B,cAAsB,EACtB,MAAc,EACd,gBAAsD;QAEtD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE;YAC5E,iBAAiB,EAAE,gBAAgB;SACpC,CAAC,CAAC;IACL,CAAC;IAEO,mBAAmB,CAAC,QAA+C;QACzE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QACtE,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAE,QAAiC,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAClG,OAAO,CAAC,UAAU,IAAI,CAAC,UAAU,IAAI,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC;IACnE,CAAC;IAED;;;;OAIG;IAEI,KAAK,CAAC,qBAAqB,CAAC,gBAAiC;QAClE;;;;WAIG;QACH,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,gBAAgB,iCACzE,gBAAgB,KACnB,KAAK,EAAE,SAAS,EAChB,eAAe,EAAE,SAAS,IAC1B,CAAC;QACH,MAAM,EAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAC,GAAG,eAAe,CAAC;QACvE,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAC;SACpG;QAED,MAAM,wBAAwB,GAAG,mBAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;QACrE,MAAM,EAAC,eAAe,EAAE,cAAc,GAAG,EAAE,EAAE,UAAU,EAAC,GAAG,gBAAgB,CAAC;QAC5E,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAC;SACnG;QAED,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC;QAC1E,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,mBAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;QACjG,MAAM,MAAM,GAA8B;YACxC,eAAe,EAAE,WAAW;YAC5B,WAAW,EAAE,CAAC,EAAE,0CAA0C;SAC3D,CAAC;QAEF,MAAM,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;QAE3E,MAAM,4BAA4B,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC;YAC/E;gBACE,EAAE,EAAE,UAAU,CAAC,EAAE;gBACjB,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB;;;mBAGG;gBACH,OAAO,EAAE,gBAAgB,CAAC,cAAc;aACzC;YACD,GAAG,cAAc;SAClB,CAAC,CAAC;QAEH,IAAI,QAAQ,CAAC;QACb,IAAI,4BAA4B,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7C,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,8BAA8B,CAC7D,wBAAwB,EACxB,4BAA4B,CAC7B,CAAC;SACH;QAED,qCAAqC;QACrC,IAAI,CAAC,UAAU,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;QAEpD,+FAA+F;QAC/F,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAEjE,OAAO;YACL,MAAM,EAAE,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,KAAI,EAAE;YAC9B,YAAY;SACb,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,EAAC,OAAO,EAAE,OAAO,EAAuB;QACnE,MAAM,YAAY,GAAG,mBAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;QAEzD,iEAAiE;QACjE,MAAM,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAC,OAAO,EAAC,CAAC,CAAC;QAExD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,YAAY,EAAE,mCAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QAE9G,IAAI,MAAM,GAAW,EAAE,CAAC;QACxB,IAAI;YACF,MAAM,EAAC,IAAI,GAAG,EAAE,EAAC,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YACpF,MAAM,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,IAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;SAC7D;QAAC,WAAM,GAAE;QAEV,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,SAAS;YACrB,MAAM;YACN,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,iCAAkB,CAAC,aAAa,CAAC,CAAC,CAAC,iCAAkB,CAAC,SAAS;SAChF,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,EACrC,gBAAgB,EAChB,OAAO,EACP,cAAc,GACW;QACzB,MAAM,wBAAwB,GAAG,mBAAO,CAAC,UAAU,CAAC,OAAQ,CAAC,CAAC,OAAO,CAAC;QACtE,MAAM,4BAA4B,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC;QACxG,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,8BAA8B,CACnE,wBAAwB,EACxB,4BAA4B,CAC7B,CAAC;QACF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QAEpE,wGAAwG;QACxG,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACjD,OAAO;YACL,MAAM,EAAE,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,KAAI,EAAE;YAC9B,YAAY;SACb,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,8BAA8B,CAAC,EAC1C,OAAO,EACP,cAAc,EACd,gBAAgB,GACE;QAClB,MAAM,wBAAwB,GAAG,mBAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;QAErE,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,EAAC,eAAe,EAAE,gBAAgB,EAAC,CAAC,CAAC;QAE3G,MAAM,uBAAuB,GAAG,IAAA,gFAAkD,EAChF,eAAe,CAAC,kBAAkB,CACnC,CAAC;QAEF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,6BAA6B,CACzE,wBAAwB,EACxB,uBAAuB,CACxB,CAAC;QAEF,yHAAyH;QACzH,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;QAEjD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QAEpE,OAAO;YACL,MAAM,EAAE,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,KAAI,EAAE;YACrC,YAAY;SACb,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,wBAAwB,CAAC,mBAA2B,EAAE,KAAa;QAC9E,OAAO,IAAA,2BAAW,EAAC,KAAK,IAAI,EAAE;YAC5B,MAAM,wBAAwB,GAAG,mBAAO,CAAC,UAAU,CAAC,mBAAoB,CAAC,CAAC,OAAO,CAAC;YAClF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,kCAAoB,CAAC,GAAG,EAAE;gBAC3F,KAAK;gBACL,cAAc,EAAE,wBAAwB;aACzC,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc;YAClD,8GAA8G;YAC9G,IAAA,0BAAoB,EAAC,gBAAgB,CAAC,CACvC,CAAC;YAEF,wGAAwG;YACxG,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,4BAA4B,CAAC,mBAA2B;QACnE,MAAM,wBAAwB,GAAG,mBAAO,CAAC,UAAU,CAAC,mBAAoB,CAAC,CAAC,OAAO,CAAC;QAClF,OAAO,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,wBAAwB,CAAC,CAAC;IACtE,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,cAA0B;QACzD,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAC1D,CAAC;CACF;AAtnBD,kDAsnBC"}
1
+ {"version":3,"file":"ConversationService.js","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"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"}
package/lib/mls/MLSService/MLSService.d.ts CHANGED
@@ -25,6 +25,7 @@ export declare class MLSService {
25
25
  getKeyPackagesPayload(qualifiedUsers: QualifiedUsers[]): Promise<Invitee[]>;
26
26
  getEpoch(groupId: Uint8Array): Promise<number>;
27
27
  newProposal(proposalType: ProposalType, args: ProposalArgs | AddProposalArgs | RemoveProposalArgs): Promise<import("@wireapp/core-crypto").ProposalBundle>;
28
+ joinByExternalCommit(getGroupInfo: () => Promise<Uint8Array>): Promise<PostMlsMessageResponse | null>;
28
29
  newExternalProposal(externalProposalType: ExternalProposalType, args: ExternalProposalArgs | ExternalRemoveProposalArgs): Promise<Uint8Array>;
29
30
  processWelcomeMessage(welcomeMessage: Uint8Array): Promise<ConversationId>;
30
31
  decryptMessage(conversationId: ConversationId, payload: Uint8Array): Promise<DecryptedMessage>;
package/lib/mls/MLSService/MLSService.js CHANGED
@@ -44,6 +44,7 @@ const TaskScheduler_1 = require("../../util/TaskScheduler");
44
44
  const EventHandler_1 = require("../EventHandler");
45
45
  const keyMaterialUpdatesStore_1 = require("./stores/keyMaterialUpdatesStore");
46
46
  const pendingProposalsStore_1 = require("./stores/pendingProposalsStore");
47
+ const axios_1 = __importDefault(require("axios"));
47
48
  //@todo: this function is temporary, we wait for the update from core-crypto side
48
49
  //they are returning regular array instead of Uint8Array for commit and welcome messages
49
50
  const optionalToUint8Array = (array) => {
@@ -71,7 +72,7 @@ class MLSService {
71
72
  }
72
73
  return client;
73
74
  }
74
- async uploadCommitBundle(groupId, commitBundle, isExternalCommit) {
75
+ async uploadCommitBundle(groupId, commitBundle, { regenerateCommitBundle, isExternalCommit } = {}) {
75
76
  const bundlePayload = (0, commitBundleUtil_1.toProtobufCommitBundle)(commitBundle);
76
77
  try {
77
78
  const response = await this.apiClient.api.conversation.postMlsCommitBundle(bundlePayload.slice());
@@ -87,6 +88,15 @@ class MLSService {
87
88
  return response;
88
89
  }
89
90
  catch (error) {
91
+ const shouldRetry = axios_1.default.isAxiosError(error) && error.code === '409';
92
+ if (shouldRetry && regenerateCommitBundle) {
93
+ // in case of a 409, we want to retry to generate the commit and resend it
94
+ // could be that we are trying to upload a commit to a conversation that has a different epoch on backend
95
+ // in this case we will most likely receive a commit from backend that will increase our local epoch
96
+ this.logger.warn(`Uploading commitBundle failed. Will retry generating a new bundle`);
97
+ const updatedCommitBundle = await regenerateCommitBundle();
98
+ return this.uploadCommitBundle(groupId, updatedCommitBundle, { isExternalCommit });
99
+ }
90
100
  if (isExternalCommit) {
91
101
  await this.coreCryptoClient.clearPendingGroupFromExternalCommit(groupId);
92
102
  }
@@ -141,6 +151,18 @@ class MLSService {
141
151
  async newProposal(proposalType, args) {
142
152
  return this.coreCryptoClient.newProposal(proposalType, args);
143
153
  }
154
+ async joinByExternalCommit(getGroupInfo) {
155
+ const generateCommit = async () => {
156
+ const groupInfo = await getGroupInfo();
157
+ const _a = await this.coreCryptoClient.joinByExternalCommit(groupInfo), { conversationId } = _a, commitBundle = __rest(_a, ["conversationId"]);
158
+ return { groupId: conversationId, commitBundle };
159
+ };
160
+ const { commitBundle, groupId } = await generateCommit();
161
+ return this.uploadCommitBundle(groupId, commitBundle, {
162
+ isExternalCommit: true,
163
+ regenerateCommitBundle: async () => (await generateCommit()).commitBundle,
164
+ });
165
+ }
144
166
  async newExternalProposal(externalProposalType, args) {
145
167
  return this.coreCryptoClient.newExternalProposal(externalProposalType, args);
146
168
  }
package/lib/mls/MLSService/MLSService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MLSService.js","sourceRoot":"","sources":["../../../src/mls/MLSService/MLSService.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;;;;;AAmBH,yCAAsD;AACtD,sDAA8B;AAE9B,4EAAqE;AACrE,wFAAkF;AAElF,yDAA0D;AAG1D,8CAA0C;AAC1C,8EAA6F;AAC7F,4DAAuD;AACvD,kDAA2F;AAC3F,8EAAyE;AACzE,0EAAqE;AAErE,iFAAiF;AACjF,wFAAwF;AACjF,MAAM,oBAAoB,GAAG,CAAC,KAAsB,EAAc,EAAE;IACzE,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC/D,CAAC,CAAC;AAFW,QAAA,oBAAoB,wBAE/B;AAMF,MAAM,aAAa,GAAqB;IACtC,6BAA6B,EAAE,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;IACvD,aAAa,EAAE,GAAG;CACnB,CAAC;AAEF,MAAa,UAAU;IAKrB,YACmB,SAAoB,EACpB,wBAAsD,EACvE,EACE,6BAA6B,GAAG,aAAa,CAAC,6BAA6B,EAC3E,aAAa,GAAG,aAAa,CAAC,aAAa,GACjB;QALX,cAAS,GAAT,SAAS,CAAW;QACpB,6BAAwB,GAAxB,wBAAwB,CAA8B;QANzE,WAAM,GAAG,IAAA,iBAAO,EAAC,0BAA0B,CAAC,CAAC;QAY3C,IAAI,CAAC,MAAM,GAAG;YACZ,6BAA6B;YAC7B,aAAa;SACd,CAAC;IACJ,CAAC;IAED,IAAY,gBAAgB;QAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC/C,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;SACnD;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,OAAmB,EAAE,YAA0B,EAAE,gBAA0B;QAC1G,MAAM,aAAa,GAAG,IAAA,yCAAsB,EAAC,YAAY,CAAC,CAAC;QAC3D,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,mBAAmB,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC;YAClG,IAAI,gBAAgB,EAAE;gBACpB,MAAM,IAAI,CAAC,gBAAgB,CAAC,mCAAmC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;aAC9E;iBAAM;gBACL,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;aACrD;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,UAAU,GAAG,mBAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;YACtD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wCAAwC,UAAU,oBAAoB,QAAQ,GAAG,CAAC,CAAC;YACnG,OAAO,QAAQ,CAAC;SACjB;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,gBAAgB,EAAE;gBACpB,MAAM,IAAI,CAAC,gBAAgB,CAAC,mCAAmC,CAAC,OAAO,CAAC,CAAC;aAC1E;iBAAM;gBACL,MAAM,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;aACzD;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,8BAA8B,CAAC,OAAmB,EAAE,OAAkB;QAC3E,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACnH,CAAC;IAEM,qBAAqB,CAAC,EAAiE;YAAjE,EAAC,yBAAyB,OAAuC,EAAlC,mBAAmB,cAAlD,6BAAmD,CAAD;QAC7E,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,iCAClC,mBAAmB,KACtB,yBAAyB,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE;gBAClD,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;gBAClC,MAAM,EAAC,IAAI,EAAC,GAAG,IAAA,wDAA0B,EAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;gBAClE,OAAO,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;oBAChC,MAAM,EAAC,IAAI,EAAE,SAAS,EAAC,GAAG,IAAA,wDAA0B,EAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;oBAC7E,OAAO,SAAS,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;gBACxD,CAAC,CAAC,CAAC;YACL,CAAC,IACD,CAAC;QACH,IAAI,CAAC,yBAAyB,GAAG,yBAAyB,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,cAAgC;QACjE;;;;WAIG;QACH,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpC,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,EAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAC,EAAE,EAAE,CAC9C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CACnE;SACF,CAAC,CAAC;QAEH,MAAM,4BAA4B,GAAG,WAAW,CAAC,MAAM,CAAY,CAAC,aAAa,EAAE,YAAY,EAAE,EAAE;YACjG,2DAA2D;YAC3D,IAAI,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBACxC,OAAO;oBACL,GAAG,aAAa;oBAChB,GAAG,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;wBAC9C,EAAE,EAAE,mBAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,OAAO;wBAC/C,EAAE,EAAE,mBAAO,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,OAAO;qBACvD,CAAC,CAAC;iBACJ,CAAC;aACH;YACD,OAAO,aAAa,CAAC;QACvB,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO,4BAA4B,CAAC;IACtC,CAAC;IAEM,QAAQ,CAAC,OAAmB;QACjC,OAAO,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,YAA0B,EAAE,IAAyD;QAC5G,OAAO,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC/D,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC9B,oBAA0C,EAC1C,IAAuD;QAEvD,OAAO,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;IAC/E,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,cAA0B;QAC3D,OAAO,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC;IACrE,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,cAA8B,EAAE,OAAmB;QAC7E,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,cAA8B,EAAE,OAAmB;QAC7E,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;IAED;;;;;;;;;OASG;IACK,KAAK,CAAC,mBAAmB,CAAC,OAAuB,EAAE,cAA2C;QACpG,OAAO,IAAA,2BAAW,EAAgC,KAAK,IAAI,EAAE;YAC3D,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YACpC,MAAM,YAAY,GAAG,MAAM,cAAc,EAAE,CAAC;YAC5C,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,oBAAoB,CAAC,cAA8B;QACxD,OAAO,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC;IACpH,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAC7B,cAA8B,EAC9B,aAAyC;QAEzC,OAAO,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IACjF,CAAC;IAEM,6BAA6B,CAAC,cAA8B,EAAE,SAAuB;QAC1F,OAAO,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE,GAAG,EAAE,CACnD,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,cAAc,EAAE,SAAS,CAAC,CAC/E,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,OAAuB;QACnD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QACjF,OAAO,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChG,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,cAA8B;QAC5D,OAAO,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;IAClE,CAAC;IAEM,KAAK,CAAC,2BAA2B;QACtC,OAAO,IAAI,CAAC,gBAAgB,CAAC,2BAA2B,EAAE,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,eAAuB;QACpD,OAAO,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;IAClE,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,gBAAgB,CAAC,OAAe;QAC5C,IAAI;YACF,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,mBAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;YAEnG,IAAI,CAAC,uBAAuB,EAAE;gBAC5B,iDAAuB,CAAC,+BAA+B,CAAC,EAAC,OAAO,EAAC,CAAC,CAAC;gBACnE,OAAO;aACR;YAED,MAAM,wBAAwB,GAAG,mBAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;YACrE,MAAM,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,CAAC;SAC3D;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;SACtF;IACH,CAAC;IAEO,sCAAsC,CAAC,OAAe;QAC5D,OAAO,6BAA6B,OAAO,EAAE,CAAC;IAChD,CAAC;IAED;;;OAGG;IACI,uBAAuB,CAAC,OAAe;QAC5C,IAAA,4CAAmB,EAAC,IAAI,CAAC,sCAAsC,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACI,0BAA0B,CAAC,OAAe;QAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,sCAAsC,CAAC,OAAO,CAAC,CAAC;QAEjE,IAAA,8CAAqB,EAAC;YACpB,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAC1C,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,6BAA6B;YAChD,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,0BAA0B;QAC/B,IAAI;YACF,MAAM,sBAAsB,GAAG,iDAAuB,CAAC,iBAAiB,EAAE,CAAC;YAC3E,sBAAsB,CAAC,OAAO,CAAC,CAAC,EAAC,OAAO,EAAC,EAAE,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAC;SACzF;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,EAAE,KAAK,CAAC,CAAC;SAC1E;IACH,CAAC;IAED;;;OAGG;IACI,8BAA8B;QACnC,IAAA,8CAAqB,EAAC;YACpB,KAAK,EAAE,kBAAQ,CAAC,YAAY,CAAC,GAAG;YAChC,GAAG,EAAE,+BAA+B;YACpC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE;SACnC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACvE,MAAM,6BAA6B,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,CAAC;QAEpE,IAAI,qBAAqB,IAAI,6BAA6B,EAAE;YAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC;YAElD,kCAAkC;YAClC,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YAEhG,IAAI,uBAAuB,IAAI,6BAA6B,EAAE;gBAC5D,iBAAiB;gBACjB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;gBAE/E,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;aAC3D;SACF;IACH,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,mBAAmB,CAAC,SAAqB,EAAE,QAAgB;QACtE,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;YACnD,eAAe,EAAE,EAAC,OAAO,EAAE,IAAI,CAAC,qBAAS,CAAC,+BAA+B,CAAC,SAAS,CAAC,CAAC,EAAC;SACvF,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,WAAyB,EAAE,QAAgB;QAC3E,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,oBAAoB,CACnD,QAAQ,EACR,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,qBAAS,CAAC,+BAA+B,CAAC,UAAU,CAAC,CAAC,CAAC,CAC3F,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,cAA8B;QAC1D,OAAO,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAChE,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,MAA8C;QACxE,OAAO,IAAA,iCAAkB,kCAAK,MAAM,KAAE,UAAU,EAAE,IAAI,IAAE,CAAC;IAC3D,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,4BAA4B,CAAC,uBAAoC;;QAC5E,MAAM,EAAC,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,kBAAkB,EAAC,GAAG,uBAAuB,CAAC;QACjF,MAAM,OAAO,GAAG,MAAM,CAAA,MAAA,IAAI,CAAC,yBAAyB,qDAAG,uBAAuB,CAAC,CAAA,CAAC;QAEhF,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,8CAA8C,cAAc,IAAI,kBAAkB,EAAE,CAAC,CAAC;SACvG;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,sBAAsB,CAAC,EAAC,SAAS,EAAE,OAAO,EAAE,SAAS,EAA+B;QAC/F,IAAI,SAAS,GAAG,CAAC,EAAE;YACjB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;YACtC,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,CAAC;YAEtE,6CAAqB,CAAC,SAAS,CAAC;gBAC9B,OAAO;gBACP,UAAU;aACX,CAAC,CAAC;YAEH,6BAAa,CAAC,OAAO,CAAC;gBACpB,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAC,OAAO,EAAC,CAAC;gBAClD,UAAU;gBACV,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,IAAI,CAAC,sBAAsB,CAAC,EAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAC,CAAC,CAAC;SAChE;IACH,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,sBAAsB,CAAC,EAAC,OAAO,EAAE,UAAU,GAAG,KAAK,EAA+B;QAC7F,IAAI;YACF,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;YAEhE,IAAI,CAAC,UAAU,EAAE;gBACf,6BAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAClC,6CAAqB,CAAC,UAAU,CAAC,EAAC,OAAO,EAAC,CAAC,CAAC;aAC7C;SACF;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wDAAwD,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;SAC7F;IACH,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,6BAA6B;QACxC,IAAI;YACF,MAAM,gBAAgB,GAAG,6CAAqB,CAAC,WAAW,EAAE,CAAC;YAC7D,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/B,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAC,OAAO,EAAE,UAAU,EAAC,EAAE,EAAE,CACjD,6BAAa,CAAC,OAAO,CAAC;oBACpB,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAC,OAAO,EAAC,CAAC;oBAClD,UAAU;oBACV,GAAG,EAAE,OAAO;iBACb,CAAC,CACH,CAAC;aACH;SACF;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;SAC7D;IACH,CAAC;CACF;AA5XD,gCA4XC"}
1
+ {"version":3,"file":"MLSService.js","sourceRoot":"","sources":["../../../src/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -11,7 +11,7 @@
11
11
  "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
12
12
  },
13
13
  "dependencies": {
14
- "@wireapp/api-client": "^22.1.0",
14
+ "@wireapp/api-client": "^22.3.0",
15
15
  "@wireapp/commons": "^5.0.0",
16
16
  "@wireapp/core-crypto": "0.6.0-pre.4",
17
17
  "@wireapp/cryptobox": "12.8.0",
@@ -60,6 +60,6 @@
60
60
  "test:coverage": "jest --coverage",
61
61
  "watch": "tsc --watch"
62
62
  },
63
- "version": "36.2.0",
64
- "gitHead": "60a309392d2c932e8843c894380b8566e8608879"
63
+ "version": "36.3.1",
64
+ "gitHead": "f5ceab51ba431b09a0f704e494ac9b0af3b38d1f"
65
65
  }