@wireapp/api-client 23.0.0 → 23.1.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.
- package/lib/conversation/ConversationAPI/ConversationAPI.d.ts +1 -15
- package/lib/conversation/ConversationAPI/ConversationAPI.d.ts.map +1 -1
- package/lib/conversation/ConversationAPI/ConversationAPI.js +0 -41
- package/lib/conversation/index.d.ts +0 -1
- package/lib/conversation/index.d.ts.map +1 -1
- package/lib/conversation/index.js +0 -1
- package/lib/user/UserAPI.d.ts +7 -2
- package/lib/user/UserAPI.d.ts.map +1 -1
- package/lib/user/UserAPI.js +12 -9
- package/package.json +2 -2
- package/lib/conversation/ClientMismatch.d.ts +0 -8
- package/lib/conversation/ClientMismatch.d.ts.map +0 -1
- package/lib/conversation/ClientMismatch.js +0 -20
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { proteus as ProtobufOTR } from '@wireapp/protocol-messaging/web/otr';
|
|
2
|
-
import {
|
|
2
|
+
import { Conversation, ConversationCode, ConversationRolesList, Conversations, Invite, Member, MessageSendingStatus, NewConversation, RemoteConversations } from '..';
|
|
3
3
|
import { BackendFeatures } from '../../APIClient';
|
|
4
4
|
import { ConversationAccessUpdateEvent, ConversationCodeDeleteEvent, ConversationCodeUpdateEvent, ConversationEvent, ConversationMemberJoinEvent, ConversationMemberLeaveEvent, ConversationMessageTimerUpdateEvent, ConversationReceiptModeUpdateEvent, ConversationRenameEvent } from '../../event';
|
|
5
5
|
import { HttpClient } from '../../http';
|
|
@@ -223,20 +223,6 @@ export declare class ConversationAPI {
|
|
|
223
223
|
* @see https://nginz-https.anta.wire.link/api/swagger-ui/#/default/post_conversations__cnv_domain___cnv__proteus_messages
|
|
224
224
|
*/
|
|
225
225
|
postOTRMessage(conversationId: string, domain: string, messageData: ProtobufOTR.QualifiedNewOtrMessage): Promise<MessageSendingStatus>;
|
|
226
|
-
/**
|
|
227
|
-
* Post an encrypted message to a conversation.
|
|
228
|
-
* @param sendingClientId The sender's client ID
|
|
229
|
-
* @param conversationId The conversation ID
|
|
230
|
-
* @param messageData The message content
|
|
231
|
-
* @param ignoreMissing Whether to report missing clients or not:
|
|
232
|
-
* `false`: Report about all missing clients
|
|
233
|
-
* `true`: Ignore all missing clients and force sending.
|
|
234
|
-
* Array: User IDs specifying which user IDs are allowed to have
|
|
235
|
-
* missing clients
|
|
236
|
-
* `undefined`: Default to setting of `report_missing` in `NewOTRMessage`
|
|
237
|
-
* @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/conversations/postOtrMessage
|
|
238
|
-
*/
|
|
239
|
-
postOTRProtobufMessage(sendingClientId: string, conversationId: string, messageData: ProtobufOTR.NewOtrMessage, ignoreMissing?: boolean | string[]): Promise<ClientMismatch>;
|
|
240
226
|
/**
|
|
241
227
|
* Post an encrypted message to a conversation.
|
|
242
228
|
* @param messageData Mls message payload in TLS format. Please refer to the MLS specification for details.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConversationAPI.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationAPI/ConversationAPI.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,qCAAqC,CAAC;AAG3E,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"ConversationAPI.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationAPI/ConversationAPI.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,6 @@ const ArrayUtil_1 = require("@wireapp/commons/lib/util/ArrayUtil");
|
|
|
23
23
|
const otr_1 = require("@wireapp/protocol-messaging/web/otr");
|
|
24
24
|
const __1 = require("..");
|
|
25
25
|
const http_1 = require("../../http");
|
|
26
|
-
const validation_1 = require("../../validation");
|
|
27
26
|
const ConversationError_1 = require("../ConversationError");
|
|
28
27
|
class ConversationAPI {
|
|
29
28
|
constructor(client, backendFeatures) {
|
|
@@ -535,46 +534,6 @@ class ConversationAPI {
|
|
|
535
534
|
const response = await this.client.sendProtocolBuffer(config, true);
|
|
536
535
|
return response.data;
|
|
537
536
|
}
|
|
538
|
-
/**
|
|
539
|
-
* Post an encrypted message to a conversation.
|
|
540
|
-
* @param sendingClientId The sender's client ID
|
|
541
|
-
* @param conversationId The conversation ID
|
|
542
|
-
* @param messageData The message content
|
|
543
|
-
* @param ignoreMissing Whether to report missing clients or not:
|
|
544
|
-
* `false`: Report about all missing clients
|
|
545
|
-
* `true`: Ignore all missing clients and force sending.
|
|
546
|
-
* Array: User IDs specifying which user IDs are allowed to have
|
|
547
|
-
* missing clients
|
|
548
|
-
* `undefined`: Default to setting of `report_missing` in `NewOTRMessage`
|
|
549
|
-
* @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/conversations/postOtrMessage
|
|
550
|
-
*/
|
|
551
|
-
async postOTRProtobufMessage(sendingClientId, conversationId, messageData, ignoreMissing) {
|
|
552
|
-
if (!sendingClientId) {
|
|
553
|
-
throw new validation_1.ValidationError('Unable to send OTR message without client ID.');
|
|
554
|
-
}
|
|
555
|
-
const config = {
|
|
556
|
-
/*
|
|
557
|
-
* We need to slice the content of what protobuf has generated in order for Axios to send the correct buffer (see https://github.com/axios/axios/issues/4068)
|
|
558
|
-
* FIXME: The `slice` can be removed as soon as Axios publishes a version with the dataview issue fixed.
|
|
559
|
-
*/
|
|
560
|
-
data: otr_1.proteus.NewOtrMessage.encode(messageData).finish().slice(),
|
|
561
|
-
method: 'post',
|
|
562
|
-
url: `${ConversationAPI.URL.CONVERSATIONS}/${conversationId}/${ConversationAPI.URL.OTR}/${ConversationAPI.URL.MESSAGES}`,
|
|
563
|
-
};
|
|
564
|
-
if (typeof ignoreMissing !== 'undefined') {
|
|
565
|
-
const ignore_missing = Array.isArray(ignoreMissing) ? ignoreMissing.join(',') : ignoreMissing;
|
|
566
|
-
config.params = { ignore_missing };
|
|
567
|
-
// `ignore_missing` takes precedence on the server so we can remove
|
|
568
|
-
// `report_missing` to save some bandwidth.
|
|
569
|
-
messageData.reportMissing = [];
|
|
570
|
-
}
|
|
571
|
-
else if (typeof messageData.reportMissing === 'undefined' || !messageData.reportMissing.length) {
|
|
572
|
-
// both `ignore_missing` and `report_missing` are undefined
|
|
573
|
-
config.params = { ignore_missing: !!messageData.blob };
|
|
574
|
-
}
|
|
575
|
-
const response = await this.client.sendProtocolBuffer(config, true);
|
|
576
|
-
return response.data;
|
|
577
|
-
}
|
|
578
537
|
/**
|
|
579
538
|
* Post an encrypted message to a conversation.
|
|
580
539
|
* @param messageData Mls message payload in TLS format. Please refer to the MLS specification for details.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/conversation/index.ts"],"names":[],"mappings":"AAmBA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/conversation/index.ts"],"names":[],"mappings":"AAmBA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC"}
|
|
@@ -32,7 +32,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
32
32
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
33
33
|
};
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
__exportStar(require("./ClientMismatch"), exports);
|
|
36
35
|
__exportStar(require("./Conversation"), exports);
|
|
37
36
|
__exportStar(require("./ConversationAPI"), exports);
|
|
38
37
|
__exportStar(require("./ConversationCode"), exports);
|
package/lib/user/UserAPI.d.ts
CHANGED
|
@@ -7,6 +7,10 @@ import { PublicClient, QualifiedPublicClients } from '../client/';
|
|
|
7
7
|
import { QualifiedUserClients } from '../conversation/';
|
|
8
8
|
import { HttpClient, RequestCancelable } from '../http/';
|
|
9
9
|
import { Activate, ActivationResponse, CheckHandles, CompletePasswordReset, HandleInfo, LimitedQualifiedUserIdList, NewPasswordReset, QualifiedHandle, QualifiedId, SearchResult, SendActivationCode, User, VerifyDelete } from '../user/';
|
|
10
|
+
type PrekeysResponse = {
|
|
11
|
+
qualified_user_client_prekeys: QualifiedUserPreKeyBundleMap;
|
|
12
|
+
failed_to_list?: QualifiedId[];
|
|
13
|
+
};
|
|
10
14
|
export declare class UserAPI {
|
|
11
15
|
private readonly client;
|
|
12
16
|
private readonly backendFeatures;
|
|
@@ -112,7 +116,7 @@ export declare class UserAPI {
|
|
|
112
116
|
* @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/users/user
|
|
113
117
|
*/
|
|
114
118
|
getUser(userId: string | QualifiedId): Promise<User>;
|
|
115
|
-
getUserPreKeys(userId:
|
|
119
|
+
getUserPreKeys(userId: QualifiedId): Promise<PreKeyBundle>;
|
|
116
120
|
/**
|
|
117
121
|
* @deprecated use getUser, getSearchContacts or postListUsers instead
|
|
118
122
|
* List users.
|
|
@@ -196,7 +200,7 @@ export declare class UserAPI {
|
|
|
196
200
|
* Given a map of qualified user IDs to client IDs return a prekey for each one.
|
|
197
201
|
* @param userClientMap A map of the qualified user's clients
|
|
198
202
|
*/
|
|
199
|
-
postMultiPreKeyBundles(userClientMap: QualifiedUserClients, limit?: number): Promise<
|
|
203
|
+
postMultiPreKeyBundles(userClientMap: QualifiedUserClients, limit?: number): Promise<PrekeysResponse>;
|
|
200
204
|
/**
|
|
201
205
|
* Initiate or complete a password reset.
|
|
202
206
|
* @param resetData The data needed to initiate or complete the reset
|
|
@@ -224,4 +228,5 @@ export declare class UserAPI {
|
|
|
224
228
|
*/
|
|
225
229
|
putRevalidateEmail(userId: string, email: string): Promise<void>;
|
|
226
230
|
}
|
|
231
|
+
export {};
|
|
227
232
|
//# sourceMappingURL=UserAPI.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserAPI.d.ts","sourceRoot":"","sources":["../../src/user/UserAPI.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAC,4BAA4B,EAAC,MAAM,uBAAuB,CAAC;AAEnE,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,UAAU,CAAC;AACpD,OAAO,EAAC,sBAAsB,EAAC,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAC,YAAY,EAAE,sBAAsB,EAAC,MAAM,YAAY,CAAC;AAChE,OAAO,EAAC,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAe,UAAU,EAAE,iBAAiB,EAAsB,MAAM,UAAU,CAAC;AAC1F,OAAO,EACL,QAAQ,EACR,kBAAkB,EAClB,YAAY,EACZ,qBAAqB,EACrB,UAAU,EACV,0BAA0B,EAC1B,gBAAgB,EAChB,eAAe,EACf,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,IAAI,EACJ,YAAY,EACb,MAAM,UAAU,CAAC;AAElB,qBAAa,OAAO;IA2BN,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAc,OAAO,CAAC,QAAQ,CAAC,eAAe;IA1BjF,gBAAuB,wBAAwB,MAAM;IACrD,gBAAuB,sCAAsC,OAAO;IACpE,gBAAuB,GAAG;;;;;;;;;;;;;;;;;;;;;;MAsBxB;gBAE2B,MAAM,EAAE,UAAU,EAAmB,eAAe,EAAE,eAAe;IAElG;;;OAGG;IACU,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9C;;;;OAIG;IACU,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/D;;;;;OAKG;IACU,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IActG;;;OAGG;IACU,qBAAqB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAU/D;;;;;OAKG;IACU,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAYpF;;;;;OAKG;IACU,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAY1F;;;;OAIG;IACU,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAYrE;;;;;OAKG;IACU,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAU3D;;;OAGG;IACU,aAAa,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAU/C;;;;OAIG;IACU,WAAW,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAU5D;;;;;;OAMG;IACU,iBAAiB,CAC5B,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAoC3C;;;;;OAKG;IACU,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAepD,cAAc,CAAC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"UserAPI.d.ts","sourceRoot":"","sources":["../../src/user/UserAPI.ts"],"names":[],"mappings":"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"}
|
package/lib/user/UserAPI.js
CHANGED
|
@@ -26,6 +26,9 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
26
26
|
const commons_1 = require("@wireapp/commons");
|
|
27
27
|
const UserError_1 = require("./UserError");
|
|
28
28
|
const http_1 = require("../http/");
|
|
29
|
+
function isPrekeysResponse(object) {
|
|
30
|
+
return object.qualified_user_client_prekeys && object.failed_to_list;
|
|
31
|
+
}
|
|
29
32
|
class UserAPI {
|
|
30
33
|
constructor(client, backendFeatures) {
|
|
31
34
|
this.client = client;
|
|
@@ -226,9 +229,7 @@ class UserAPI {
|
|
|
226
229
|
return response.data;
|
|
227
230
|
}
|
|
228
231
|
async getUserPreKeys(userId) {
|
|
229
|
-
const url =
|
|
230
|
-
? `${UserAPI.URL.USERS}/${userId}/${UserAPI.URL.PRE_KEYS}`
|
|
231
|
-
: `${UserAPI.URL.USERS}/${userId.domain}/${userId.id}/${UserAPI.URL.PRE_KEYS}`;
|
|
232
|
+
const url = `${UserAPI.URL.USERS}/${userId.domain}/${userId.id}/${UserAPI.URL.PRE_KEYS}`;
|
|
232
233
|
const config = {
|
|
233
234
|
method: 'get',
|
|
234
235
|
url,
|
|
@@ -395,7 +396,7 @@ class UserAPI {
|
|
|
395
396
|
url: `${UserAPI.URL.USERS}/${UserAPI.URL.LIST_PREKEYS}`,
|
|
396
397
|
};
|
|
397
398
|
const response = await this.client.sendJSON(config, true);
|
|
398
|
-
return response.data;
|
|
399
|
+
return isPrekeysResponse(response.data) ? response.data : { qualified_user_client_prekeys: response.data };
|
|
399
400
|
}
|
|
400
401
|
/**
|
|
401
402
|
* List users.
|
|
@@ -444,12 +445,14 @@ class UserAPI {
|
|
|
444
445
|
})
|
|
445
446
|
.map(chunkedMap => this.postMultiPreKeyBundlesChunk(chunkedMap));
|
|
446
447
|
const userPreKeyBundleMapChunks = await Promise.all(chunksPromises);
|
|
447
|
-
return userPreKeyBundleMapChunks.reduce((
|
|
448
|
-
|
|
449
|
-
|
|
448
|
+
return userPreKeyBundleMapChunks.reduce((response, userPreKeyBundleMapChunk) => {
|
|
449
|
+
var _a, _b;
|
|
450
|
+
Object.entries(userPreKeyBundleMapChunk.qualified_user_client_prekeys).forEach(([domain, userClientMap]) => {
|
|
451
|
+
response.qualified_user_client_prekeys[domain] = Object.assign(Object.assign({}, response.qualified_user_client_prekeys[domain]), userClientMap);
|
|
450
452
|
});
|
|
451
|
-
|
|
452
|
-
|
|
453
|
+
(_a = response.failed_to_list) === null || _a === void 0 ? void 0 : _a.push(...((_b = userPreKeyBundleMapChunk.failed_to_list) !== null && _b !== void 0 ? _b : []));
|
|
454
|
+
return response;
|
|
455
|
+
}, { qualified_user_client_prekeys: {}, failed_to_list: [] });
|
|
453
456
|
}
|
|
454
457
|
/**
|
|
455
458
|
* Initiate or complete a password reset.
|
package/package.json
CHANGED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ClientMismatch.d.ts","sourceRoot":"","sources":["../../src/conversation/ClientMismatch.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,IAAI,CAAC;AAE/B,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,WAAW,CAAC;IACrB,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,WAAW,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CACd"}
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
/*
|
|
3
|
-
* Wire
|
|
4
|
-
* Copyright (C) 2018 Wire Swiss GmbH
|
|
5
|
-
*
|
|
6
|
-
* This program is free software: you can redistribute it and/or modify
|
|
7
|
-
* it under the terms of the GNU General Public License as published by
|
|
8
|
-
* the Free Software Foundation, either version 3 of the License, or
|
|
9
|
-
* (at your option) any later version.
|
|
10
|
-
*
|
|
11
|
-
* This program is distributed in the hope that it will be useful,
|
|
12
|
-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
13
|
-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
14
|
-
* GNU General Public License for more details.
|
|
15
|
-
*
|
|
16
|
-
* You should have received a copy of the GNU General Public License
|
|
17
|
-
* along with this program. If not, see http://www.gnu.org/licenses/.
|
|
18
|
-
*
|
|
19
|
-
*/
|
|
20
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|