@wireapp/api-client 24.3.0 → 24.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/self/Self.d.ts +1 -2
- package/lib/self/Self.d.ts.map +1 -1
- package/lib/user/User.d.ts +1 -1
- package/lib/user/User.d.ts.map +1 -1
- package/lib/user/UserAPI.d.ts.map +1 -1
- package/lib/user/UserAPI.js +35 -5
- package/package.json +2 -2
package/lib/self/Self.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SSOSignature } from '../self/';
|
|
2
|
-
import {
|
|
2
|
+
import { ManagedSource, User } from '../user/';
|
|
3
3
|
export interface Self extends User {
|
|
4
4
|
locale: string;
|
|
5
5
|
/**
|
|
@@ -8,7 +8,6 @@ export interface Self extends User {
|
|
|
8
8
|
*/
|
|
9
9
|
managed_by?: ManagedSource;
|
|
10
10
|
phone?: string;
|
|
11
|
-
qualified_id?: QualifiedId;
|
|
12
11
|
sso_id?: SSOSignature;
|
|
13
12
|
}
|
|
14
13
|
//# sourceMappingURL=Self.d.ts.map
|
package/lib/self/Self.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Self.d.ts","sourceRoot":"","sources":["../../src/self/Self.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"Self.d.ts","sourceRoot":"","sources":["../../src/self/Self.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,EAAC,aAAa,EAAE,IAAI,EAAC,MAAM,UAAU,CAAC;AAE7C,MAAM,WAAW,IAAK,SAAQ,IAAI;IAChC,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,YAAY,CAAC;CACvB"}
|
package/lib/user/User.d.ts
CHANGED
package/lib/user/User.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"User.d.ts","sourceRoot":"","sources":["../../src/user/User.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,OAAO,EAAC,MAAM,UAAU,CAAC;AACjC,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AAEnC,MAAM,WAAW,IAAI;IACnB,SAAS,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC;IACtC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,YAAY,
|
|
1
|
+
{"version":3,"file":"User.d.ts","sourceRoot":"","sources":["../../src/user/User.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,OAAO,EAAC,MAAM,UAAU,CAAC;AACjC,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AAEnC,MAAM,WAAW,IAAI;IACnB,SAAS,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC;IACtC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,YAAY,EAAE,WAAW,CAAC;IAC1B,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}
|
|
@@ -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,
|
|
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,EAAkC,UAAU,EAAE,iBAAiB,EAAsB,MAAM,UAAU,CAAC;AAC7G,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,KAAK,eAAe,GAAG;IACrB,6BAA6B,EAAE,4BAA4B,CAAC;IAC5D,cAAc,CAAC,EAAE,WAAW,EAAE,CAAC;CAChC,CAAC;AAKF,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC;CAC3B,CAAC;AAKF,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,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAYvE;;;;;;OAMG;IACU,QAAQ,CACnB,UAAU,EAAE;QAAC,GAAG,EAAE,MAAM,EAAE,CAAA;KAAC,GAAG;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAC,EACjD,KAAK,GAAE,MAAyC,GAC/C,OAAO,CAAC,IAAI,EAAE,CAAC;IAmClB;;;;OAIG;IACU,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAK9D;;OAEG;IACU,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAcnE;;;;;OAKG;IACU,cAAc,CAAC,cAAc,EAAE,QAAQ,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAWlF;;;;OAIG;IACU,kBAAkB,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUtF;;;;OAIG;IACU,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/F;;;;OAIG;IACU,UAAU,CAAC,gBAAgB,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAUtE;;;;OAIG;IACU,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAWlE;;;;OAIG;IACU,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAStD;;;;OAIG;IACU,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;YAUtD,2BAA2B;IAWzC;;;OAGG;IACU,aAAa,CACxB,KAAK,EAAE;QAAC,aAAa,EAAE,WAAW,EAAE,CAAA;KAAC,GAAG;QAAC,iBAAiB,EAAE,eAAe,EAAE,CAAA;KAAC,GAC7E,OAAO,CAAC,YAAY,CAAC;IA6CxB;;OAEG;IACU,eAAe,CAAC,UAAU,EAAE,0BAA0B,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAcrG;;;OAGG;IACU,sBAAsB,CACjC,aAAa,EAAE,oBAAoB,EACnC,KAAK,GAAE,MAAuD,GAC7D,OAAO,CAAC,eAAe,CAAC;IAwC3B;;;;;OAKG;IACU,iBAAiB,CAAC,SAAS,EAAE,gBAAgB,GAAG,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUlG;;;;;OAKG;IACU,WAAW,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAUhF;;;;OAIG;IACU,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAU3D;;;;OAIG;IACU,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAQ9E"}
|
package/lib/user/UserAPI.js
CHANGED
|
@@ -27,7 +27,7 @@ const commons_1 = require("@wireapp/commons");
|
|
|
27
27
|
const UserError_1 = require("./UserError");
|
|
28
28
|
const http_1 = require("../http/");
|
|
29
29
|
function isPrekeysResponse(object) {
|
|
30
|
-
return object.qualified_user_client_prekeys
|
|
30
|
+
return object.qualified_user_client_prekeys;
|
|
31
31
|
}
|
|
32
32
|
function isUsersResponse(object) {
|
|
33
33
|
return object.found || object.failed || object.not_found;
|
|
@@ -411,11 +411,41 @@ class UserAPI {
|
|
|
411
411
|
method: 'post',
|
|
412
412
|
url: UserAPI.URL.LIST_USERS,
|
|
413
413
|
};
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
414
|
+
try {
|
|
415
|
+
/**
|
|
416
|
+
* We expect two differents responses depending on which version of the API the back-end is running
|
|
417
|
+
* of type UserResponse in the case of a newer back-end
|
|
418
|
+
* of type User[] in the case of an older back-end
|
|
419
|
+
*/
|
|
420
|
+
const { data: userData } = await this.client.sendJSON(config);
|
|
421
|
+
/* If the response is of type UserResponse, the webapp consumes it as is */
|
|
422
|
+
if (isUsersResponse(userData)) {
|
|
423
|
+
return userData;
|
|
424
|
+
}
|
|
425
|
+
/* If the response is of type User[], we format it in a way that the webapp can consume */
|
|
426
|
+
return { found: userData };
|
|
427
|
+
}
|
|
428
|
+
catch (error) {
|
|
429
|
+
/* We handle errors with the older API by re-fetching users on the same back-end and returning all federated users as "failed" */
|
|
430
|
+
if ([
|
|
431
|
+
http_1.BackendErrorLabel.FEDERATION_NOT_AVAILABLE,
|
|
432
|
+
http_1.BackendErrorLabel.FEDERATION_BACKEND_NOT_FOUND,
|
|
433
|
+
http_1.BackendErrorLabel.FEDERATION_REMOTE_ERROR,
|
|
434
|
+
http_1.BackendErrorLabel.FEDERATION_TLS_ERROR,
|
|
435
|
+
].includes(error.label) &&
|
|
436
|
+
'qualified_ids' in users) {
|
|
437
|
+
const selfDomain = this.backendFeatures.domain;
|
|
438
|
+
const sameBackendUsers = users.qualified_ids.filter(userId => userId.domain === selfDomain);
|
|
439
|
+
const federatedUsers = users.qualified_ids.filter(userId => userId.domain !== selfDomain);
|
|
440
|
+
const { data: sameBackendUserData } = await this.client.sendJSON({
|
|
441
|
+
data: { qualified_ids: sameBackendUsers },
|
|
442
|
+
method: 'post',
|
|
443
|
+
url: UserAPI.URL.LIST_USERS,
|
|
444
|
+
});
|
|
445
|
+
return { found: sameBackendUserData, failed: federatedUsers };
|
|
446
|
+
}
|
|
447
|
+
throw error;
|
|
417
448
|
}
|
|
418
|
-
return { found: userData };
|
|
419
449
|
}
|
|
420
450
|
/**
|
|
421
451
|
* Get client infos from a list of users.
|
package/package.json
CHANGED