@techstuff-dev/foundation-api-utils 1.27.1 → 1.29.0

package/dist/index.js

@@ -858,13 +858,16 @@ var APP_ES_AUTH = ((_g = process.env) === null || _g === void 0 ? void 0 : _g.NE
 var authDataBaseQuery = react.fetchBaseQuery({
     baseUrl: API_AUTH_PREFIX,
     prepareHeaders: function (headers_1, _a) { return __awaiter(void 0, [headers_1, _a], void 0, function (headers, _b) {
-        var session, idToken, accessToken;
+        var session, idToken, accessToken, error_1;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
                     headers.set('Content-Type', 'application/json');
-                    return [4 /*yield*/, awsAmplify.Auth.currentSession()];
+                    _c.label = 1;
                 case 1:
+                    _c.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, awsAmplify.Auth.currentSession()];
+                case 2:
                     session = _c.sent();
                     idToken = session.getIdToken().getJwtToken();
                     accessToken = session.getAccessToken().getJwtToken();
@@ -874,6 +877,11 @@ var authDataBaseQuery = react.fetchBaseQuery({
                         // headers.set('refreshtoken', tokens.refreshToken);
                     }
                     return [2 /*return*/, headers];
+                case 3:
+                    error_1 = _c.sent();
+                    console.error('authDataBaseQuery: ', error_1);
+                    return [2 /*return*/, headers];
+                case 4: return [2 /*return*/];
             }
         });
     }); },
@@ -890,12 +898,14 @@ var authDataBaseQueryWithReauth = function (args, api, extraOptions) { return __
             case 0: return [4 /*yield*/, authDataBaseQuery(args, api, extraOptions)];
             case 1:
                 result = _b.sent();
+                console.log('authDataBaseQueryWithReauth: ', result);
                 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*/, awsAmplify.Auth.currentAuthenticatedUser({
                         bypassCache: true, // Ensures that the user is refreshed from the server
                     })];
             case 2:
                 authSession = _b.sent();
+                console.log('authDataBaseQueryWithReauth: ', authSession);
                 user = formatAuthSession(authSession);
                 api.dispatch(setCredentials(user));
                 if (!(authSession === null || authSession === void 0 ? void 0 : authSession.tokens)) return [3 /*break*/, 4];
@@ -923,82 +933,6 @@ var authApi = react.createApi({
     tagTypes: ['UserToken', 'UserData'],
     // keepUnusedDataFor: 300,
     endpoints: function (builder) { return ({
-        /**
-         * USER API.
-         */
-        // login: builder.query<LoginResponse, LoginRequest>({
-        //   query: (data) => ({
-        //     url: '/user/login',
-        //     method: 'POST',
-        //     body: {
-        //       email: data.email,
-        //       password: data.password,
-        //     },
-        //   }),
-        //   async onQueryStarted(arg, { dispatch, queryFulfilled }) {
-        //     try {
-        //       const response = await queryFulfilled;
-        //       const decoded = jwtDecode(response?.data?.idToken);
-        //       const profile = formatUserPayload(decoded as UserPayload);
-        //       const creds = {
-        //         accessToken: response?.data?.accessToken,
-        //         idToken: response?.data?.idToken,
-        //         refreshToken: response?.data?.refreshToken,
-        //         accessTokenExpiry: response?.data?.accessTokenExpiry,
-        //         details: { ...profile },
-        //       };
-        //       dispatch(setCredentials(creds));
-        //     } catch (err) {
-        //       // `onError` log out user.
-        //       dispatch(logout());
-        //     }
-        //   },
-        //   providesTags: ['UserToken'],
-        // }),
-        // refreshToken: builder.query<RefreshResponse, RefreshRequest>({
-        //   query: (data) => ({
-        //     url: '/user/refreshtoken',
-        //     method: 'POST',
-        //     body: {
-        //       sub: data.sub,
-        //       refreshtoken: data.refreshToken,
-        //     },
-        //   }),
-        //   async onQueryStarted(arg, { dispatch, queryFulfilled }) {
-        //     try {
-        //       const response = await queryFulfilled;
-        //       const decoded = jwtDecode(response?.data?.idToken);
-        //       const profile = formatUserPayload(decoded as UserPayload);
-        //       const creds = {
-        //         accessToken: response?.data?.accessToken,
-        //         idToken: response?.data?.idToken,
-        //         refreshToken: response?.data?.refreshToken,
-        //         accessTokenExpiry: response?.data?.accessTokenExpiry,
-        //         details: { ...profile },
-        //       };
-        //       dispatch(setCredentials(creds));
-        //     } catch (err) {
-        //       // `onError` log out user.
-        //       dispatch(logout());
-        //     }
-        //   },
-        //   providesTags: ['UserToken'],
-        // }),
-        // logout: builder.query<LogoutResponse, void>({
-        //   query: () => ({
-        //     url: '/user/logout',
-        //     method: 'POST',
-        //   }),
-        //   async onQueryStarted(arg, { dispatch, queryFulfilled }) {
-        //     try {
-        //       await queryFulfilled;
-        //       dispatch(logout());
-        //     } catch (err) {
-        //       // `onError` log out user.
-        //       dispatch(logout());
-        //     }
-        //   },
-        // }),
         resetPassword: builder.mutation({
             query: function (data) { return ({
                 url: '/user/password/reset',