hevy-shared 1.0.824 → 1.0.826

package/built/API/APIClient.d.ts

@@ -82,11 +82,12 @@ export declare class HevyAPIClient {
     private static readonly DEFAULT_REFRESH_AUTH_TOKEN_API_ENDPOINT;
     private readonly _config;
     private _errorHandlers;
-    private _authToken;
+    private _authTokenFactory;
     private _legacyAuthToken;
     private _httpClient;
     private _lastTokenRefresh;
     constructor(httpClient: HTTPClient, config: HevyAPIClientConfig);
+    private get _authToken();
     private get _authHeaders();
     private _addAuthHeaders;
     private refreshExpiredAuthToken;
@@ -101,10 +102,14 @@ export declare class HevyAPIClient {
         readonly method: "post";
         readonly url: string;
     };
-    setAuthToken(newAuthToken: DeepReadonly<{
-        authToken: ClientAuthToken | null;
+    setAuthToken(newAuthToken: {
+        authToken: DeepReadonly<ClientAuthToken> | null;
         legacyAuthToken: string | null;
-    }>): Promise<void>;
+    }): Promise<void>;
+    setAuthToken(newAuthToken: {
+        getAuthToken: () => ClientAuthToken | null;
+        legacyAuthToken: string | null;
+    }): Promise<void>;
     clearAuthToken(): Promise<void>;
     attachErrorHandler(onError: HTTPErrorHandler<{
         willRetry: boolean;

package/built/API/APIClient.js

@@ -21,7 +21,10 @@ const types_1 = require("./types");
 class HevyAPIClient {
     constructor(httpClient, config) {
         this._errorHandlers = [];
-        this._authToken = null;
+        this._authTokenFactory = {
+            type: 'value',
+            value: null,
+        };
         this._legacyAuthToken = null;
         this._addAuthHeaders = (config) => (Object.assign(Object.assign({}, config), { headers: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.headers), this._authHeaders) }));
         this._httpClient = httpClient;
@@ -36,6 +39,14 @@ class HevyAPIClient {
                 this[m] = this[m].bind(this);
         });
     }
+    get _authToken() {
+        switch (this._authTokenFactory.type) {
+            case 'value':
+                return this._authTokenFactory.value;
+            case 'getter':
+                return this._authTokenFactory.get();
+        }
+    }
     get _authHeaders() {
         return this._authToken
             ? { authorization: `Bearer ${this._authToken.access_token}` }
@@ -118,7 +129,9 @@ class HevyAPIClient {
             if (newToken.expires_at.valueOf() < earliestAutoRefreshUnixMs) {
                 newToken.expires_at = new Date(earliestAutoRefreshUnixMs);
             }
-            this._authToken = newToken;
+            if (this._authTokenFactory.type === 'value') {
+                this._authTokenFactory.value = newToken;
+            }
             this._config.onNewAuthToken(newToken);
         });
     }
@@ -180,14 +193,16 @@ class HevyAPIClient {
     setAuthToken(newAuthToken) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.waitForTokenRefresh();
-            const { authToken, legacyAuthToken } = newAuthToken;
-            this._authToken = authToken
-                ? {
-                    access_token: authToken.access_token,
-                    refresh_token: authToken.refresh_token,
-                    expires_at: new Date(authToken.expires_at),
-                }
-                : null;
+            const { authToken, getAuthToken, legacyAuthToken } = newAuthToken;
+            if (getAuthToken !== undefined && authToken === undefined) {
+                this._authTokenFactory = { type: 'getter', get: getAuthToken };
+            }
+            else if (authToken !== undefined && getAuthToken === undefined) {
+                this._authTokenFactory = { type: 'value', value: authToken };
+            }
+            else {
+                throw new Error("Invalid arguments: exactly one of `authToken' or `getAuthToken' is required");
+            }
             this._legacyAuthToken = legacyAuthToken;
             this._lastTokenRefresh = undefined;
         });
@@ -195,7 +210,7 @@ class HevyAPIClient {
     clearAuthToken() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.waitForTokenRefresh();
-            this._authToken = null;
+            this._authTokenFactory = { type: 'value', value: null };
             this._legacyAuthToken = null;
             this._lastTokenRefresh = undefined;
         });

package/built/index.d.ts

@@ -230,6 +230,7 @@ export interface ClientAuthTokenResponse {
     refresh_token: string;
     expires_at: string;
 }
+export declare const parseClientAuthTokenResponse: (data: ClientAuthTokenResponse) => ClientAuthToken | null;
 export interface UsernameAvailabilityResponse {
     isAvailable: boolean;
     suggestions: string[];

package/built/index.js

@@ -14,8 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWorkoutBiometrics = exports.isHeartRateSamples = exports.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.isSetPersonalRecordType = exports.supportedInstructionsLanguages = exports.weeklyTrainingFrequencies = exports.hevyTrainerProgramEquipments = exports.exerciseCategories = exports.trainingLevels = exports.trainingGoals = exports.isCustomExerciseType = exports.customExericseTypes = exports.isExerciseType = exports.exerciseTypes = exports.isExerciseRepType = exports.exerciseRepTypes = exports.isEquipmentFilter = exports.equipmentFilters = exports.isEquipment = exports.equipments = exports.simplifiedMuscleGroupToMuscleGroups = exports.isMuscleGroupFilter = exports.muscleGroupFilters = exports.isMuscleGroup = exports.muscleGroups = exports.isSimplifiedMuscleGroup = exports.simplifiedMuscleGroups = exports.miscellaneousMuscles = exports.chestMuscles = exports.backMuscles = exports.legMuscles = exports.armMuscles = exports.shoulderMuscles = exports.coreMuscles = exports.DefaultClientConfiguration = exports.isCoachRole = exports.isErrorResponse = exports.isLivePRVolumeOption = exports.isTimerVolumeOption = exports.isWeekday = exports.orderedWeekdays = exports.isBodyMeasurementUnit = exports.isDistanceUnitShort = exports.isDistanceUnit = exports.isWeightUnit = exports.isLanguage = exports.supportedLanguages = void 0;
-exports.isSuggestedUserSource = exports.isValidUserWorkoutMetricsType = exports.isBodyMeasurementKey = exports.measurementsList = exports.isHevyTrainerRoutine = void 0;
+exports.isHeartRateSamples = exports.isPublicWorkout = exports.isSetType = exports.isRPE = exports.validRpeValues = exports.isSetPersonalRecordType = exports.supportedInstructionsLanguages = exports.weeklyTrainingFrequencies = exports.hevyTrainerProgramEquipments = exports.exerciseCategories = exports.trainingLevels = exports.trainingGoals = exports.isCustomExerciseType = exports.customExericseTypes = exports.isExerciseType = exports.exerciseTypes = exports.isExerciseRepType = exports.exerciseRepTypes = exports.isEquipmentFilter = exports.equipmentFilters = exports.isEquipment = exports.equipments = exports.simplifiedMuscleGroupToMuscleGroups = exports.isMuscleGroupFilter = exports.muscleGroupFilters = exports.isMuscleGroup = exports.muscleGroups = exports.isSimplifiedMuscleGroup = exports.simplifiedMuscleGroups = exports.miscellaneousMuscles = exports.chestMuscles = exports.backMuscles = exports.legMuscles = exports.armMuscles = exports.shoulderMuscles = exports.coreMuscles = exports.DefaultClientConfiguration = exports.parseClientAuthTokenResponse = exports.isCoachRole = exports.isErrorResponse = exports.isLivePRVolumeOption = exports.isTimerVolumeOption = exports.isWeekday = exports.orderedWeekdays = exports.isBodyMeasurementUnit = exports.isDistanceUnitShort = exports.isDistanceUnit = exports.isWeightUnit = exports.isLanguage = exports.supportedLanguages = void 0;
+exports.isSuggestedUserSource = exports.isValidUserWorkoutMetricsType = exports.isBodyMeasurementKey = exports.measurementsList = exports.isHevyTrainerRoutine = exports.isWorkoutBiometrics = void 0;
 const typeUtils_1 = require("./typeUtils");
 __exportStar(require("./constants"), exports);
 __exportStar(require("./utils"), exports);
@@ -94,6 +94,22 @@ exports.isErrorResponse = isErrorResponse;
 const _coachRoles = ['member', 'admin', 'owner'];
 const isCoachRole = (role) => (0, typeUtils_1.isInArray)(role, _coachRoles);
 exports.isCoachRole = isCoachRole;
+const parseClientAuthTokenResponse = (data) => typeof data === 'object' &&
+    !!data &&
+    typeof data.access_token === 'string' &&
+    data.access_token.length > 0 &&
+    typeof data.refresh_token === 'string' &&
+    data.refresh_token.length > 0 &&
+    typeof data.expires_at === 'string' &&
+    data.expires_at.length > 0 &&
+    !!new Date(data.expires_at).valueOf()
+    ? {
+        access_token: data.access_token,
+        refresh_token: data.refresh_token,
+        expires_at: new Date(data.expires_at),
+    }
+    : null;
+exports.parseClientAuthTokenResponse = parseClientAuthTokenResponse;
 exports.DefaultClientConfiguration = {
     is_chat_enabled: false,
     are_notifications_enabled: true,

package/package.json

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