bugfix/refetch-token-issue (#226)

USACE · Jul 11, 2024 · dbea288 · dbea288
1 parent b5ea877
commit dbea288
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 30 deletions.
diff --git a/src/app-bundles/domains-bundle.js b/src/app-bundles/domains-bundle.js
@@ -13,7 +13,7 @@ export default createRestBundle({
   postTemplate: '/domains',
   deleteTemplate: '/domains/{:item.id}',
   fetchActions: ['URL_UPDATED'],
-  forceFetchActions: ['EXPLOREMAP_INITIALIZE_START'],
+  forceFetchActions: ['@@INIT'],
   addons: {
     selectDomainsItemsByGroup: createSelector('selectDomainsItems', (items) => {
       if (!items) return null;

diff --git a/src/app-bundles/profile-bundle.js b/src/app-bundles/profile-bundle.js
@@ -14,7 +14,7 @@ export default createRestBundle({
   postTemplate: '/profiles',
   deleteTemplate: '',
   fetchActions: ['URL_UPDATED'],
-  forceFetchActions: ['PROFILE_SAVE_FINISHED'],
+  forceFetchActions: ['PROFILE_SAVE_FINISHED', '@@INIT'],
   reduceFurther: (state, { type, payload }) => {
     switch (type) {
       case 'PROFILE_REMOVE_PROFILE':
@@ -24,18 +24,6 @@ export default createRestBundle({
     }
   },
   addons: {
-    doFetchUserProfile: () => ({ apiGet }) => {
-        const url = `/my_profile`;
-
-        apiGet(url, (err, _body) => {
-          if (err) {
-            // eslint-disable-next-line no-console
-            console.log('error: ', err);
-          // } else {
-          //   dispatch({ type: 'UPDATE_DISTRICT_DATA', payload: body });
-          }
-        });
-      },
     doRemoveProfile: () => ({ dispatch, store }) => {
       dispatch({
         type: 'PROFILE_REMOVE_PROFILE',
@@ -96,16 +84,5 @@ export default createRestBundle({
         }
       }
     ),
-    // reactProfileCreatedRedirect: createSelector(
-    //   'selectProfileActive',
-    //   'selectRelativePathname',
-    //   (profile, path) => {
-    //     if (profile || !isLoggedIn())
-    //       return {
-    //         actionCreator: 'doUpdateRelativeUrl',
-    //         args: ['/'],
-    //       };
-    //   }
-    // ),
   },
 });
diff --git a/src/index.jsx b/src/index.jsx
@@ -14,11 +14,10 @@ const root = createRoot(container);
 const queryClient = new QueryClient();
 
 cache.getAll().then((initialData) => {
-  const store = getStore(initialData);
-
-  if (import.meta.env.DEV) window.store = store;
-
   const renderApp = () => {
+    const store = getStore(initialData);
+    if (import.meta.env.DEV) window.store = store;
+
     root.render(
       <Provider store={store}>
         <QueryClientProvider client={queryClient}>

diff --git a/src/userService.ts b/src/userService.ts
@@ -14,7 +14,6 @@ export const initKeycloak = (renderAppCallback = () => {}) => {
         window.location.origin + '/silent-check-sso.html',
       pkceMethod: 'S256',
       adapter: 'default',
-      checkLoginIframe: false,
     })
     .then(() => {
       renderAppCallback();