@wireapp/api-client 19.6.3 → 19.7.1-0
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/package.json +1 -2
- package/src/APIClient.d.ts +1 -0
- package/src/APIClient.js +6 -2
- package/src/APIClient.js.map +1 -1
- package/src/asset/AssetAPI.d.ts +3 -7
- package/src/asset/AssetAPI.js +21 -16
- package/src/asset/AssetAPI.js.map +1 -1
- package/src/auth/AccessTokenStore.d.ts +5 -0
- package/src/auth/AccessTokenStore.js +2 -0
- package/src/auth/AccessTokenStore.js.map +1 -1
- package/src/auth/AuthAPI.d.ts +0 -2
- package/src/auth/AuthAPI.js +0 -8
- package/src/auth/AuthAPI.js.map +1 -1
- package/src/client/ClientAPI.d.ts +27 -2
- package/src/client/ClientAPI.js +31 -2
- package/src/client/ClientAPI.js.map +1 -1
- package/src/conversation/Conversation.d.ts +4 -1
- package/src/conversation/{ConversationAPI.d.ts → ConversationAPI/ConversationAPI.d.ts} +36 -13
- package/src/conversation/{ConversationAPI.js → ConversationAPI/ConversationAPI.js} +51 -14
- package/src/conversation/ConversationAPI/ConversationAPI.js.map +1 -0
- package/src/conversation/ConversationAPI/index.d.ts +1 -0
- package/src/conversation/ConversationAPI/index.js +32 -0
- package/src/conversation/ConversationAPI/index.js.map +1 -0
- package/src/conversation/NewConversation.d.ts +3 -1
- package/src/conversation/data/ConversationMLSMessageAddData.d.ts +2 -0
- package/src/conversation/data/ConversationMLSMessageAddData.js +21 -0
- package/src/conversation/data/ConversationMLSMessageAddData.js.map +1 -0
- package/src/conversation/data/ConversationMLSWelcomeData.d.ts +2 -0
- package/src/conversation/data/ConversationMLSWelcomeData.js +21 -0
- package/src/conversation/data/ConversationMLSWelcomeData.js.map +1 -0
- package/src/conversation/data/MlsEventData.d.ts +63 -0
- package/src/conversation/data/MlsEventData.js +21 -0
- package/src/conversation/data/MlsEventData.js.map +1 -0
- package/src/conversation/data/index.d.ts +2 -0
- package/src/conversation/data/index.js +2 -0
- package/src/conversation/data/index.js.map +1 -1
- package/src/event/ConversationEvent.d.ts +13 -3
- package/src/event/ConversationEvent.js +2 -0
- package/src/event/ConversationEvent.js.map +1 -1
- package/src/http/BackendErrorLabel.d.ts +10 -1
- package/src/http/BackendErrorLabel.js +9 -0
- package/src/http/BackendErrorLabel.js.map +1 -1
- package/src/http/ContentType.d.ts +2 -1
- package/src/http/ContentType.js +1 -0
- package/src/http/ContentType.js.map +1 -1
- package/src/http/HttpClient.d.ts +7 -0
- package/src/http/HttpClient.js +17 -0
- package/src/http/HttpClient.js.map +1 -1
- package/src/services/ServicesAPI.d.ts +2 -2
- package/src/services/ServicesAPI.js +2 -3
- package/src/services/ServicesAPI.js.map +1 -1
- package/src/tcp/WebSocketClient.js +4 -0
- package/src/tcp/WebSocketClient.js.map +1 -1
- package/src/team/feature/Feature.d.ts +5 -1
- package/src/team/feature/Feature.js.map +1 -1
- package/src/team/feature/FeatureAPI.d.ts +18 -11
- package/src/team/feature/FeatureAPI.js +36 -21
- package/src/team/feature/FeatureAPI.js.map +1 -1
- package/src/team/feature/FeatureList.d.ts +1 -1
- package/src/team/feature/FeatureList.js +1 -1
- package/src/team/identityprovider/IdentityProviderAPI.d.ts +1 -1
- package/src/team/identityprovider/IdentityProviderAPI.js +3 -3
- package/src/team/team/NewTeamData.d.ts +2 -2
- package/src/team/team/TeamData.d.ts +4 -1
- package/src/team/team/UpdateTeamData.d.ts +2 -0
- package/src/user/UserAPI.js +3 -1
- package/src/user/UserAPI.js.map +1 -1
- package/CHANGELOG.md +0 -9622
- package/LICENSE +0 -674
- package/src/conversation/ConversationAPI.js.map +0 -1
package/package.json
CHANGED
package/src/APIClient.d.ts
CHANGED
package/src/APIClient.js
CHANGED
|
@@ -90,11 +90,12 @@ class APIClient extends events_1.EventEmitter {
|
|
|
90
90
|
}
|
|
91
91
|
configureApis(backendFeatures) {
|
|
92
92
|
this.logger.info('configuring APIs with config', backendFeatures);
|
|
93
|
+
const assetAPI = new asset_1.AssetAPI(this.transport.http, backendFeatures);
|
|
93
94
|
return {
|
|
94
95
|
account: new AccountAPI_1.AccountAPI(this.transport.http),
|
|
95
|
-
asset:
|
|
96
|
+
asset: assetAPI,
|
|
96
97
|
auth: new auth_1.AuthAPI(this.transport.http),
|
|
97
|
-
services: new services_1.ServicesAPI(this.transport.http),
|
|
98
|
+
services: new services_1.ServicesAPI(this.transport.http, assetAPI),
|
|
98
99
|
broadcast: new broadcast_1.BroadcastAPI(this.transport.http),
|
|
99
100
|
client: new client_1.ClientAPI(this.transport.http),
|
|
100
101
|
connection: new connection_1.ConnectionAPI(this.transport.http, backendFeatures),
|
|
@@ -139,6 +140,7 @@ class APIClient extends events_1.EventEmitter {
|
|
|
139
140
|
* @return The highest version that is both supported by client and backend
|
|
140
141
|
*/
|
|
141
142
|
async useVersion(acceptedVersions) {
|
|
143
|
+
var _a;
|
|
142
144
|
if (acceptedVersions.length === 1 && acceptedVersions[0] === 0) {
|
|
143
145
|
// Nothing to do since version 0 is the default one
|
|
144
146
|
return this.computeBackendFeatures(0);
|
|
@@ -148,7 +150,9 @@ class APIClient extends events_1.EventEmitter {
|
|
|
148
150
|
backendVersions = (await this.transport.http.sendRequest({ url: '/api-version' })).data;
|
|
149
151
|
}
|
|
150
152
|
catch (error) { }
|
|
153
|
+
const devVersions = (_a = backendVersions.development) !== null && _a !== void 0 ? _a : [];
|
|
151
154
|
const highestCommonVersion = backendVersions.supported
|
|
155
|
+
.concat(devVersions)
|
|
152
156
|
.sort()
|
|
153
157
|
.reverse()
|
|
154
158
|
.find(version => acceptedVersions.includes(version));
|
package/src/APIClient.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"APIClient.js","sourceRoot":"","sources":["APIClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"APIClient.js","sourceRoot":"","sources":["APIClient.ts"],"names":[],"mappings":"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"}
|
package/src/asset/AssetAPI.d.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { AssetRetentionPolicy } from './AssetRetentionPolicy';
|
|
3
3
|
import { HttpClient, ProgressCallback, RequestCancelable } from '../http/';
|
|
4
4
|
import type { AssetUploadData } from './AssetUploadData';
|
|
5
|
+
import { BackendFeatures } from '../APIClient';
|
|
5
6
|
export interface CipherOptions {
|
|
6
7
|
/** Set a custom algorithm for encryption */
|
|
7
8
|
algorithm?: string;
|
|
@@ -20,13 +21,8 @@ export interface AssetResponse {
|
|
|
20
21
|
}
|
|
21
22
|
export declare class AssetAPI {
|
|
22
23
|
private readonly client;
|
|
23
|
-
private
|
|
24
|
-
|
|
25
|
-
private static readonly ASSET_SERVICE_URL;
|
|
26
|
-
private static readonly ASSET_V2_URL;
|
|
27
|
-
private static readonly ASSET_V2_CONVERSATION_URL;
|
|
28
|
-
private static readonly ASSET_V1_URL;
|
|
29
|
-
constructor(client: HttpClient);
|
|
24
|
+
private readonly backendFeatures;
|
|
25
|
+
constructor(client: HttpClient, backendFeatures: BackendFeatures);
|
|
30
26
|
private getAssetShared;
|
|
31
27
|
private postAssetShared;
|
|
32
28
|
getAssetV1(assetId: string, conversationId: string, forceCaching?: boolean, progressCallback?: ProgressCallback): {
|
package/src/asset/AssetAPI.js
CHANGED
|
@@ -29,9 +29,19 @@ const http_1 = require("../http/");
|
|
|
29
29
|
const AssetUtil_1 = require("./AssetUtil");
|
|
30
30
|
const user_1 = require("../user");
|
|
31
31
|
const random_1 = require("../shims/node/random");
|
|
32
|
+
const ASSET_URLS = {
|
|
33
|
+
ASSET_V3_URL: '/assets/v3',
|
|
34
|
+
ASSET_V4_URL: '/assets/v4',
|
|
35
|
+
ASSET_SERVICE_URL: '/bot/assets',
|
|
36
|
+
ASSET_V2_URL: '/otr/assets',
|
|
37
|
+
ASSET_V2_CONVERSATION_URL: '/conversations',
|
|
38
|
+
ASSET_V1_URL: '/assets',
|
|
39
|
+
ASSETS_URL: '/assets',
|
|
40
|
+
};
|
|
32
41
|
class AssetAPI {
|
|
33
|
-
constructor(client) {
|
|
42
|
+
constructor(client, backendFeatures) {
|
|
34
43
|
this.client = client;
|
|
44
|
+
this.backendFeatures = backendFeatures;
|
|
35
45
|
}
|
|
36
46
|
getAssetShared(assetUrl, token, forceCaching = false, progressCallback) {
|
|
37
47
|
if (token && !(0, AssetUtil_1.isValidToken)(token)) {
|
|
@@ -138,7 +148,7 @@ class AssetAPI {
|
|
|
138
148
|
conv_id: conversationId,
|
|
139
149
|
},
|
|
140
150
|
responseType: 'arraybuffer',
|
|
141
|
-
url: `${
|
|
151
|
+
url: `${ASSET_URLS.ASSET_V1_URL}/${assetId}`,
|
|
142
152
|
};
|
|
143
153
|
if (forceCaching) {
|
|
144
154
|
config.params.forceCaching = forceCaching;
|
|
@@ -178,7 +188,7 @@ class AssetAPI {
|
|
|
178
188
|
onUploadProgress: (0, http_1.handleProgressEvent)(progressCallback),
|
|
179
189
|
params: {},
|
|
180
190
|
responseType: 'arraybuffer',
|
|
181
|
-
url: `${
|
|
191
|
+
url: `${ASSET_URLS.ASSET_V2_CONVERSATION_URL}/${conversationId}${ASSET_URLS.ASSET_V2_URL}/${assetId}`,
|
|
182
192
|
};
|
|
183
193
|
if (forceCaching) {
|
|
184
194
|
config.params.forceCaching = forceCaching;
|
|
@@ -207,21 +217,21 @@ class AssetAPI {
|
|
|
207
217
|
if (!(0, AssetUtil_1.isValidUUID)(assetId)) {
|
|
208
218
|
throw new TypeError(`Expected asset ID "${assetId}" to only contain alphanumeric values and dashes.`);
|
|
209
219
|
}
|
|
210
|
-
const assetBaseUrl =
|
|
211
|
-
return this.getAssetShared(assetBaseUrl
|
|
220
|
+
const assetBaseUrl = this.backendFeatures.version >= 2 ? ASSET_URLS.ASSETS_URL : ASSET_URLS.ASSET_V3_URL;
|
|
221
|
+
return this.getAssetShared(`${assetBaseUrl}/${assetId}`, token, forceCaching, progressCallback);
|
|
212
222
|
}
|
|
213
223
|
getAssetV4(assetId, assetDomain, token, forceCaching = false, progressCallback) {
|
|
214
224
|
if (!(0, AssetUtil_1.isValidUUID)(assetId)) {
|
|
215
225
|
throw new TypeError(`Expected asset ID "${assetId}" to only contain alphanumeric values and dashes.`);
|
|
216
226
|
}
|
|
217
|
-
const assetBaseUrl =
|
|
218
|
-
return this.getAssetShared(assetBaseUrl
|
|
227
|
+
const assetBaseUrl = this.backendFeatures.version >= 2 ? ASSET_URLS.ASSETS_URL : ASSET_URLS.ASSET_V4_URL;
|
|
228
|
+
return this.getAssetShared(`${assetBaseUrl}/${assetDomain}/${assetId}`, token, forceCaching, progressCallback);
|
|
219
229
|
}
|
|
220
230
|
getServiceAsset(assetId, token, forceCaching = false, progressCallback) {
|
|
221
231
|
if (!(0, AssetUtil_1.isValidUUID)(assetId)) {
|
|
222
232
|
throw new TypeError(`Expected asset ID "${assetId}" to only contain alphanumeric values and dashes.`);
|
|
223
233
|
}
|
|
224
|
-
const assetBaseUrl = `${
|
|
234
|
+
const assetBaseUrl = `${ASSET_URLS.ASSET_SERVICE_URL}/${assetId}`;
|
|
225
235
|
return this.getAssetShared(assetBaseUrl, token, forceCaching, progressCallback);
|
|
226
236
|
}
|
|
227
237
|
/**
|
|
@@ -232,18 +242,13 @@ class AssetAPI {
|
|
|
232
242
|
* @param progressCallback? Will be called at every progress of the upload
|
|
233
243
|
*/
|
|
234
244
|
postAsset(asset, options, progressCallback) {
|
|
235
|
-
|
|
245
|
+
const baseUrl = this.backendFeatures.version >= 2 ? ASSET_URLS.ASSETS_URL : ASSET_URLS.ASSET_V3_URL;
|
|
246
|
+
return this.postAssetShared(baseUrl, asset, options, progressCallback);
|
|
236
247
|
}
|
|
237
248
|
postServiceAsset(asset, options, progressCallback) {
|
|
238
|
-
const assetBaseUrl =
|
|
249
|
+
const assetBaseUrl = ASSET_URLS.ASSET_SERVICE_URL;
|
|
239
250
|
return this.postAssetShared(assetBaseUrl, asset, options, progressCallback);
|
|
240
251
|
}
|
|
241
252
|
}
|
|
242
253
|
exports.AssetAPI = AssetAPI;
|
|
243
|
-
AssetAPI.ASSET_V3_URL = '/assets/v3';
|
|
244
|
-
AssetAPI.ASSET_V4_URL = '/assets/v4';
|
|
245
|
-
AssetAPI.ASSET_SERVICE_URL = '/bot/assets';
|
|
246
|
-
AssetAPI.ASSET_V2_URL = '/otr/assets';
|
|
247
|
-
AssetAPI.ASSET_V2_CONVERSATION_URL = '/conversations';
|
|
248
|
-
AssetAPI.ASSET_V1_URL = '/assets';
|
|
249
254
|
//# sourceMappingURL=AssetAPI.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssetAPI.js","sourceRoot":"","sources":["AssetAPI.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;AAEH,kDAAgD;AAEhD,iEAA4D;AAC5D,iDAAyE;AACzE,mCAOkB;AAClB,2CAAsD;AACtD,kCAAiD;AACjD,iDAAwD;
|
|
1
|
+
{"version":3,"file":"AssetAPI.js","sourceRoot":"","sources":["AssetAPI.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,11 @@ export declare class AccessTokenStore extends EventEmitter {
|
|
|
11
11
|
private readonly logger;
|
|
12
12
|
static readonly TOPIC: typeof TOPIC;
|
|
13
13
|
accessToken?: AccessTokenData;
|
|
14
|
+
/**
|
|
15
|
+
* The date at which the token will be invalid. This value should be use with a grain of salt as there might be some time shift between browser and server time
|
|
16
|
+
* It is suggested to add an error margin
|
|
17
|
+
*/
|
|
18
|
+
tokenExpirationDate?: number;
|
|
14
19
|
constructor();
|
|
15
20
|
delete(): Promise<void>;
|
|
16
21
|
updateToken(accessToken: AccessTokenData): Promise<AccessTokenData>;
|
|
@@ -39,10 +39,12 @@ class AccessTokenStore extends events_1.EventEmitter {
|
|
|
39
39
|
async delete() {
|
|
40
40
|
this.logger.log('Deleting local access token');
|
|
41
41
|
this.accessToken = undefined;
|
|
42
|
+
this.tokenExpirationDate = undefined;
|
|
42
43
|
}
|
|
43
44
|
async updateToken(accessToken) {
|
|
44
45
|
if (this.accessToken !== accessToken) {
|
|
45
46
|
this.logger.log('Saving local access token');
|
|
47
|
+
this.tokenExpirationDate = Date.now() + accessToken.expires_in * 1000;
|
|
46
48
|
this.accessToken = accessToken;
|
|
47
49
|
this.emit(AccessTokenStore.TOPIC.ACCESS_TOKEN_REFRESH, this.accessToken);
|
|
48
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccessTokenStore.js","sourceRoot":"","sources":["AccessTokenStore.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;AAEH,mCAAoC;AACpC,sDAA8B;AAI9B,IAAK,KAEJ;AAFD,WAAK,KAAK;IACR,6EAAoE,CAAA;AACtE,CAAC,EAFI,KAAK,KAAL,KAAK,QAET;AAMD,MAAa,gBAAiB,SAAQ,qBAAY;
|
|
1
|
+
{"version":3,"file":"AccessTokenStore.js","sourceRoot":"","sources":["AccessTokenStore.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;AAEH,mCAAoC;AACpC,sDAA8B;AAI9B,IAAK,KAEJ;AAFD,WAAK,KAAK;IACR,6EAAoE,CAAA;AACtE,CAAC,EAFI,KAAK,KAAL,KAAK,QAET;AAMD,MAAa,gBAAiB,SAAQ,qBAAY;IAWhD;QACE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,MAAM,GAAG,IAAA,iBAAO,EAAC,sCAAsC,EAAE;YAC5D,MAAM,EAAE,OAAO;YACf,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAC/C,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;QAC7B,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,WAA4B;QACnD,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;YAC7C,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,UAAU,GAAG,IAAI,CAAC;YACtE,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,oBAAoB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;SAC1E;QACD,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;;AAlCH,4CAmCC;AAhCwB,sBAAK,GAAG,KAAK,CAAC"}
|
package/src/auth/AuthAPI.d.ts
CHANGED
|
@@ -12,7 +12,6 @@ export declare class AuthAPI {
|
|
|
12
12
|
ACCESS: string;
|
|
13
13
|
COOKIES: string;
|
|
14
14
|
EMAIL: string;
|
|
15
|
-
INITIATE_BIND: string;
|
|
16
15
|
INITIATE_LOGIN: string;
|
|
17
16
|
LOGIN: string;
|
|
18
17
|
LOGOUT: string;
|
|
@@ -38,5 +37,4 @@ export declare class AuthAPI {
|
|
|
38
37
|
email: string;
|
|
39
38
|
}): Promise<void>;
|
|
40
39
|
headInitiateLogin(ssoCode: string): Promise<void>;
|
|
41
|
-
headInitiateBind(ssoCode: string): Promise<void>;
|
|
42
40
|
}
|
package/src/auth/AuthAPI.js
CHANGED
|
@@ -146,20 +146,12 @@ class AuthAPI {
|
|
|
146
146
|
};
|
|
147
147
|
await this.client.sendJSON(config);
|
|
148
148
|
}
|
|
149
|
-
async headInitiateBind(ssoCode) {
|
|
150
|
-
const config = {
|
|
151
|
-
method: 'head',
|
|
152
|
-
url: `${AuthAPI.URL.INITIATE_BIND}/${ssoCode}`,
|
|
153
|
-
};
|
|
154
|
-
await this.client.sendJSON(config);
|
|
155
|
-
}
|
|
156
149
|
}
|
|
157
150
|
exports.AuthAPI = AuthAPI;
|
|
158
151
|
AuthAPI.URL = {
|
|
159
152
|
ACCESS: '/access',
|
|
160
153
|
COOKIES: '/cookies',
|
|
161
154
|
EMAIL: 'email',
|
|
162
|
-
INITIATE_BIND: '/sso-initiate-bind',
|
|
163
155
|
INITIATE_LOGIN: 'initiate-login',
|
|
164
156
|
LOGIN: '/login',
|
|
165
157
|
LOGOUT: 'logout',
|
package/src/auth/AuthAPI.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthAPI.js","sourceRoot":"","sources":["AuthAPI.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;;AAIH,mCAAqE;AACrE,uCAAsC;AACtC,+DAA8G;AAC9G,iDAA2E;AAO3E,MAAa,OAAO;IAClB,YAA6B,MAAkB;QAAlB,WAAM,GAAN,MAAM,CAAY;IAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"AuthAPI.js","sourceRoot":"","sources":["AuthAPI.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,15 @@ import type { PreKeyBundle } from '../auth/';
|
|
|
2
2
|
import type { CreateClientPayload, RegisteredClient, UpdateClientPayload } from '../client/';
|
|
3
3
|
import { HttpClient } from '../http/';
|
|
4
4
|
import { ClientCapabilityData } from './ClientCapabilityData';
|
|
5
|
+
declare type ClaimedKeyPackages = {
|
|
6
|
+
key_packages: {
|
|
7
|
+
client: string;
|
|
8
|
+
domain: string;
|
|
9
|
+
key_package: string;
|
|
10
|
+
key_package_ref: string;
|
|
11
|
+
user: string;
|
|
12
|
+
}[];
|
|
13
|
+
};
|
|
5
14
|
export declare class ClientAPI {
|
|
6
15
|
private readonly client;
|
|
7
16
|
constructor(client: HttpClient);
|
|
@@ -26,8 +35,24 @@ export declare class ClientAPI {
|
|
|
26
35
|
getClientPreKeys(clientId: string): Promise<PreKeyBundle>;
|
|
27
36
|
/**
|
|
28
37
|
* Will upload keypackages for an MLS capable client
|
|
29
|
-
* see https://staging-nginz-https.zinfra.io/api/swagger-ui/#/default/post_mls_key_packages_self__client_
|
|
30
|
-
* @param
|
|
38
|
+
* @see https://staging-nginz-https.zinfra.io/api/swagger-ui/#/default/post_mls_key_packages_self__client_
|
|
39
|
+
* @param {string} clientId The client to upload the key packages for
|
|
40
|
+
* @param {string[]} keyPackages The key packages to upload
|
|
31
41
|
*/
|
|
32
42
|
uploadMLSKeyPackages(clientId: string, keyPackages: string[]): Promise<void>;
|
|
43
|
+
/**
|
|
44
|
+
* Claim one key package for each client of the given user
|
|
45
|
+
* @param {string} userId The user to claim the key packages for
|
|
46
|
+
* @param {string} userDomain The domain of the user
|
|
47
|
+
* @param {string} skipOwn Do not claim a key package for the given own client id
|
|
48
|
+
* @see https://staging-nginz-https.zinfra.io/api/swagger-ui/#/default/post_mls_key_packages_claim__user_domain___user_
|
|
49
|
+
*/
|
|
50
|
+
claimMLSKeyPackages(userId: string, userDomain: string, skipOwn?: string): Promise<ClaimedKeyPackages>;
|
|
51
|
+
/**
|
|
52
|
+
* Get the number of unused key packages for the given client
|
|
53
|
+
* @param {string} clientId
|
|
54
|
+
* @see https://staging-nginz-https.zinfra.io/api/swagger-ui/#/default/get_mls_key_packages_self__client__count
|
|
55
|
+
*/
|
|
56
|
+
getMLSKeyPackageCount(clientId: string): Promise<number>;
|
|
33
57
|
}
|
|
58
|
+
export {};
|
package/src/client/ClientAPI.js
CHANGED
|
@@ -101,8 +101,9 @@ class ClientAPI {
|
|
|
101
101
|
}
|
|
102
102
|
/**
|
|
103
103
|
* Will upload keypackages for an MLS capable client
|
|
104
|
-
* see https://staging-nginz-https.zinfra.io/api/swagger-ui/#/default/post_mls_key_packages_self__client_
|
|
105
|
-
* @param
|
|
104
|
+
* @see https://staging-nginz-https.zinfra.io/api/swagger-ui/#/default/post_mls_key_packages_self__client_
|
|
105
|
+
* @param {string} clientId The client to upload the key packages for
|
|
106
|
+
* @param {string[]} keyPackages The key packages to upload
|
|
106
107
|
*/
|
|
107
108
|
async uploadMLSKeyPackages(clientId, keyPackages) {
|
|
108
109
|
const config = {
|
|
@@ -112,6 +113,34 @@ class ClientAPI {
|
|
|
112
113
|
};
|
|
113
114
|
await this.client.sendJSON(config, true);
|
|
114
115
|
}
|
|
116
|
+
/**
|
|
117
|
+
* Claim one key package for each client of the given user
|
|
118
|
+
* @param {string} userId The user to claim the key packages for
|
|
119
|
+
* @param {string} userDomain The domain of the user
|
|
120
|
+
* @param {string} skipOwn Do not claim a key package for the given own client id
|
|
121
|
+
* @see https://staging-nginz-https.zinfra.io/api/swagger-ui/#/default/post_mls_key_packages_claim__user_domain___user_
|
|
122
|
+
*/
|
|
123
|
+
async claimMLSKeyPackages(userId, userDomain, skipOwn) {
|
|
124
|
+
const config = {
|
|
125
|
+
method: 'POST',
|
|
126
|
+
url: `/${ClientAPI.URL.MLS_CLIENTS}/${ClientAPI.URL.MLS_KEY_PACKAGES}/claim/${userDomain}/${userId}${skipOwn ? `?skip_own=${skipOwn}` : ''}`,
|
|
127
|
+
};
|
|
128
|
+
const response = await this.client.sendJSON(config, true);
|
|
129
|
+
return response.data;
|
|
130
|
+
}
|
|
131
|
+
/**
|
|
132
|
+
* Get the number of unused key packages for the given client
|
|
133
|
+
* @param {string} clientId
|
|
134
|
+
* @see https://staging-nginz-https.zinfra.io/api/swagger-ui/#/default/get_mls_key_packages_self__client__count
|
|
135
|
+
*/
|
|
136
|
+
async getMLSKeyPackageCount(clientId) {
|
|
137
|
+
const config = {
|
|
138
|
+
method: 'GET',
|
|
139
|
+
url: `/${ClientAPI.URL.MLS_CLIENTS}/${ClientAPI.URL.MLS_KEY_PACKAGES}/self/${clientId}/count`,
|
|
140
|
+
};
|
|
141
|
+
const response = await this.client.sendJSON(config, true);
|
|
142
|
+
return response.data.count;
|
|
143
|
+
}
|
|
115
144
|
}
|
|
116
145
|
exports.ClientAPI = ClientAPI;
|
|
117
146
|
ClientAPI.URL = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientAPI.js","sourceRoot":"","sources":["ClientAPI.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AAMH,+CAA2D;AAC3D,mCAAqE;
|
|
1
|
+
{"version":3,"file":"ClientAPI.js","sourceRoot":"","sources":["ClientAPI.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ConversationMembers } from './';
|
|
1
|
+
import type { ConversationMembers, ConversationProtocol } from './';
|
|
2
2
|
import type { QualifiedId } from '../user';
|
|
3
3
|
import type { RECEIPT_MODE } from './data';
|
|
4
4
|
export declare enum CONVERSATION_TYPE {
|
|
@@ -60,5 +60,8 @@ export interface Conversation {
|
|
|
60
60
|
receipt_mode?: RECEIPT_MODE;
|
|
61
61
|
/** Users of a conversation */
|
|
62
62
|
members: ConversationMembers;
|
|
63
|
+
/** MLS conversations only */
|
|
64
|
+
group_id?: string;
|
|
65
|
+
protocol: ConversationProtocol;
|
|
63
66
|
}
|
|
64
67
|
export {};
|
|
@@ -1,16 +1,21 @@
|
|
|
1
1
|
import { proteus as ProtobufOTR } from '@wireapp/protocol-messaging/web/otr';
|
|
2
|
-
import
|
|
3
|
-
import type { ConversationAccessUpdateEvent, ConversationCodeDeleteEvent, ConversationCodeUpdateEvent, ConversationEvent, ConversationMemberJoinEvent, ConversationMemberLeaveEvent, ConversationMessageTimerUpdateEvent, ConversationReceiptModeUpdateEvent, ConversationRenameEvent } from '
|
|
4
|
-
import { HttpClient } from '
|
|
5
|
-
import type { ConversationAccessUpdateData, ConversationAccessV2UpdateData, ConversationJoinData, ConversationMemberUpdateData, ConversationMessageTimerUpdateData, ConversationNameUpdateData, ConversationOtherMemberUpdateData, ConversationReceiptModeUpdateData, ConversationTypingData } from '
|
|
6
|
-
import { QualifiedId } from '
|
|
7
|
-
import { BackendFeatures } from '
|
|
2
|
+
import { ClientMismatch, Conversation, ConversationCode, ConversationIds, ConversationRolesList, Conversations, Invite, Member, MessageSendingStatus, NewConversation, NewOTRMessage, RemoteConversations } from '..';
|
|
3
|
+
import type { ConversationAccessUpdateEvent, ConversationCodeDeleteEvent, ConversationCodeUpdateEvent, ConversationEvent, ConversationMemberJoinEvent, ConversationMemberLeaveEvent, ConversationMessageTimerUpdateEvent, ConversationReceiptModeUpdateEvent, ConversationRenameEvent } from '../../event';
|
|
4
|
+
import { HttpClient } from '../../http';
|
|
5
|
+
import type { ConversationAccessUpdateData, ConversationAccessV2UpdateData, ConversationJoinData, ConversationMemberUpdateData, ConversationMessageTimerUpdateData, ConversationNameUpdateData, ConversationOtherMemberUpdateData, ConversationReceiptModeUpdateData, ConversationTypingData } from '../data';
|
|
6
|
+
import { QualifiedId } from '../../user';
|
|
7
|
+
import { BackendFeatures } from '../../APIClient';
|
|
8
|
+
import { MlsEvent } from '../data/MlsEventData';
|
|
9
|
+
export declare type PostMlsMessageResponse = {
|
|
10
|
+
events: MlsEvent[];
|
|
11
|
+
time: string;
|
|
12
|
+
};
|
|
8
13
|
declare type ConversationGuestLinkStatus = {
|
|
9
14
|
status: 'enabled' | 'disabled';
|
|
10
15
|
};
|
|
11
16
|
export declare class ConversationAPI {
|
|
12
|
-
|
|
13
|
-
|
|
17
|
+
protected readonly client: HttpClient;
|
|
18
|
+
protected readonly backendFeatures: BackendFeatures;
|
|
14
19
|
static readonly MAX_CHUNK_SIZE = 500;
|
|
15
20
|
static readonly URL: {
|
|
16
21
|
ACCESS: string;
|
|
@@ -19,6 +24,7 @@ export declare class ConversationAPI {
|
|
|
19
24
|
CODE: string;
|
|
20
25
|
CODE_CHECK: string;
|
|
21
26
|
CONVERSATIONS: string;
|
|
27
|
+
MLS: string;
|
|
22
28
|
IDS: string;
|
|
23
29
|
JOIN: string;
|
|
24
30
|
LIST: string;
|
|
@@ -70,6 +76,10 @@ export declare class ConversationAPI {
|
|
|
70
76
|
* @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/conversations/getConversationCode
|
|
71
77
|
*/
|
|
72
78
|
getConversationCode(conversationId: string): Promise<ConversationCode>;
|
|
79
|
+
/**
|
|
80
|
+
* @param conversationId
|
|
81
|
+
* @deprecated use feature.getAllFeatures instead
|
|
82
|
+
*/
|
|
73
83
|
getConversationGuestLinkFeature(conversationId: string): Promise<ConversationGuestLinkStatus>;
|
|
74
84
|
getConversation(conversationId: string | QualifiedId): Promise<Conversation>;
|
|
75
85
|
/**
|
|
@@ -164,7 +174,7 @@ export declare class ConversationAPI {
|
|
|
164
174
|
/**
|
|
165
175
|
* Create a new conversation
|
|
166
176
|
* @param conversationData The new conversation
|
|
167
|
-
* @see https://staging-nginz-https.zinfra.io/swagger-ui
|
|
177
|
+
* @see https://staging-nginz-https.zinfra.io/api/swagger-ui/#/default/post_conversations
|
|
168
178
|
*/
|
|
169
179
|
postConversation(conversationData: NewConversation): Promise<Conversation>;
|
|
170
180
|
/**
|
|
@@ -248,6 +258,20 @@ export declare class ConversationAPI {
|
|
|
248
258
|
* @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/conversations/postOtrMessage
|
|
249
259
|
*/
|
|
250
260
|
postOTRProtobufMessage(sendingClientId: string, conversationId: string, messageData: ProtobufOTR.NewOtrMessage, ignoreMissing?: boolean | string[]): Promise<ClientMismatch>;
|
|
261
|
+
/**
|
|
262
|
+
* Post an encrypted message to a conversation.
|
|
263
|
+
* @param messageData Mls message payload in TLS format. Please refer to the MLS specification for details.
|
|
264
|
+
* @see https://messaginglayersecurity.rocks/mls-protocol/draft-ietf-mls-protocol.html#name-message-framing
|
|
265
|
+
* @see https://staging-nginz-https.zinfra.io/api/swagger-ui/#/default/post_mls_messages
|
|
266
|
+
*/
|
|
267
|
+
postMlsMessage(messageData: Uint8Array): Promise<PostMlsMessageResponse>;
|
|
268
|
+
/**
|
|
269
|
+
* Post the welcome encrypted message to a conversation.
|
|
270
|
+
* @param messageData Mls welocome message payload in TLS format. Please refer to the MLS specification for details.
|
|
271
|
+
* @see https://messaginglayersecurity.rocks/mls-protocol/draft-ietf-mls-protocol.html#name-message-framing
|
|
272
|
+
* @see https://staging-nginz-https.zinfra.io/api/swagger-ui/#/default/post_mls_welcome
|
|
273
|
+
*/
|
|
274
|
+
postMlsWelcomeMessage(messageData: Uint8Array): Promise<void>;
|
|
251
275
|
postForClients(clientId: string, conversationId: string): Promise<ClientMismatch>;
|
|
252
276
|
/**
|
|
253
277
|
* Create a self-conversation.
|
|
@@ -292,16 +316,15 @@ export declare class ConversationAPI {
|
|
|
292
316
|
/**
|
|
293
317
|
* Add users to an existing conversation.
|
|
294
318
|
* @param conversationId The conversation ID to add the users to
|
|
295
|
-
* @param
|
|
296
|
-
* @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/conversations/addMembers
|
|
319
|
+
* @param users List of users to add to a conversation
|
|
297
320
|
*/
|
|
298
321
|
private postMembersV0;
|
|
299
322
|
/**
|
|
300
|
-
* Add qualified members to an existing conversation.
|
|
323
|
+
* Add qualified members to an existing Proteus conversation.
|
|
301
324
|
* @param conversationId The conversation ID to add the users to
|
|
302
325
|
* @param users List of users to add to a conversation
|
|
303
326
|
*/
|
|
304
|
-
postMembers(conversationId:
|
|
327
|
+
postMembers(conversationId: QualifiedId, users: QualifiedId[]): Promise<ConversationMemberJoinEvent>;
|
|
305
328
|
/**
|
|
306
329
|
* Update membership of the specified user in a certain conversation
|
|
307
330
|
* @param userId The user ID
|