@wireapp/core 41.3.0 → 41.3.2
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.
- package/lib/Account.d.ts +2 -1
- package/lib/Account.d.ts.map +1 -1
- package/lib/Account.js +10 -14
- package/package.json +3 -3
package/lib/Account.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ import { ConnectionService } from './connection/';
|
|
|
10
10
|
import { AssetService, ConversationService } from './conversation/';
|
|
11
11
|
import { GiphyService } from './giphy/';
|
|
12
12
|
import { LinkPreviewService } from './linkPreview';
|
|
13
|
+
import { MLSService } from './messagingProtocols/mls';
|
|
13
14
|
import { MLSCallbacks, CryptoProtocolConfig } from './messagingProtocols/mls/types';
|
|
14
15
|
import { NewClient, ProteusService } from './messagingProtocols/proteus';
|
|
15
16
|
import { HandledEventPayload, NotificationService, NotificationSource } from './notification/';
|
|
@@ -69,8 +70,8 @@ export declare class Account extends TypedEventEmitter<Events> {
|
|
|
69
70
|
private db?;
|
|
70
71
|
private readonly nbPrekeys;
|
|
71
72
|
private readonly cryptoProtocolConfig?;
|
|
72
|
-
private protectedServices?;
|
|
73
73
|
service?: {
|
|
74
|
+
mls?: MLSService;
|
|
74
75
|
proteus: ProteusService;
|
|
75
76
|
account: AccountService;
|
|
76
77
|
asset: AssetService;
|
package/lib/Account.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,YAAY,EAGZ,OAAO,EACP,MAAM,EAEN,SAAS,EACV,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAuB,UAAU,EAAE,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AACnG,OAAO,KAAK,MAAM,MAAM,+BAA+B,CAAC;AAOxD,OAAO,EAAC,SAAS,EAAE,eAAe,EAAC,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAC,UAAU,EAAe,MAAM,uBAAuB,CAAC;AAE/D,OAAO,EAAC,cAAc,EAAC,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,YAAY,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,EAAC,kBAAkB,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"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"}
|
package/lib/Account.js
CHANGED
|
@@ -172,7 +172,6 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
|
|
|
172
172
|
* Will register a new client for the current user
|
|
173
173
|
*/
|
|
174
174
|
async registerClient(loginData, clientInfo = coreDefaultClient, entropyData) {
|
|
175
|
-
var _a, _b;
|
|
176
175
|
if (!this.service || !this.apiClient.context || !this.storeEngine) {
|
|
177
176
|
throw new Error('Services are not set or context not initialized.');
|
|
178
177
|
}
|
|
@@ -180,17 +179,16 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
|
|
|
180
179
|
await this.initServices(this.apiClient.context);
|
|
181
180
|
const initialPreKeys = await this.service.proteus.createClient(entropyData);
|
|
182
181
|
const client = await this.service.client.register(loginData, clientInfo, initialPreKeys);
|
|
183
|
-
if (
|
|
182
|
+
if (this.service.mls) {
|
|
184
183
|
const { userId, domain = '' } = this.apiClient.context;
|
|
185
|
-
await this.
|
|
184
|
+
await this.service.mls.createClient({ id: userId, domain }, client.id);
|
|
186
185
|
}
|
|
187
|
-
this.logger.info(`Created new client {mls: ${!!
|
|
186
|
+
this.logger.info(`Created new client {mls: ${!!this.service.mls}, id: ${client.id}}`);
|
|
188
187
|
await this.service.notification.initializeNotificationStream();
|
|
189
188
|
await this.service.client.synchronizeClients(client.id);
|
|
190
189
|
return this.initClient(client);
|
|
191
190
|
}
|
|
192
191
|
async initClient(client) {
|
|
193
|
-
var _a;
|
|
194
192
|
if (!this.service || !this.apiClient.context || !this.storeEngine) {
|
|
195
193
|
throw new Error('Services are not set.');
|
|
196
194
|
}
|
|
@@ -202,18 +200,18 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
|
|
|
202
200
|
// Call /access endpoint with client_id after client initialisation
|
|
203
201
|
await this.apiClient.transport.http.associateClientWithSession(validClient.id);
|
|
204
202
|
await this.service.proteus.initClient(this.storeEngine, this.apiClient.context);
|
|
205
|
-
if (
|
|
203
|
+
if (this.service.mls) {
|
|
206
204
|
const { userId, domain = '' } = this.apiClient.context;
|
|
207
205
|
if (!client) {
|
|
208
206
|
// If the client has been passed to the method, it means it also has been initialized
|
|
209
|
-
await this.
|
|
207
|
+
await this.service.mls.initClient({ id: userId, domain }, validClient.id);
|
|
210
208
|
}
|
|
211
209
|
// initialize schedulers for pending mls proposals once client is initialized
|
|
212
|
-
await this.
|
|
210
|
+
await this.service.mls.checkExistingPendingProposals();
|
|
213
211
|
// initialize scheduler for syncing key packages with backend
|
|
214
|
-
this.
|
|
212
|
+
this.service.mls.checkForKeyPackagesBackendSync();
|
|
215
213
|
// leave stale conference subconversations (e.g after a crash)
|
|
216
|
-
await this.
|
|
214
|
+
await this.service.mls.leaveStaleConferenceSubconversations();
|
|
217
215
|
}
|
|
218
216
|
return validClient;
|
|
219
217
|
}
|
|
@@ -250,7 +248,7 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
|
|
|
250
248
|
*/
|
|
251
249
|
configureMLSCallbacks(mlsCallbacks) {
|
|
252
250
|
var _a, _b;
|
|
253
|
-
(_b = (_a = this.
|
|
251
|
+
(_b = (_a = this.service) === null || _a === void 0 ? void 0 : _a.mls) === null || _b === void 0 ? void 0 : _b.configureMLSCallbacks(mlsCallbacks);
|
|
254
252
|
}
|
|
255
253
|
async initServices(context) {
|
|
256
254
|
var _a, _b;
|
|
@@ -278,10 +276,8 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
|
|
|
278
276
|
const teamService = new team_1.TeamService(this.apiClient);
|
|
279
277
|
const broadcastService = new broadcast_1.BroadcastService(this.apiClient, proteusService);
|
|
280
278
|
const userService = new user_1.UserService(this.apiClient);
|
|
281
|
-
this.protectedServices = {
|
|
282
|
-
mls: mlsService,
|
|
283
|
-
};
|
|
284
279
|
this.service = {
|
|
280
|
+
mls: mlsService,
|
|
285
281
|
proteus: proteusService,
|
|
286
282
|
account: accountService,
|
|
287
283
|
asset: assetService,
|
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": "^25.2.
|
|
14
|
+
"@wireapp/api-client": "^25.2.3",
|
|
15
15
|
"@wireapp/commons": "^5.1.0",
|
|
16
16
|
"@wireapp/core-crypto": "1.0.0-rc.6",
|
|
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": "41.3.
|
|
64
|
-
"gitHead": "
|
|
63
|
+
"version": "41.3.2",
|
|
64
|
+
"gitHead": "25cda76a8722c6ea34b364f5b79c96dfdc519022"
|
|
65
65
|
}
|