@techstuff-dev/foundation-api-utils 1.17.0 → 1.19.0

package/dist/@types/lib/services/auth/slice.d.ts

@@ -35,24 +35,24 @@ export declare const authSlice: import("@reduxjs/toolkit").Slice<AuthState, {
             details: {
                 subscription: any;
                 subscriptionDetails: any;
-                userSub?: string | undefined;
-                uuid?: string | undefined;
-                firstName?: string | undefined;
-                lastName?: string | undefined;
-                userEmail?: string | undefined;
-                avatar?: string | undefined;
-                termsAccepted?: string | undefined;
-                dateOfBirth?: string | undefined;
-                contactPreference?: boolean | undefined;
-                password?: string | undefined;
-                passwordConfirm?: string | undefined;
-                agency?: boolean | undefined;
+                userSub?: string;
+                uuid?: string;
+                firstName?: string;
+                lastName?: string;
+                userEmail?: string;
+                picture?: string;
+                termsAccepted?: string;
+                dateOfBirth?: string;
+                contactPreference?: boolean;
+                password?: string;
+                passwordConfirm?: string;
+                agency?: boolean;
             };
             accessToken?: string | undefined;
             idToken?: string | undefined;
             refreshToken?: string | undefined;
             expires?: number | undefined;
-            accessTokenExpiry?: number | null | undefined;
+            accessTokenExpiry?: (number | null) | undefined;
             email?: string | undefined;
             info?: import("immer").WritableDraft<import("../../types/index.interfaces").Info> | undefined;
             sub?: string | undefined;
@@ -96,7 +96,7 @@ export declare const authSlice: import("@reduxjs/toolkit").Slice<AuthState, {
         amount: number;
         interval: string;
         currency: string;
-        cancelAt?: number | undefined;
+        cancelAt?: number;
         planID: string;
         planDescription: string;
         paymentDetails: {
@@ -179,7 +179,7 @@ export declare const isAuthenticated: import("reselect").Selector<{
     amount: number;
     interval: string;
     currency: string;
-    cancelAt?: number | undefined;
+    cancelAt?: number;
     planID: string;
     planDescription: string;
     paymentDetails: {
@@ -195,7 +195,7 @@ export declare const isAuthenticated: import("reselect").Selector<{
         amount: number;
         interval: string;
         currency: string;
-        cancelAt?: number | undefined;
+        cancelAt?: number;
         planID: string;
         planDescription: string;
         paymentDetails: {

package/dist/@types/lib/services/content/content.interfaces.d.ts

@@ -13,6 +13,7 @@ interface UserPayload {
     given_name: string;
     family_name: string;
     birthdate: string;
+    picture: string;
     'cognito:username': string;
     'custom:termsAccepted': string;
     'custom:subscriptionId': string;

package/dist/@types/lib/services/content/index.d.ts

@@ -65,10 +65,10 @@ export declare const useGetDataQuery: <R extends Record<string, any> = import("@
 }, "error">>)>> & {
     status: import("@reduxjs/toolkit/query").QueryStatus;
 }>(arg: DataArgs | typeof import("@reduxjs/toolkit/query").skipToken, options?: (import("@reduxjs/toolkit/query").SubscriptionOptions & {
-    skip?: boolean | undefined;
-    refetchOnMountOrArgChange?: number | boolean | undefined;
+    skip?: boolean;
+    refetchOnMountOrArgChange?: boolean | number;
 } & {
-    skip?: boolean | undefined;
+    skip?: boolean;
     selectFromResult?: ((state: import("@reduxjs/toolkit/query").TSHelpersId<(Omit<{
         status: import("@reduxjs/toolkit/query").QueryStatus.uninitialized;
         originalArgs?: undefined;
@@ -197,7 +197,7 @@ export declare const useGetDataQuery: <R extends Record<string, any> = import("@
 }, "error">>)>> & {
     status: import("@reduxjs/toolkit/query").QueryStatus;
 }>(options?: (import("@reduxjs/toolkit/query").SubscriptionOptions & Omit<{
-    skip?: boolean | undefined;
+    skip?: boolean;
     selectFromResult?: ((state: import("@reduxjs/toolkit/query").TSHelpersId<(Omit<{
         status: import("@reduxjs/toolkit/query").QueryStatus.uninitialized;
         originalArgs?: undefined;
@@ -261,7 +261,7 @@ export declare const useGetDataQuery: <R extends Record<string, any> = import("@
     }, "error">>)>> & {
         status: import("@reduxjs/toolkit/query").QueryStatus;
     }) => R) | undefined;
-}, "skip">) | undefined) => [(arg: DataArgs, preferCacheValue?: boolean | undefined) => import("@reduxjs/toolkit/query").QueryActionCreatorResult<import("@reduxjs/toolkit/query").QueryDefinition<DataArgs, import("@reduxjs/toolkit/query").BaseQueryFn<string | import("@reduxjs/toolkit/query").FetchArgs, unknown, import("@reduxjs/toolkit/query").FetchBaseQueryError, {}, import("@reduxjs/toolkit/query").FetchBaseQueryMeta>, "Data" | "Workout", ESDataTypes, "contentApi">>, [R][R extends any ? 0 : never], {
+}, "skip">) | undefined) => [(arg: DataArgs, preferCacheValue?: boolean) => import("@reduxjs/toolkit/query").QueryActionCreatorResult<import("@reduxjs/toolkit/query").QueryDefinition<DataArgs, import("@reduxjs/toolkit/query").BaseQueryFn<string | import("@reduxjs/toolkit/query").FetchArgs, unknown, import("@reduxjs/toolkit/query").FetchBaseQueryError, {}, import("@reduxjs/toolkit/query").FetchBaseQueryMeta>, "Data" | "Workout", ESDataTypes, "contentApi">>, [R][R extends any ? 0 : never], {
     lastArg: DataArgs;
 }], useGetDataByIdQuery: <R extends Record<string, any> = import("@reduxjs/toolkit/query").TSHelpersId<(Omit<{
     status: import("@reduxjs/toolkit/query").QueryStatus.uninitialized;
@@ -326,10 +326,10 @@ export declare const useGetDataQuery: <R extends Record<string, any> = import("@
 }, "error">>)>> & {
     status: import("@reduxjs/toolkit/query").QueryStatus;
 }>(arg: IdArg | typeof import("@reduxjs/toolkit/query").skipToken, options?: (import("@reduxjs/toolkit/query").SubscriptionOptions & {
-    skip?: boolean | undefined;
-    refetchOnMountOrArgChange?: number | boolean | undefined;
+    skip?: boolean;
+    refetchOnMountOrArgChange?: boolean | number;
 } & {
-    skip?: boolean | undefined;
+    skip?: boolean;
     selectFromResult?: ((state: import("@reduxjs/toolkit/query").TSHelpersId<(Omit<{
         status: import("@reduxjs/toolkit/query").QueryStatus.uninitialized;
         originalArgs?: undefined;
@@ -458,7 +458,7 @@ export declare const useGetDataQuery: <R extends Record<string, any> = import("@
 }, "error">>)>> & {
     status: import("@reduxjs/toolkit/query").QueryStatus;
 }>(options?: (import("@reduxjs/toolkit/query").SubscriptionOptions & Omit<{
-    skip?: boolean | undefined;
+    skip?: boolean;
     selectFromResult?: ((state: import("@reduxjs/toolkit/query").TSHelpersId<(Omit<{
         status: import("@reduxjs/toolkit/query").QueryStatus.uninitialized;
         originalArgs?: undefined;
@@ -522,6 +522,6 @@ export declare const useGetDataQuery: <R extends Record<string, any> = import("@
     }, "error">>)>> & {
         status: import("@reduxjs/toolkit/query").QueryStatus;
     }) => R) | undefined;
-}, "skip">) | undefined) => [(arg: IdArg, preferCacheValue?: boolean | undefined) => import("@reduxjs/toolkit/query").QueryActionCreatorResult<import("@reduxjs/toolkit/query").QueryDefinition<IdArg, import("@reduxjs/toolkit/query").BaseQueryFn<string | import("@reduxjs/toolkit/query").FetchArgs, unknown, import("@reduxjs/toolkit/query").FetchBaseQueryError, {}, import("@reduxjs/toolkit/query").FetchBaseQueryMeta>, "Data" | "Workout", ESDataTypes, "contentApi">>, [R][R extends any ? 0 : never], {
+}, "skip">) | undefined) => [(arg: IdArg, preferCacheValue?: boolean) => import("@reduxjs/toolkit/query").QueryActionCreatorResult<import("@reduxjs/toolkit/query").QueryDefinition<IdArg, import("@reduxjs/toolkit/query").BaseQueryFn<string | import("@reduxjs/toolkit/query").FetchArgs, unknown, import("@reduxjs/toolkit/query").FetchBaseQueryError, {}, import("@reduxjs/toolkit/query").FetchBaseQueryMeta>, "Data" | "Workout", ESDataTypes, "contentApi">>, [R][R extends any ? 0 : never], {
     lastArg: IdArg;
 }];

package/dist/@types/lib/services/payment/index.d.ts

@@ -68,10 +68,10 @@ export declare const useCheckUserSubscriptionQuery: <R extends Record<string, an
 }, "error">>)>> & {
     status: import("@reduxjs/toolkit/query").QueryStatus;
 }>(arg: UserSubRequest | typeof import("@reduxjs/toolkit/query").skipToken, options?: (import("@reduxjs/toolkit/query").SubscriptionOptions & {
-    skip?: boolean | undefined;
-    refetchOnMountOrArgChange?: number | boolean | undefined;
+    skip?: boolean;
+    refetchOnMountOrArgChange?: boolean | number;
 } & {
-    skip?: boolean | undefined;
+    skip?: boolean;
     selectFromResult?: ((state: import("@reduxjs/toolkit/query").TSHelpersId<(Omit<{
         status: import("@reduxjs/toolkit/query").QueryStatus.uninitialized;
         originalArgs?: undefined;
@@ -200,7 +200,7 @@ export declare const useCheckUserSubscriptionQuery: <R extends Record<string, an
 }, "error">>)>> & {
     status: import("@reduxjs/toolkit/query").QueryStatus;
 }>(options?: (import("@reduxjs/toolkit/query").SubscriptionOptions & Omit<{
-    skip?: boolean | undefined;
+    skip?: boolean;
     selectFromResult?: ((state: import("@reduxjs/toolkit/query").TSHelpersId<(Omit<{
         status: import("@reduxjs/toolkit/query").QueryStatus.uninitialized;
         originalArgs?: undefined;
@@ -264,6 +264,6 @@ export declare const useCheckUserSubscriptionQuery: <R extends Record<string, an
     }, "error">>)>> & {
         status: import("@reduxjs/toolkit/query").QueryStatus;
     }) => R) | undefined;
-}, "skip">) | undefined) => [(arg: UserSubRequest, preferCacheValue?: boolean | undefined) => import("@reduxjs/toolkit/query").QueryActionCreatorResult<import("@reduxjs/toolkit/query").QueryDefinition<UserSubRequest, import("@reduxjs/toolkit/query").BaseQueryFn<string | import("@reduxjs/toolkit/query").FetchArgs, unknown, import("@reduxjs/toolkit/query").FetchBaseQueryError, {}, import("@reduxjs/toolkit/query").FetchBaseQueryMeta>, "UserSubscription", UserSubResponse, "paymentApi">>, [R][R extends any ? 0 : never], {
+}, "skip">) | undefined) => [(arg: UserSubRequest, preferCacheValue?: boolean) => import("@reduxjs/toolkit/query").QueryActionCreatorResult<import("@reduxjs/toolkit/query").QueryDefinition<UserSubRequest, import("@reduxjs/toolkit/query").BaseQueryFn<string | import("@reduxjs/toolkit/query").FetchArgs, unknown, import("@reduxjs/toolkit/query").FetchBaseQueryError, {}, import("@reduxjs/toolkit/query").FetchBaseQueryMeta>, "UserSubscription", UserSubResponse, "paymentApi">>, [R][R extends any ? 0 : never], {
     lastArg: UserSubRequest;
 }];

package/dist/@types/lib/store/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="redux-persist/types/persistReducer" />
 import type { Action, ThunkAction, ThunkDispatch } from '@reduxjs/toolkit';
 declare const rootReducer: import("@reduxjs/toolkit").CombinedSliceReducer<{
     auth: import("..").AuthState;

package/dist/@types/lib/store/storage.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="redux-persist/types/types" />
 import { WebStorage } from 'redux-persist/lib/types';
 export declare function createPersistStorage(): WebStorage;

package/dist/@types/lib/types/index.interfaces.d.ts

@@ -47,7 +47,7 @@ export type UserDetails = {
     firstName?: string;
     lastName?: string;
     userEmail?: string;
-    avatar?: string;
+    picture?: string;
     termsAccepted?: string;
     dateOfBirth?: string;
     contactPreference?: boolean;
@@ -185,7 +185,7 @@ export interface UpdateUserRequest {
     lastName: string;
     termsAccepted: string;
     userEmail: string;
-    avatar?: string;
+    picture: string;
     uuid: string;
 }
 export interface UpdateUserResponse {
@@ -318,3 +318,36 @@ export interface PaymentResponse {
     metadata: {};
     type: string;
 }
+export interface DecodedIdToken {
+    at_hash: string;
+    sub: string;
+    'cognito:groups': string[];
+    email_verified: boolean;
+    iss: string;
+    'cognito:username': string;
+    given_name: string;
+    nonce: string;
+    aud: string;
+    identities: {
+        userId: string;
+        providerName: string;
+        providerType: string;
+        issuer: string;
+        primary: string;
+        dateCreated: string;
+    }[];
+    token_use: string;
+    auth_time: number;
+    name: string;
+    exp: number;
+    iat: number;
+    family_name: string;
+    email: string;
+    birthdate?: string;
+    picture?: string;
+}
+export interface SocialTokens {
+    accessToken: string;
+    idToken: string;
+    refreshToken: string;
+}

package/dist/@types/lib/utils/dataFormat/index.d.ts

@@ -1,4 +1,3 @@
-import { AuthSession } from '@aws-amplify/core';
 import { User } from '../../types/index.interfaces';
 export declare const formatUserPayload: (payload: UserPayload) => {
     userEmail: string;
@@ -11,6 +10,7 @@ export declare const formatUserPayload: (payload: UserPayload) => {
     uuid: string;
     subscription: string | null;
     customerId: string;
+    picture: string;
 };
 export declare function formatPromos(data: ESPromo[]): Promo[];
 export declare function formatWorkout(data: ESWorkout[]): Workout[];
@@ -108,4 +108,4 @@ export declare function formatSchedule(data: ESSchedule[]): Schedule[];
 export declare function formatChallenges(data: ESChallenge[]): Challenge[];
 export declare function formatChallengeDays(data: ESChallengeDay[]): ChallengeDay[];
 export declare function formatSecondsToISO8601Duration(seconds?: number): string;
-export declare function formatAuthSession(session: AuthSession): User;
+export declare function formatAuthSession(session: any): User;

package/dist/index.esm.js

@@ -1,5 +1,5 @@
 import { fetchBaseQuery, createApi } from '@reduxjs/toolkit/query/react';
-import { fetchAuthSession, signOut } from '@aws-amplify/auth';
+import { Auth } from '@aws-amplify/auth';
 import { jwtDecode } from 'jwt-decode';
 import { createSlice, combineSlices, configureStore } from '@reduxjs/toolkit';
 import { useSelector, useDispatch, useStore } from 'react-redux';
@@ -94,6 +94,7 @@ var initialState = {
             termsAccepted: '',
             contactPreference: false,
             dateOfBirth: '',
+            picture: '',
         },
         accessToken: '',
         idToken: '',
@@ -168,8 +169,8 @@ authSlice.reducer;
 
 // TODO: typing.
 var formatUserPayload = function (payload) {
-    console.log('formatUserPayload', payload);
-    var userEmail = payload.email, firstName = payload.given_name, lastName = payload.family_name, dateOfBirth = payload.birthdate, uuid = payload["cognito:username"], termsAccepted = payload["custom:termsAccepted"], subscriptionId = payload["custom:subscriptionId"], contactPreference = payload["custom:contactPreferences"], customerId = payload["custom:customerId"];
+    console.log('payload', payload);
+    var userEmail = payload.email, firstName = payload.given_name, lastName = payload.family_name, dateOfBirth = payload.birthdate, picture = payload.picture, uuid = payload["cognito:username"], termsAccepted = payload["custom:termsAccepted"], subscriptionId = payload["custom:subscriptionId"], contactPreference = payload["custom:contactPreferences"], customerId = payload["custom:customerId"];
     var parsedTermsAccepted = termsAccepted ? JSON.parse(termsAccepted) : null;
     var parsedContactPreference = contactPreference
         ? JSON.parse(contactPreference)
@@ -185,8 +186,8 @@ var formatUserPayload = function (payload) {
         uuid: uuid,
         subscription: subscriptionId || null,
         customerId: customerId,
+        picture: picture,
     };
-    console.log('formatUserPayload', data);
     return data;
 };
 function formatPromos(data) {
@@ -563,7 +564,8 @@ function formatSecondsToISO8601Duration(seconds) {
     return duration;
 }
 function formatAuthSession(session) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28;
+    console.log('formatAuthSession session', session);
     return {
         accessToken: (_a = session === null || session === void 0 ? void 0 : session.tokens) === null || _a === void 0 ? void 0 : _a.accessToken.toString(),
         idToken: (_c = (_b = session === null || session === void 0 ? void 0 : session.tokens) === null || _b === void 0 ? void 0 : _b.idToken) === null || _c === void 0 ? void 0 : _c.toString(),
@@ -576,11 +578,12 @@ function formatAuthSession(session) {
             firstName: (_w = (_v = (_u = (_t = session === null || session === void 0 ? void 0 : session.tokens) === null || _t === void 0 ? void 0 : _t.idToken) === null || _u === void 0 ? void 0 : _u.payload) === null || _v === void 0 ? void 0 : _v.given_name) === null || _w === void 0 ? void 0 : _w.toString(),
             lastName: (_0 = (_z = (_y = (_x = session === null || session === void 0 ? void 0 : session.tokens) === null || _x === void 0 ? void 0 : _x.idToken) === null || _y === void 0 ? void 0 : _y.payload) === null || _z === void 0 ? void 0 : _z.family_name) === null || _0 === void 0 ? void 0 : _0.toString(),
             dateOfBirth: (_4 = (_3 = (_2 = (_1 = session === null || session === void 0 ? void 0 : session.tokens) === null || _1 === void 0 ? void 0 : _1.idToken) === null || _2 === void 0 ? void 0 : _2.payload) === null || _3 === void 0 ? void 0 : _3.birthdate) === null || _4 === void 0 ? void 0 : _4.toString(),
-            'cognito:username': (_8 = (_7 = (_6 = (_5 = session === null || session === void 0 ? void 0 : session.tokens) === null || _5 === void 0 ? void 0 : _5.idToken) === null || _6 === void 0 ? void 0 : _6.payload) === null || _7 === void 0 ? void 0 : _7['cognito:username']) === null || _8 === void 0 ? void 0 : _8.toString(),
-            'custom:termsAccepted': (_12 = (_11 = (_10 = (_9 = session === null || session === void 0 ? void 0 : session.tokens) === null || _9 === void 0 ? void 0 : _9.idToken) === null || _10 === void 0 ? void 0 : _10.payload) === null || _11 === void 0 ? void 0 : _11['custom:termsAccepted']) === null || _12 === void 0 ? void 0 : _12.toString(),
-            'custom:subscriptionId': (_16 = (_15 = (_14 = (_13 = session === null || session === void 0 ? void 0 : session.tokens) === null || _13 === void 0 ? void 0 : _13.idToken) === null || _14 === void 0 ? void 0 : _14.payload) === null || _15 === void 0 ? void 0 : _15['custom:subscriptionId']) === null || _16 === void 0 ? void 0 : _16.toString(),
-            'custom:contactPreferences': (_20 = (_19 = (_18 = (_17 = session === null || session === void 0 ? void 0 : session.tokens) === null || _17 === void 0 ? void 0 : _17.idToken) === null || _18 === void 0 ? void 0 : _18.payload) === null || _19 === void 0 ? void 0 : _19['custom:contactPreferences']) === null || _20 === void 0 ? void 0 : _20.toString(),
-            'custom:customerId': (_24 = (_23 = (_22 = (_21 = session === null || session === void 0 ? void 0 : session.tokens) === null || _21 === void 0 ? void 0 : _21.idToken) === null || _22 === void 0 ? void 0 : _22.payload) === null || _23 === void 0 ? void 0 : _23['custom:customerId']) === null || _24 === void 0 ? void 0 : _24.toString(),
+            picture: (_8 = (_7 = (_6 = (_5 = session === null || session === void 0 ? void 0 : session.tokens) === null || _5 === void 0 ? void 0 : _5.idToken) === null || _6 === void 0 ? void 0 : _6.payload) === null || _7 === void 0 ? void 0 : _7.picture) === null || _8 === void 0 ? void 0 : _8.toString(),
+            'cognito:username': (_12 = (_11 = (_10 = (_9 = session === null || session === void 0 ? void 0 : session.tokens) === null || _9 === void 0 ? void 0 : _9.idToken) === null || _10 === void 0 ? void 0 : _10.payload) === null || _11 === void 0 ? void 0 : _11['cognito:username']) === null || _12 === void 0 ? void 0 : _12.toString(),
+            'custom:termsAccepted': (_16 = (_15 = (_14 = (_13 = session === null || session === void 0 ? void 0 : session.tokens) === null || _13 === void 0 ? void 0 : _13.idToken) === null || _14 === void 0 ? void 0 : _14.payload) === null || _15 === void 0 ? void 0 : _15['custom:termsAccepted']) === null || _16 === void 0 ? void 0 : _16.toString(),
+            'custom:subscriptionId': (_20 = (_19 = (_18 = (_17 = session === null || session === void 0 ? void 0 : session.tokens) === null || _17 === void 0 ? void 0 : _17.idToken) === null || _18 === void 0 ? void 0 : _18.payload) === null || _19 === void 0 ? void 0 : _19['custom:subscriptionId']) === null || _20 === void 0 ? void 0 : _20.toString(),
+            'custom:contactPreferences': (_24 = (_23 = (_22 = (_21 = session === null || session === void 0 ? void 0 : session.tokens) === null || _21 === void 0 ? void 0 : _21.idToken) === null || _22 === void 0 ? void 0 : _22.payload) === null || _23 === void 0 ? void 0 : _23['custom:contactPreferences']) === null || _24 === void 0 ? void 0 : _24.toString(),
+            'custom:customerId': (_28 = (_27 = (_26 = (_25 = session === null || session === void 0 ? void 0 : session.tokens) === null || _25 === void 0 ? void 0 : _25.idToken) === null || _26 === void 0 ? void 0 : _26.payload) === null || _27 === void 0 ? void 0 : _27['custom:customerId']) === null || _28 === void 0 ? void 0 : _28.toString(),
         },
     };
 }
@@ -623,17 +626,19 @@ var APP_ES_AUTH = ((_f = process.env) === null || _f === void 0 ? void 0 : _f.NE
 var authDataBaseQuery = fetchBaseQuery({
     baseUrl: API_AUTH_PREFIX,
     prepareHeaders: function (headers_1, _a) { return __awaiter(void 0, [headers_1, _a], void 0, function (headers, _b) {
-        var tokens;
+        var session, idToken, accessToken;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
                     headers.set('Content-Type', 'application/json');
-                    return [4 /*yield*/, fetchAuthSession()];
+                    return [4 /*yield*/, Auth.currentSession()];
                 case 1:
-                    tokens = (_c.sent()).tokens;
-                    if ((tokens === null || tokens === void 0 ? void 0 : tokens.accessToken) && tokens.idToken) {
-                        headers.set('accesstoken', tokens.accessToken.toString());
-                        headers.set('idtoken', tokens.idToken.toString());
+                    session = _c.sent();
+                    idToken = session.getIdToken().getJwtToken();
+                    accessToken = session.getAccessToken().getJwtToken();
+                    if (accessToken && idToken) {
+                        headers.set('accesstoken', accessToken);
+                        headers.set('idtoken', idToken);
                         // headers.set('refreshtoken', tokens.refreshToken);
                     }
                     return [2 /*return*/, headers];
@@ -654,9 +659,12 @@ var authDataBaseQueryWithReauth = function (args, api, extraOptions) { return __
             case 1:
                 result = _b.sent();
                 if (!(((_a = result === null || result === void 0 ? void 0 : result.error) === null || _a === void 0 ? void 0 : _a.status) === 401)) return [3 /*break*/, 6];
-                return [4 /*yield*/, fetchAuthSession()];
+                return [4 /*yield*/, Auth.currentAuthenticatedUser({
+                        bypassCache: true, // Ensures that the user is refreshed from the server
+                    })];
             case 2:
                 authSession = _b.sent();
+                console.log('Session successfully refreshed:', authSession);
                 user = formatAuthSession(authSession);
                 api.dispatch(setCredentials(user));
                 if (!(authSession === null || authSession === void 0 ? void 0 : authSession.tokens)) return [3 /*break*/, 4];
@@ -667,7 +675,7 @@ var authDataBaseQueryWithReauth = function (args, api, extraOptions) { return __
                 return [3 /*break*/, 6];
             case 4: 
             // TODO; require full data reset?
-            return [4 /*yield*/, signOut()];
+            return [4 /*yield*/, Auth.signOut()];
             case 5:
                 // TODO; require full data reset?
                 _b.sent();