hevy-shared 1.0.875 → 1.0.876

package/built/API/APIClient.d.ts

@@ -95,6 +95,7 @@ export declare class HevyAPIClient<UserContext = never> {
     private _legacyAuthToken;
     private _httpClient;
     private _lastTokenRefresh;
+    private _lastSessionDelete;
     constructor(httpClient: HTTPClient, config: HevyAPIClientConfig<UserContext>);
     private get _authToken();
     private get _authHeaders();
@@ -121,9 +122,11 @@ export declare class HevyAPIClient<UserContext = never> {
     }): Promise<void>;
     clearAuthToken(): Promise<void>;
     get isAuthenticated(): boolean;
+    markSessionDeleted(): void;
     attachErrorHandler(onError: HTTPErrorHandler<{
         willRetry: boolean;
         isTokenRefreshedAfterRequest: boolean;
+        isPreviousSession: boolean;
     }>): void;
     removeErrorHandlers(): void;
     get<T = never>(url: string, config?: RequestConfig): Promise<HTTPResponse<T>>;

package/built/API/APIClient.js

@@ -161,9 +161,19 @@ class HevyAPIClient {
                  */
                 const isTokenRefreshedAfterRequest = this._lastTokenRefresh !== undefined &&
                     requestTime < this._lastTokenRefresh;
+                /**
+                 * Similar to the above, but this will be `true` if the user has logged
+                 * out after the request was made, i.e. the session that the request was
+                 * made within is is (probably) no longer valid. In this case, we don't
+                 * want to retry the request, but we also don't want to log the user out,
+                 * in case that they've logged in to another session in the meantime.
+                 */
+                const isPreviousSession = this._lastSessionDelete !== undefined &&
+                    requestTime < this._lastSessionDelete;
                 this._errorHandlers.forEach((cb) => cb(response, request, {
                     willRetry: retryOnFailure,
                     isTokenRefreshedAfterRequest,
+                    isPreviousSession,
                 }));
                 if (retryOnFailure && this.isAccessTokenExpiredResponse(response)) {
                     yield this.forceRefreshAuthToken(userContext);
@@ -171,7 +181,8 @@ class HevyAPIClient {
                 }
                 else if (retryOnFailure &&
                     this.isAccessTokenInvalidResponse(response) &&
-                    isTokenRefreshedAfterRequest) {
+                    isTokenRefreshedAfterRequest &&
+                    !isPreviousSession) {
                     yield this.waitForTokenRefresh();
                     return yield this._handleResponse(request, userContext, false);
                 }
@@ -224,6 +235,9 @@ class HevyAPIClient {
             return true;
         }
     }
+    markSessionDeleted() {
+        this._lastSessionDelete = new Date();
+    }
     attachErrorHandler(onError) {
         this._errorHandlers.push(onError);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hevy-shared",
-  "version": "1.0.875",
+  "version": "1.0.876",
   "description": "",
   "main": "built/index.js",
   "types": "built/index.d.ts",