@wireapp/api-client 19.6.3 → 19.6.4
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/CHANGELOG.md +11 -0
- package/package.json +2 -2
- 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/http/HttpClient.d.ts +6 -0
- package/src/http/HttpClient.js +13 -0
- package/src/http/HttpClient.js.map +1 -1
- package/src/tcp/WebSocketClient.js +4 -0
- package/src/tcp/WebSocketClient.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [19.6.4](https://github.com/wireapp/wire-web-packages/tree/main/packages/api-client/compare/@wireapp/api-client@19.6.3...@wireapp/api-client@19.6.4) (2022-06-15)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **core:** Make sure access token is valid before connecting to websocket ([#4293](https://github.com/wireapp/wire-web-packages/tree/main/packages/api-client/issues/4293)) ([1ef45a5](https://github.com/wireapp/wire-web-packages/tree/main/packages/api-client/commit/1ef45a5a60a086d4ebe0a512813d4677e7b99ded))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [19.6.3](https://github.com/wireapp/wire-web-packages/tree/main/packages/api-client/compare/@wireapp/api-client@19.6.2...@wireapp/api-client@19.6.3) (2022-06-15)
|
|
7
18
|
|
|
8
19
|
**Note:** Version bump only for package @wireapp/api-client
|
package/package.json
CHANGED
|
@@ -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/http/HttpClient.d.ts
CHANGED
|
@@ -29,6 +29,12 @@ export declare class HttpClient extends EventEmitter {
|
|
|
29
29
|
static isBackendError(errorCandidate: any): errorCandidate is AxiosError<BackendError> & {
|
|
30
30
|
response: BackendError;
|
|
31
31
|
};
|
|
32
|
+
/**
|
|
33
|
+
* Will return true if the stored access token is still valid (not expired)
|
|
34
|
+
*
|
|
35
|
+
* @param {number} errorMargin - Since the expiration date is subject to time shift between client and server, an error margin can be used. Defaults to 10s
|
|
36
|
+
*/
|
|
37
|
+
hasValidAccessToken(errorMargin?: number): boolean;
|
|
32
38
|
refreshAccessToken(): Promise<AccessTokenData>;
|
|
33
39
|
postAccess(expiredAccessToken?: AccessTokenData): Promise<AccessTokenData>;
|
|
34
40
|
sendRequest<T>(config: AxiosRequestConfig, tokenAsParam?: boolean, isSynchronousRequest?: boolean): Promise<AxiosResponse<T>>;
|
package/src/http/HttpClient.js
CHANGED
|
@@ -162,6 +162,19 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
162
162
|
}
|
|
163
163
|
return false;
|
|
164
164
|
}
|
|
165
|
+
/**
|
|
166
|
+
* Will return true if the stored access token is still valid (not expired)
|
|
167
|
+
*
|
|
168
|
+
* @param {number} errorMargin - Since the expiration date is subject to time shift between client and server, an error margin can be used. Defaults to 10s
|
|
169
|
+
*/
|
|
170
|
+
hasValidAccessToken(errorMargin = 10000) {
|
|
171
|
+
if (this.accessTokenStore.tokenExpirationDate) {
|
|
172
|
+
const now = Date.now();
|
|
173
|
+
const expirationDate = this.accessTokenStore.tokenExpirationDate;
|
|
174
|
+
return expirationDate - errorMargin >= now;
|
|
175
|
+
}
|
|
176
|
+
return false;
|
|
177
|
+
}
|
|
165
178
|
async refreshAccessToken() {
|
|
166
179
|
var _a;
|
|
167
180
|
let expiredAccessToken;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["HttpClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["HttpClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,6 +63,10 @@ class WebSocketClient extends events_1.EventEmitter {
|
|
|
63
63
|
await this.refreshAccessToken();
|
|
64
64
|
};
|
|
65
65
|
this.onReconnect = async () => {
|
|
66
|
+
if (!this.client.hasValidAccessToken()) {
|
|
67
|
+
// before we try any connection, we first refresh the access token to make sure we will avoid concurrent accessToken refreshes
|
|
68
|
+
await this.refreshAccessToken();
|
|
69
|
+
}
|
|
66
70
|
// Note: Do NOT await `onConnect` otherwise the websocket will not connect during notification stream processing
|
|
67
71
|
void this.onConnect();
|
|
68
72
|
return this.buildWebSocketUrl();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketClient.js","sourceRoot":"","sources":["WebSocketClient.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;AAEH,mCAAoC;AACpC,sDAA8B;AAG9B,mCAAkD;AAClD,mCAA+D;AAC/D,mEAA+E;AAG/E,IAAK,KAKJ;AALD,WAAK,KAAK;IACR,oDAA2C,CAAA;IAC3C,oEAA2D,CAAA;IAC3D,wDAA+C,CAAA;IAC/C,kEAAyD,CAAA;AAC3D,CAAC,EALI,KAAK,KAAL,KAAK,QAKT;AASD,MAAa,YAAY;IAAzB;QACU,YAAO,GAAG,KAAK,CAAC;QAExB,UAAK,GAAG,GAAG,EAAE;YACX,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACtB,CAAC,CAAC;QAEF,cAAS,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;IACjC,CAAC;CAAA;AARD,oCAQC;AAID,MAAa,eAAgB,SAAQ,qBAAY;IAe/C,YAAY,OAAe,EAAE,MAAkB;QAC7C,KAAK,EAAE,CAAC;QANF,cAAS,GAAwB,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QA6BhD,cAAS,GAAG,CAAC,IAAY,EAAE,EAAE;YAC5C,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;gBACnB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAClC;iBAAM;gBACL,MAAM,YAAY,GAAiB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACpD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;aAC3D;QACH,CAAC,CAAC;QAEe,YAAO,GAAG,KAAK,EAAE,KAAiB,EAAE,EAAE;YACrD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC3C,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClC,CAAC,CAAC;QAEe,gBAAW,GAAG,KAAK,IAAI,EAAE;YACxC,gHAAgH;YAChH,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAClC,CAAC,CAAC;QAEe,WAAM,GAAG,CAAC,KAAY,EAAE,EAAE;YACzC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7C,CAAC,CAAC;QAEe,YAAO,GAAG,CAAC,KAAiB,EAAE,EAAE;;YAC/C,MAAA,IAAI,CAAC,YAAY,0CAAE,KAAK,EAAE,CAAC;YAC3B,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;YAC3B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7C,CAAC,CAAC;QAuEF;;;;WAIG;QACa,WAAM,GAAG,GAAG,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,IAAI,CAAC,gBAAgB,CAAC,MAAM,wBAAwB,CAAC,CAAC;YAC1G,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;YAC5B,KAAK,MAAM,eAAe,IAAI,IAAI,CAAC,gBAAgB,EAAE;gBACnD,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;aACjC;YACD,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC7B,CAAC,CAAC;QAEF;;;;;WAKG;QACa,SAAI,GAAG,GAAG,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACtC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC7B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"WebSocketClient.js","sourceRoot":"","sources":["WebSocketClient.ts"],"names":[],"mappings":"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"}
|