@beinformed/ui 1.19.3 → 1.19.4

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.19.4](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.19.3...v1.19.4) (2022-06-17)
+
+### Bug Fixes
+
+- **authentication:** improve isLoggedIn on application model ([b078c7d](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/b078c7dc03bfeb2b3d65643dce1b1da8ddd2cc90))
+
 ### [1.19.3](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.19.2...v1.19.3) (2022-06-17)
 
 ### [1.19.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.19.1...v1.19.2) (2022-06-17)

package/esm/redux/actions/Application.js

@@ -1,4 +1,4 @@
-import { loadModularUI } from "../_modularui/actions";
+import { loadModularUI, removeModelByKey } from "../_modularui/actions";
 import { keyByHref } from "../_modularui/selectors";
 import { ApplicationModel, Href } from "../../models";
 
@@ -15,6 +15,7 @@ export var reloadApplication = function reloadApplication() {
       modelKey = "application(/)(".concat(locale, ")");
     }
 
+    dispatch(removeModelByKey(modelKey));
     return dispatch(loadModularUI(modelKey, new Href("/", "Application"), {
       targetModel: ApplicationModel
     }));

package/esm/redux/actions/Application.js.map

@@ -1 +1 @@
-{"version":3,"file":"Application.js","names":["loadModularUI","keyByHref","ApplicationModel","Href","reloadApplication","dispatch","getState","modelKey","locale","i18n","targetModel"],"sources":["../../../src/redux/actions/Application.js"],"sourcesContent":["// @flow\nimport { loadModularUI } from \"../_modularui/actions\";\nimport { keyByHref } from \"../_modularui/selectors\";\nimport { ApplicationModel, Href } from \"../../models\";\n\nimport type { Dispatch, GetState, ThunkAction } from \"../types\";\n\n/**\n */\nexport const reloadApplication =\n  (): ThunkAction => (dispatch: Dispatch, getState: GetState) => {\n    let modelKey = keyByHref(getState(), \"/\");\n\n    if (!modelKey) {\n      const locale = getState().i18n?.locale;\n      modelKey = `application(/)(${locale})`;\n    }\n\n    return dispatch(\n      loadModularUI(modelKey, new Href(\"/\", \"Application\"), {\n        targetModel: ApplicationModel,\n      })\n    );\n  };\n"],"mappings":"AACA,SAASA,aAAT,QAA8B,uBAA9B;AACA,SAASC,SAAT,QAA0B,yBAA1B;AACA,SAASC,gBAAT,EAA2BC,IAA3B,QAAuC,cAAvC;;AAIA;AACA;AACA,OAAO,IAAMC,iBAAiB,GAC5B,SADWA,iBACX;EAAA,OAAmB,UAACC,QAAD,EAAqBC,QAArB,EAA4C;IAC7D,IAAIC,QAAQ,GAAGN,SAAS,CAACK,QAAQ,EAAT,EAAa,GAAb,CAAxB;;IAEA,IAAI,CAACC,QAAL,EAAe;MAAA;;MACb,IAAMC,MAAM,qBAAGF,QAAQ,GAAGG,IAAd,mDAAG,eAAiBD,MAAhC;MACAD,QAAQ,4BAAqBC,MAArB,MAAR;IACD;;IAED,OAAOH,QAAQ,CACbL,aAAa,CAACO,QAAD,EAAW,IAAIJ,IAAJ,CAAS,GAAT,EAAc,aAAd,CAAX,EAAyC;MACpDO,WAAW,EAAER;IADuC,CAAzC,CADA,CAAf;EAKD,CAbD;AAAA,CADK"}
+{"version":3,"file":"Application.js","names":["loadModularUI","removeModelByKey","keyByHref","ApplicationModel","Href","reloadApplication","dispatch","getState","modelKey","locale","i18n","targetModel"],"sources":["../../../src/redux/actions/Application.js"],"sourcesContent":["// @flow\nimport { loadModularUI, removeModelByKey } from \"../_modularui/actions\";\nimport { keyByHref } from \"../_modularui/selectors\";\nimport { ApplicationModel, Href } from \"../../models\";\n\nimport type { Dispatch, GetState, ThunkAction } from \"../types\";\n\n/**\n */\nexport const reloadApplication =\n  (): ThunkAction => (dispatch: Dispatch, getState: GetState) => {\n    let modelKey = keyByHref(getState(), \"/\");\n\n    if (!modelKey) {\n      const locale = getState().i18n?.locale;\n      modelKey = `application(/)(${locale})`;\n    }\n\n    dispatch(removeModelByKey(modelKey));\n\n    return dispatch(\n      loadModularUI(modelKey, new Href(\"/\", \"Application\"), {\n        targetModel: ApplicationModel,\n      })\n    );\n  };\n"],"mappings":"AACA,SAASA,aAAT,EAAwBC,gBAAxB,QAAgD,uBAAhD;AACA,SAASC,SAAT,QAA0B,yBAA1B;AACA,SAASC,gBAAT,EAA2BC,IAA3B,QAAuC,cAAvC;;AAIA;AACA;AACA,OAAO,IAAMC,iBAAiB,GAC5B,SADWA,iBACX;EAAA,OAAmB,UAACC,QAAD,EAAqBC,QAArB,EAA4C;IAC7D,IAAIC,QAAQ,GAAGN,SAAS,CAACK,QAAQ,EAAT,EAAa,GAAb,CAAxB;;IAEA,IAAI,CAACC,QAAL,EAAe;MAAA;;MACb,IAAMC,MAAM,qBAAGF,QAAQ,GAAGG,IAAd,mDAAG,eAAiBD,MAAhC;MACAD,QAAQ,4BAAqBC,MAArB,MAAR;IACD;;IAEDH,QAAQ,CAACL,gBAAgB,CAACO,QAAD,CAAjB,CAAR;IAEA,OAAOF,QAAQ,CACbN,aAAa,CAACQ,QAAD,EAAW,IAAIJ,IAAJ,CAAS,GAAT,EAAc,aAAd,CAAX,EAAyC;MACpDO,WAAW,EAAER;IADuC,CAAzC,CADA,CAAf;EAKD,CAfD;AAAA,CADK"}

package/esm/redux/actions/Authorization.js

@@ -5,6 +5,7 @@ import { logoutSuccess } from "./SignOut";
 import { showNotification } from "./Notification";
 import Cache from "../../utils/browser/Cache";
 import { removeModelByKey } from "../_modularui/actions";
+import { getApplication } from "../_modularui/selectors";
 import { reloadApplication } from "./Application";
 import { getSetting } from "../../constants";
 
@@ -21,10 +22,12 @@ export var handleUnauthorized = function handleUnauthorized(errorResponse) {
     if (getSetting("PAGE_RELOAD_ON_UNAUTHORIZED_ERROR", false) && (_errorResponse$respon = errorResponse.response) !== null && _errorResponse$respon !== void 0 && _errorResponse$respon.error) {
       window.location.reload();
       return;
-    } // reload application when flag auth is set
+    } // reload application when flag auth is set or isLogged
 
 
-    if (Cache.getItem("auth")) {
+    var application = getApplication(getState());
+
+    if (Cache.getItem("auth") || application !== null && application !== void 0 && application.isLoggedIn) {
       dispatch(reloadApplication());
     } // set logged auth
 

package/esm/redux/actions/Authorization.js.map

@@ -1 +1 @@
-{"version":3,"file":"Authorization.js","names":["LOGIN_PATH","NOTIFICATION_TYPES","ErrorResponse","replace","logoutSuccess","showNotification","Cache","removeModelByKey","reloadApplication","getSetting","handleUnauthorized","errorResponse","dispatch","getState","connectKey","response","error","window","location","reload","getItem","removeItem","isInvalidUsername","WARNING_TIMEOUT","WARNING","id","defaultMessage","message","router","pathname","locationFrom","state","from","modal","type"],"sources":["../../../src/redux/actions/Authorization.js"],"sourcesContent":["// @flow\nimport { LOGIN_PATH, NOTIFICATION_TYPES } from \"../../constants/Constants\";\n\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\n\nimport { replace } from \"../_router/actions\";\nimport { logoutSuccess } from \"./SignOut\";\nimport { showNotification } from \"./Notification\";\n\nimport Cache from \"../../utils/browser/Cache\";\n\nimport { removeModelByKey } from \"../_modularui/actions\";\nimport { reloadApplication } from \"./Application\";\n\nimport { getSetting } from \"../../constants\";\n\nimport type { ThunkAction } from \"../types\";\n\n/**\n */\nexport const handleUnauthorized =\n  (errorResponse: ErrorResponse): ThunkAction =>\n  (dispatch, getState) => {\n    if (errorResponse.connectKey) {\n      dispatch(removeModelByKey(errorResponse.connectKey));\n    }\n\n    if (\n      getSetting(\"PAGE_RELOAD_ON_UNAUTHORIZED_ERROR\", false) &&\n      errorResponse.response?.error\n    ) {\n      window.location.reload();\n      return;\n    }\n\n    // reload application when flag auth is set\n    if (Cache.getItem(\"auth\")) {\n      dispatch(reloadApplication());\n    }\n\n    // set logged auth\n    dispatch(logoutSuccess());\n\n    Cache.removeItem(\"auth\");\n\n    if (errorResponse.isInvalidUsername) {\n      const WARNING_TIMEOUT = 4000;\n      dispatch(\n        showNotification(\n          NOTIFICATION_TYPES.WARNING,\n          {\n            id: errorResponse.id,\n            defaultMessage: errorResponse.message,\n          },\n          null,\n          WARNING_TIMEOUT\n        )\n      );\n    }\n\n    // add current location as from location before redirect\n    const location = getState().router.location;\n    if (location?.pathname !== LOGIN_PATH) {\n      const locationFrom = location?.state?.from;\n      return dispatch(\n        replace(LOGIN_PATH, {\n          from: locationFrom ? locationFrom : getState().router.location,\n          // cannot open login in a modal, because of previous locations that might be secure\n          modal: false,\n        })\n      );\n    }\n\n    return { type: \"NO_ACTION\" };\n  };\n"],"mappings":"AACA,SAASA,UAAT,EAAqBC,kBAArB,QAA+C,2BAA/C;AAEA,OAAOC,aAAP,MAA0B,kCAA1B;AAEA,SAASC,OAAT,QAAwB,oBAAxB;AACA,SAASC,aAAT,QAA8B,WAA9B;AACA,SAASC,gBAAT,QAAiC,gBAAjC;AAEA,OAAOC,KAAP,MAAkB,2BAAlB;AAEA,SAASC,gBAAT,QAAiC,uBAAjC;AACA,SAASC,iBAAT,QAAkC,eAAlC;AAEA,SAASC,UAAT,QAA2B,iBAA3B;;AAIA;AACA;AACA,OAAO,IAAMC,kBAAkB,GAC7B,SADWA,kBACX,CAACC,aAAD;EAAA,OACA,UAACC,QAAD,EAAWC,QAAX,EAAwB;IAAA;;IACtB,IAAIF,aAAa,CAACG,UAAlB,EAA8B;MAC5BF,QAAQ,CAACL,gBAAgB,CAACI,aAAa,CAACG,UAAf,CAAjB,CAAR;IACD;;IAED,IACEL,UAAU,CAAC,mCAAD,EAAsC,KAAtC,CAAV,6BACAE,aAAa,CAACI,QADd,kDACA,sBAAwBC,KAF1B,EAGE;MACAC,MAAM,CAACC,QAAP,CAAgBC,MAAhB;MACA;IACD,CAXqB,CAatB;;;IACA,IAAIb,KAAK,CAACc,OAAN,CAAc,MAAd,CAAJ,EAA2B;MACzBR,QAAQ,CAACJ,iBAAiB,EAAlB,CAAR;IACD,CAhBqB,CAkBtB;;;IACAI,QAAQ,CAACR,aAAa,EAAd,CAAR;IAEAE,KAAK,CAACe,UAAN,CAAiB,MAAjB;;IAEA,IAAIV,aAAa,CAACW,iBAAlB,EAAqC;MACnC,IAAMC,eAAe,GAAG,IAAxB;MACAX,QAAQ,CACNP,gBAAgB,CACdJ,kBAAkB,CAACuB,OADL,EAEd;QACEC,EAAE,EAAEd,aAAa,CAACc,EADpB;QAEEC,cAAc,EAAEf,aAAa,CAACgB;MAFhC,CAFc,EAMd,IANc,EAOdJ,eAPc,CADV,CAAR;IAWD,CApCqB,CAsCtB;;;IACA,IAAML,QAAQ,GAAGL,QAAQ,GAAGe,MAAX,CAAkBV,QAAnC;;IACA,IAAI,CAAAA,QAAQ,SAAR,IAAAA,QAAQ,WAAR,YAAAA,QAAQ,CAAEW,QAAV,MAAuB7B,UAA3B,EAAuC;MAAA;;MACrC,IAAM8B,YAAY,GAAGZ,QAAH,aAAGA,QAAH,0CAAGA,QAAQ,CAAEa,KAAb,oDAAG,gBAAiBC,IAAtC;MACA,OAAOpB,QAAQ,CACbT,OAAO,CAACH,UAAD,EAAa;QAClBgC,IAAI,EAAEF,YAAY,GAAGA,YAAH,GAAkBjB,QAAQ,GAAGe,MAAX,CAAkBV,QADpC;QAElB;QACAe,KAAK,EAAE;MAHW,CAAb,CADM,CAAf;IAOD;;IAED,OAAO;MAAEC,IAAI,EAAE;IAAR,CAAP;EACD,CArDD;AAAA,CADK"}
+{"version":3,"file":"Authorization.js","names":["LOGIN_PATH","NOTIFICATION_TYPES","ErrorResponse","replace","logoutSuccess","showNotification","Cache","removeModelByKey","getApplication","reloadApplication","getSetting","handleUnauthorized","errorResponse","dispatch","getState","connectKey","response","error","window","location","reload","application","getItem","isLoggedIn","removeItem","isInvalidUsername","WARNING_TIMEOUT","WARNING","id","defaultMessage","message","router","pathname","locationFrom","state","from","modal","type"],"sources":["../../../src/redux/actions/Authorization.js"],"sourcesContent":["// @flow\nimport { LOGIN_PATH, NOTIFICATION_TYPES } from \"../../constants/Constants\";\n\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\n\nimport { replace } from \"../_router/actions\";\nimport { logoutSuccess } from \"./SignOut\";\nimport { showNotification } from \"./Notification\";\n\nimport Cache from \"../../utils/browser/Cache\";\n\nimport { removeModelByKey } from \"../_modularui/actions\";\nimport { getApplication } from \"../_modularui/selectors\";\nimport { reloadApplication } from \"./Application\";\n\nimport { getSetting } from \"../../constants\";\n\nimport type { ThunkAction } from \"../types\";\n\n/**\n */\nexport const handleUnauthorized =\n  (errorResponse: ErrorResponse): ThunkAction =>\n  (dispatch, getState) => {\n    if (errorResponse.connectKey) {\n      dispatch(removeModelByKey(errorResponse.connectKey));\n    }\n\n    if (\n      getSetting(\"PAGE_RELOAD_ON_UNAUTHORIZED_ERROR\", false) &&\n      errorResponse.response?.error\n    ) {\n      window.location.reload();\n      return;\n    }\n\n    // reload application when flag auth is set or isLogged\n    const application = getApplication(getState());\n    if (Cache.getItem(\"auth\") || application?.isLoggedIn) {\n      dispatch(reloadApplication());\n    }\n\n    // set logged auth\n    dispatch(logoutSuccess());\n\n    Cache.removeItem(\"auth\");\n\n    if (errorResponse.isInvalidUsername) {\n      const WARNING_TIMEOUT = 4000;\n      dispatch(\n        showNotification(\n          NOTIFICATION_TYPES.WARNING,\n          {\n            id: errorResponse.id,\n            defaultMessage: errorResponse.message,\n          },\n          null,\n          WARNING_TIMEOUT\n        )\n      );\n    }\n\n    // add current location as from location before redirect\n    const location = getState().router.location;\n    if (location?.pathname !== LOGIN_PATH) {\n      const locationFrom = location?.state?.from;\n      return dispatch(\n        replace(LOGIN_PATH, {\n          from: locationFrom ? locationFrom : getState().router.location,\n          // cannot open login in a modal, because of previous locations that might be secure\n          modal: false,\n        })\n      );\n    }\n\n    return { type: \"NO_ACTION\" };\n  };\n"],"mappings":"AACA,SAASA,UAAT,EAAqBC,kBAArB,QAA+C,2BAA/C;AAEA,OAAOC,aAAP,MAA0B,kCAA1B;AAEA,SAASC,OAAT,QAAwB,oBAAxB;AACA,SAASC,aAAT,QAA8B,WAA9B;AACA,SAASC,gBAAT,QAAiC,gBAAjC;AAEA,OAAOC,KAAP,MAAkB,2BAAlB;AAEA,SAASC,gBAAT,QAAiC,uBAAjC;AACA,SAASC,cAAT,QAA+B,yBAA/B;AACA,SAASC,iBAAT,QAAkC,eAAlC;AAEA,SAASC,UAAT,QAA2B,iBAA3B;;AAIA;AACA;AACA,OAAO,IAAMC,kBAAkB,GAC7B,SADWA,kBACX,CAACC,aAAD;EAAA,OACA,UAACC,QAAD,EAAWC,QAAX,EAAwB;IAAA;;IACtB,IAAIF,aAAa,CAACG,UAAlB,EAA8B;MAC5BF,QAAQ,CAACN,gBAAgB,CAACK,aAAa,CAACG,UAAf,CAAjB,CAAR;IACD;;IAED,IACEL,UAAU,CAAC,mCAAD,EAAsC,KAAtC,CAAV,6BACAE,aAAa,CAACI,QADd,kDACA,sBAAwBC,KAF1B,EAGE;MACAC,MAAM,CAACC,QAAP,CAAgBC,MAAhB;MACA;IACD,CAXqB,CAatB;;;IACA,IAAMC,WAAW,GAAGb,cAAc,CAACM,QAAQ,EAAT,CAAlC;;IACA,IAAIR,KAAK,CAACgB,OAAN,CAAc,MAAd,KAAyBD,WAAzB,aAAyBA,WAAzB,eAAyBA,WAAW,CAAEE,UAA1C,EAAsD;MACpDV,QAAQ,CAACJ,iBAAiB,EAAlB,CAAR;IACD,CAjBqB,CAmBtB;;;IACAI,QAAQ,CAACT,aAAa,EAAd,CAAR;IAEAE,KAAK,CAACkB,UAAN,CAAiB,MAAjB;;IAEA,IAAIZ,aAAa,CAACa,iBAAlB,EAAqC;MACnC,IAAMC,eAAe,GAAG,IAAxB;MACAb,QAAQ,CACNR,gBAAgB,CACdJ,kBAAkB,CAAC0B,OADL,EAEd;QACEC,EAAE,EAAEhB,aAAa,CAACgB,EADpB;QAEEC,cAAc,EAAEjB,aAAa,CAACkB;MAFhC,CAFc,EAMd,IANc,EAOdJ,eAPc,CADV,CAAR;IAWD,CArCqB,CAuCtB;;;IACA,IAAMP,QAAQ,GAAGL,QAAQ,GAAGiB,MAAX,CAAkBZ,QAAnC;;IACA,IAAI,CAAAA,QAAQ,SAAR,IAAAA,QAAQ,WAAR,YAAAA,QAAQ,CAAEa,QAAV,MAAuBhC,UAA3B,EAAuC;MAAA;;MACrC,IAAMiC,YAAY,GAAGd,QAAH,aAAGA,QAAH,0CAAGA,QAAQ,CAAEe,KAAb,oDAAG,gBAAiBC,IAAtC;MACA,OAAOtB,QAAQ,CACbV,OAAO,CAACH,UAAD,EAAa;QAClBmC,IAAI,EAAEF,YAAY,GAAGA,YAAH,GAAkBnB,QAAQ,GAAGiB,MAAX,CAAkBZ,QADpC;QAElB;QACAiB,KAAK,EAAE;MAHW,CAAb,CADM,CAAf;IAOD;;IAED,OAAO;MAAEC,IAAI,EAAE;IAAR,CAAP;EACD,CAtDD;AAAA,CADK"}

package/esm/redux/actions/SignOut.js

@@ -2,10 +2,10 @@ import Authenticate from "../../modularui/Authenticate";
 import { startProgress, finishProgress } from "./ProgressIndicator";
 import { resetModularUI } from "../_modularui/actions";
 import { reloadApplication } from "./Application";
+
 /**
  * Send logout success action
  */
-
 export var logoutSuccess = function logoutSuccess() {
   return {
     type: "AUTHENTICATION_LOGOUT"

package/esm/redux/actions/SignOut.js.map

@@ -1 +1 @@
-{"version":3,"file":"SignOut.js","names":["Authenticate","startProgress","finishProgress","resetModularUI","reloadApplication","logoutSuccess","type","logout","dispatch","then"],"sources":["../../../src/redux/actions/SignOut.js"],"sourcesContent":["// @flow\nimport Authenticate from \"../../modularui/Authenticate\";\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\nimport { resetModularUI } from \"../_modularui/actions\";\n\nimport type { Dispatch, LogoutSuccessAction, ThunkAction } from \"../types\";\nimport { reloadApplication } from \"./Application\";\n\n/**\n * Send logout success action\n */\nexport const logoutSuccess = (): LogoutSuccessAction => ({\n  type: \"AUTHENTICATION_LOGOUT\",\n});\n\n/**\n */\nexport const logout = (): ThunkAction => (dispatch: Dispatch) => {\n  dispatch(startProgress());\n\n  return new Authenticate()\n    .logout()\n    .then(() => dispatch(resetModularUI()))\n    .then(() => dispatch(reloadApplication()))\n    .then(() => {\n      dispatch(logoutSuccess());\n      return dispatch(finishProgress());\n    });\n};\n"],"mappings":"AACA,OAAOA,YAAP,MAAyB,8BAAzB;AACA,SAASC,aAAT,EAAwBC,cAAxB,QAA8C,qBAA9C;AACA,SAASC,cAAT,QAA+B,uBAA/B;AAGA,SAASC,iBAAT,QAAkC,eAAlC;AAEA;AACA;AACA;;AACA,OAAO,IAAMC,aAAa,GAAG,SAAhBA,aAAgB;EAAA,OAA4B;IACvDC,IAAI,EAAE;EADiD,CAA5B;AAAA,CAAtB;AAIP;AACA;;AACA,OAAO,IAAMC,MAAM,GAAG,SAATA,MAAS;EAAA,OAAmB,UAACC,QAAD,EAAwB;IAC/DA,QAAQ,CAACP,aAAa,EAAd,CAAR;IAEA,OAAO,IAAID,YAAJ,GACJO,MADI,GAEJE,IAFI,CAEC;MAAA,OAAMD,QAAQ,CAACL,cAAc,EAAf,CAAd;IAAA,CAFD,EAGJM,IAHI,CAGC;MAAA,OAAMD,QAAQ,CAACJ,iBAAiB,EAAlB,CAAd;IAAA,CAHD,EAIJK,IAJI,CAIC,YAAM;MACVD,QAAQ,CAACH,aAAa,EAAd,CAAR;MACA,OAAOG,QAAQ,CAACN,cAAc,EAAf,CAAf;IACD,CAPI,CAAP;EAQD,CAXqB;AAAA,CAAf"}
+{"version":3,"file":"SignOut.js","names":["Authenticate","startProgress","finishProgress","resetModularUI","reloadApplication","logoutSuccess","type","logout","dispatch","then"],"sources":["../../../src/redux/actions/SignOut.js"],"sourcesContent":["// @flow\nimport Authenticate from \"../../modularui/Authenticate\";\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\nimport { resetModularUI } from \"../_modularui/actions\";\nimport { reloadApplication } from \"./Application\";\n\nimport type { Dispatch, LogoutSuccessAction, ThunkAction } from \"../types\";\n\n/**\n * Send logout success action\n */\nexport const logoutSuccess = (): LogoutSuccessAction => ({\n  type: \"AUTHENTICATION_LOGOUT\",\n});\n\n/**\n */\nexport const logout = (): ThunkAction => (dispatch: Dispatch) => {\n  dispatch(startProgress());\n\n  return new Authenticate()\n    .logout()\n    .then(() => dispatch(resetModularUI()))\n    .then(() => dispatch(reloadApplication()))\n    .then(() => {\n      dispatch(logoutSuccess());\n      return dispatch(finishProgress());\n    });\n};\n"],"mappings":"AACA,OAAOA,YAAP,MAAyB,8BAAzB;AACA,SAASC,aAAT,EAAwBC,cAAxB,QAA8C,qBAA9C;AACA,SAASC,cAAT,QAA+B,uBAA/B;AACA,SAASC,iBAAT,QAAkC,eAAlC;;AAIA;AACA;AACA;AACA,OAAO,IAAMC,aAAa,GAAG,SAAhBA,aAAgB;EAAA,OAA4B;IACvDC,IAAI,EAAE;EADiD,CAA5B;AAAA,CAAtB;AAIP;AACA;;AACA,OAAO,IAAMC,MAAM,GAAG,SAATA,MAAS;EAAA,OAAmB,UAACC,QAAD,EAAwB;IAC/DA,QAAQ,CAACP,aAAa,EAAd,CAAR;IAEA,OAAO,IAAID,YAAJ,GACJO,MADI,GAEJE,IAFI,CAEC;MAAA,OAAMD,QAAQ,CAACL,cAAc,EAAf,CAAd;IAAA,CAFD,EAGJM,IAHI,CAGC;MAAA,OAAMD,QAAQ,CAACJ,iBAAiB,EAAlB,CAAd;IAAA,CAHD,EAIJK,IAJI,CAIC,YAAM;MACVD,QAAQ,CAACH,aAAa,EAAd,CAAR;MACA,OAAOG,QAAQ,CAACN,cAAc,EAAf,CAAf;IACD,CAPI,CAAP;EAQD,CAXqB;AAAA,CAAf"}

package/lib/hooks/__tests__/useAuthentication.spec.js.flow

@@ -61,6 +61,10 @@ describe("authentication hooks", () => {
 
     expect(store.getActions()).toStrictEqual([
       { type: "START_PROGRESS" },
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "application(/)(en)",
+      },
       {
         type: "MODULARUI/STATUS",
         payload: { key: "application(/)(en)", status: "LOADING" },
@@ -108,6 +112,10 @@ describe("authentication hooks", () => {
     expect(store.getActions()).toStrictEqual([
       { type: "START_PROGRESS" },
       { type: "MODULARUI/RESET" },
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "application(/)(en)",
+      },
       {
         type: "MODULARUI/STATUS",
         payload: { key: "application(/)(en)", status: "LOADING" },

package/lib/redux/actions/Application.js

@@ -24,6 +24,7 @@ var reloadApplication = function reloadApplication() {
       modelKey = "application(/)(".concat(locale, ")");
     }
 
+    dispatch((0, _actions.removeModelByKey)(modelKey));
     return dispatch((0, _actions.loadModularUI)(modelKey, new _models.Href("/", "Application"), {
       targetModel: _models.ApplicationModel
     }));

package/lib/redux/actions/Application.js.flow

@@ -1,5 +1,5 @@
 // @flow
-import { loadModularUI } from "../_modularui/actions";
+import { loadModularUI, removeModelByKey } from "../_modularui/actions";
 import { keyByHref } from "../_modularui/selectors";
 import { ApplicationModel, Href } from "../../models";
 
@@ -16,6 +16,8 @@ export const reloadApplication =
       modelKey = `application(/)(${locale})`;
     }
 
+    dispatch(removeModelByKey(modelKey));
+
     return dispatch(
       loadModularUI(modelKey, new Href("/", "Application"), {
         targetModel: ApplicationModel,

package/lib/redux/actions/Application.js.map

@@ -1 +1 @@
-{"version":3,"file":"Application.js","names":["reloadApplication","dispatch","getState","modelKey","keyByHref","locale","i18n","loadModularUI","Href","targetModel","ApplicationModel"],"sources":["../../../src/redux/actions/Application.js"],"sourcesContent":["// @flow\nimport { loadModularUI } from \"../_modularui/actions\";\nimport { keyByHref } from \"../_modularui/selectors\";\nimport { ApplicationModel, Href } from \"../../models\";\n\nimport type { Dispatch, GetState, ThunkAction } from \"../types\";\n\n/**\n */\nexport const reloadApplication =\n  (): ThunkAction => (dispatch: Dispatch, getState: GetState) => {\n    let modelKey = keyByHref(getState(), \"/\");\n\n    if (!modelKey) {\n      const locale = getState().i18n?.locale;\n      modelKey = `application(/)(${locale})`;\n    }\n\n    return dispatch(\n      loadModularUI(modelKey, new Href(\"/\", \"Application\"), {\n        targetModel: ApplicationModel,\n      })\n    );\n  };\n"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AAIA;AACA;AACO,IAAMA,iBAAiB,GAC5B,SADWA,iBACX;EAAA,OAAmB,UAACC,QAAD,EAAqBC,QAArB,EAA4C;IAC7D,IAAIC,QAAQ,GAAG,IAAAC,oBAAA,EAAUF,QAAQ,EAAlB,EAAsB,GAAtB,CAAf;;IAEA,IAAI,CAACC,QAAL,EAAe;MAAA;;MACb,IAAME,MAAM,qBAAGH,QAAQ,GAAGI,IAAd,mDAAG,eAAiBD,MAAhC;MACAF,QAAQ,4BAAqBE,MAArB,MAAR;IACD;;IAED,OAAOJ,QAAQ,CACb,IAAAM,sBAAA,EAAcJ,QAAd,EAAwB,IAAIK,YAAJ,CAAS,GAAT,EAAc,aAAd,CAAxB,EAAsD;MACpDC,WAAW,EAAEC;IADuC,CAAtD,CADa,CAAf;EAKD,CAbD;AAAA,CADK"}
+{"version":3,"file":"Application.js","names":["reloadApplication","dispatch","getState","modelKey","keyByHref","locale","i18n","removeModelByKey","loadModularUI","Href","targetModel","ApplicationModel"],"sources":["../../../src/redux/actions/Application.js"],"sourcesContent":["// @flow\nimport { loadModularUI, removeModelByKey } from \"../_modularui/actions\";\nimport { keyByHref } from \"../_modularui/selectors\";\nimport { ApplicationModel, Href } from \"../../models\";\n\nimport type { Dispatch, GetState, ThunkAction } from \"../types\";\n\n/**\n */\nexport const reloadApplication =\n  (): ThunkAction => (dispatch: Dispatch, getState: GetState) => {\n    let modelKey = keyByHref(getState(), \"/\");\n\n    if (!modelKey) {\n      const locale = getState().i18n?.locale;\n      modelKey = `application(/)(${locale})`;\n    }\n\n    dispatch(removeModelByKey(modelKey));\n\n    return dispatch(\n      loadModularUI(modelKey, new Href(\"/\", \"Application\"), {\n        targetModel: ApplicationModel,\n      })\n    );\n  };\n"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AAIA;AACA;AACO,IAAMA,iBAAiB,GAC5B,SADWA,iBACX;EAAA,OAAmB,UAACC,QAAD,EAAqBC,QAArB,EAA4C;IAC7D,IAAIC,QAAQ,GAAG,IAAAC,oBAAA,EAAUF,QAAQ,EAAlB,EAAsB,GAAtB,CAAf;;IAEA,IAAI,CAACC,QAAL,EAAe;MAAA;;MACb,IAAME,MAAM,qBAAGH,QAAQ,GAAGI,IAAd,mDAAG,eAAiBD,MAAhC;MACAF,QAAQ,4BAAqBE,MAArB,MAAR;IACD;;IAEDJ,QAAQ,CAAC,IAAAM,yBAAA,EAAiBJ,QAAjB,CAAD,CAAR;IAEA,OAAOF,QAAQ,CACb,IAAAO,sBAAA,EAAcL,QAAd,EAAwB,IAAIM,YAAJ,CAAS,GAAT,EAAc,aAAd,CAAxB,EAAsD;MACpDC,WAAW,EAAEC;IADuC,CAAtD,CADa,CAAf;EAKD,CAfD;AAAA,CADK"}

package/lib/redux/actions/Authorization.js

@@ -21,6 +21,8 @@ var _Cache = _interopRequireDefault(require("../../utils/browser/Cache"));
 
 var _actions2 = require("../_modularui/actions");
 
+var _selectors = require("../_modularui/selectors");
+
 var _Application = require("./Application");
 
 var _constants = require("../../constants");
@@ -38,10 +40,12 @@ var handleUnauthorized = function handleUnauthorized(errorResponse) {
     if ((0, _constants.getSetting)("PAGE_RELOAD_ON_UNAUTHORIZED_ERROR", false) && (_errorResponse$respon = errorResponse.response) !== null && _errorResponse$respon !== void 0 && _errorResponse$respon.error) {
       window.location.reload();
       return;
-    } // reload application when flag auth is set
+    } // reload application when flag auth is set or isLogged
+
 
+    var application = (0, _selectors.getApplication)(getState());
 
-    if (_Cache.default.getItem("auth")) {
+    if (_Cache.default.getItem("auth") || application !== null && application !== void 0 && application.isLoggedIn) {
       dispatch((0, _Application.reloadApplication)());
     } // set logged auth
 

package/lib/redux/actions/Authorization.js.flow

@@ -10,6 +10,7 @@ import { showNotification } from "./Notification";
 import Cache from "../../utils/browser/Cache";
 
 import { removeModelByKey } from "../_modularui/actions";
+import { getApplication } from "../_modularui/selectors";
 import { reloadApplication } from "./Application";
 
 import { getSetting } from "../../constants";
@@ -33,8 +34,9 @@ export const handleUnauthorized =
       return;
     }
 
-    // reload application when flag auth is set
-    if (Cache.getItem("auth")) {
+    // reload application when flag auth is set or isLogged
+    const application = getApplication(getState());
+    if (Cache.getItem("auth") || application?.isLoggedIn) {
       dispatch(reloadApplication());
     }
 

package/lib/redux/actions/Authorization.js.map

@@ -1 +1 @@
-{"version":3,"file":"Authorization.js","names":["handleUnauthorized","errorResponse","dispatch","getState","connectKey","removeModelByKey","getSetting","response","error","window","location","reload","Cache","getItem","reloadApplication","logoutSuccess","removeItem","isInvalidUsername","WARNING_TIMEOUT","showNotification","NOTIFICATION_TYPES","WARNING","id","defaultMessage","message","router","pathname","LOGIN_PATH","locationFrom","state","from","replace","modal","type"],"sources":["../../../src/redux/actions/Authorization.js"],"sourcesContent":["// @flow\nimport { LOGIN_PATH, NOTIFICATION_TYPES } from \"../../constants/Constants\";\n\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\n\nimport { replace } from \"../_router/actions\";\nimport { logoutSuccess } from \"./SignOut\";\nimport { showNotification } from \"./Notification\";\n\nimport Cache from \"../../utils/browser/Cache\";\n\nimport { removeModelByKey } from \"../_modularui/actions\";\nimport { reloadApplication } from \"./Application\";\n\nimport { getSetting } from \"../../constants\";\n\nimport type { ThunkAction } from \"../types\";\n\n/**\n */\nexport const handleUnauthorized =\n  (errorResponse: ErrorResponse): ThunkAction =>\n  (dispatch, getState) => {\n    if (errorResponse.connectKey) {\n      dispatch(removeModelByKey(errorResponse.connectKey));\n    }\n\n    if (\n      getSetting(\"PAGE_RELOAD_ON_UNAUTHORIZED_ERROR\", false) &&\n      errorResponse.response?.error\n    ) {\n      window.location.reload();\n      return;\n    }\n\n    // reload application when flag auth is set\n    if (Cache.getItem(\"auth\")) {\n      dispatch(reloadApplication());\n    }\n\n    // set logged auth\n    dispatch(logoutSuccess());\n\n    Cache.removeItem(\"auth\");\n\n    if (errorResponse.isInvalidUsername) {\n      const WARNING_TIMEOUT = 4000;\n      dispatch(\n        showNotification(\n          NOTIFICATION_TYPES.WARNING,\n          {\n            id: errorResponse.id,\n            defaultMessage: errorResponse.message,\n          },\n          null,\n          WARNING_TIMEOUT\n        )\n      );\n    }\n\n    // add current location as from location before redirect\n    const location = getState().router.location;\n    if (location?.pathname !== LOGIN_PATH) {\n      const locationFrom = location?.state?.from;\n      return dispatch(\n        replace(LOGIN_PATH, {\n          from: locationFrom ? locationFrom : getState().router.location,\n          // cannot open login in a modal, because of previous locations that might be secure\n          modal: false,\n        })\n      );\n    }\n\n    return { type: \"NO_ACTION\" };\n  };\n"],"mappings":";;;;;;;;;AACA;;AAEA;;AAEA;;AACA;;AACA;;AAEA;;AAEA;;AACA;;AAEA;;AAIA;AACA;AACO,IAAMA,kBAAkB,GAC7B,SADWA,kBACX,CAACC,aAAD;EAAA,OACA,UAACC,QAAD,EAAWC,QAAX,EAAwB;IAAA;;IACtB,IAAIF,aAAa,CAACG,UAAlB,EAA8B;MAC5BF,QAAQ,CAAC,IAAAG,0BAAA,EAAiBJ,aAAa,CAACG,UAA/B,CAAD,CAAR;IACD;;IAED,IACE,IAAAE,qBAAA,EAAW,mCAAX,EAAgD,KAAhD,8BACAL,aAAa,CAACM,QADd,kDACA,sBAAwBC,KAF1B,EAGE;MACAC,MAAM,CAACC,QAAP,CAAgBC,MAAhB;MACA;IACD,CAXqB,CAatB;;;IACA,IAAIC,cAAA,CAAMC,OAAN,CAAc,MAAd,CAAJ,EAA2B;MACzBX,QAAQ,CAAC,IAAAY,8BAAA,GAAD,CAAR;IACD,CAhBqB,CAkBtB;;;IACAZ,QAAQ,CAAC,IAAAa,sBAAA,GAAD,CAAR;;IAEAH,cAAA,CAAMI,UAAN,CAAiB,MAAjB;;IAEA,IAAIf,aAAa,CAACgB,iBAAlB,EAAqC;MACnC,IAAMC,eAAe,GAAG,IAAxB;MACAhB,QAAQ,CACN,IAAAiB,8BAAA,EACEC,6BAAA,CAAmBC,OADrB,EAEE;QACEC,EAAE,EAAErB,aAAa,CAACqB,EADpB;QAEEC,cAAc,EAAEtB,aAAa,CAACuB;MAFhC,CAFF,EAME,IANF,EAOEN,eAPF,CADM,CAAR;IAWD,CApCqB,CAsCtB;;;IACA,IAAMR,QAAQ,GAAGP,QAAQ,GAAGsB,MAAX,CAAkBf,QAAnC;;IACA,IAAI,CAAAA,QAAQ,SAAR,IAAAA,QAAQ,WAAR,YAAAA,QAAQ,CAAEgB,QAAV,MAAuBC,qBAA3B,EAAuC;MAAA;;MACrC,IAAMC,YAAY,GAAGlB,QAAH,aAAGA,QAAH,0CAAGA,QAAQ,CAAEmB,KAAb,oDAAG,gBAAiBC,IAAtC;MACA,OAAO5B,QAAQ,CACb,IAAA6B,gBAAA,EAAQJ,qBAAR,EAAoB;QAClBG,IAAI,EAAEF,YAAY,GAAGA,YAAH,GAAkBzB,QAAQ,GAAGsB,MAAX,CAAkBf,QADpC;QAElB;QACAsB,KAAK,EAAE;MAHW,CAApB,CADa,CAAf;IAOD;;IAED,OAAO;MAAEC,IAAI,EAAE;IAAR,CAAP;EACD,CArDD;AAAA,CADK"}
+{"version":3,"file":"Authorization.js","names":["handleUnauthorized","errorResponse","dispatch","getState","connectKey","removeModelByKey","getSetting","response","error","window","location","reload","application","getApplication","Cache","getItem","isLoggedIn","reloadApplication","logoutSuccess","removeItem","isInvalidUsername","WARNING_TIMEOUT","showNotification","NOTIFICATION_TYPES","WARNING","id","defaultMessage","message","router","pathname","LOGIN_PATH","locationFrom","state","from","replace","modal","type"],"sources":["../../../src/redux/actions/Authorization.js"],"sourcesContent":["// @flow\nimport { LOGIN_PATH, NOTIFICATION_TYPES } from \"../../constants/Constants\";\n\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\n\nimport { replace } from \"../_router/actions\";\nimport { logoutSuccess } from \"./SignOut\";\nimport { showNotification } from \"./Notification\";\n\nimport Cache from \"../../utils/browser/Cache\";\n\nimport { removeModelByKey } from \"../_modularui/actions\";\nimport { getApplication } from \"../_modularui/selectors\";\nimport { reloadApplication } from \"./Application\";\n\nimport { getSetting } from \"../../constants\";\n\nimport type { ThunkAction } from \"../types\";\n\n/**\n */\nexport const handleUnauthorized =\n  (errorResponse: ErrorResponse): ThunkAction =>\n  (dispatch, getState) => {\n    if (errorResponse.connectKey) {\n      dispatch(removeModelByKey(errorResponse.connectKey));\n    }\n\n    if (\n      getSetting(\"PAGE_RELOAD_ON_UNAUTHORIZED_ERROR\", false) &&\n      errorResponse.response?.error\n    ) {\n      window.location.reload();\n      return;\n    }\n\n    // reload application when flag auth is set or isLogged\n    const application = getApplication(getState());\n    if (Cache.getItem(\"auth\") || application?.isLoggedIn) {\n      dispatch(reloadApplication());\n    }\n\n    // set logged auth\n    dispatch(logoutSuccess());\n\n    Cache.removeItem(\"auth\");\n\n    if (errorResponse.isInvalidUsername) {\n      const WARNING_TIMEOUT = 4000;\n      dispatch(\n        showNotification(\n          NOTIFICATION_TYPES.WARNING,\n          {\n            id: errorResponse.id,\n            defaultMessage: errorResponse.message,\n          },\n          null,\n          WARNING_TIMEOUT\n        )\n      );\n    }\n\n    // add current location as from location before redirect\n    const location = getState().router.location;\n    if (location?.pathname !== LOGIN_PATH) {\n      const locationFrom = location?.state?.from;\n      return dispatch(\n        replace(LOGIN_PATH, {\n          from: locationFrom ? locationFrom : getState().router.location,\n          // cannot open login in a modal, because of previous locations that might be secure\n          modal: false,\n        })\n      );\n    }\n\n    return { type: \"NO_ACTION\" };\n  };\n"],"mappings":";;;;;;;;;AACA;;AAEA;;AAEA;;AACA;;AACA;;AAEA;;AAEA;;AACA;;AACA;;AAEA;;AAIA;AACA;AACO,IAAMA,kBAAkB,GAC7B,SADWA,kBACX,CAACC,aAAD;EAAA,OACA,UAACC,QAAD,EAAWC,QAAX,EAAwB;IAAA;;IACtB,IAAIF,aAAa,CAACG,UAAlB,EAA8B;MAC5BF,QAAQ,CAAC,IAAAG,0BAAA,EAAiBJ,aAAa,CAACG,UAA/B,CAAD,CAAR;IACD;;IAED,IACE,IAAAE,qBAAA,EAAW,mCAAX,EAAgD,KAAhD,8BACAL,aAAa,CAACM,QADd,kDACA,sBAAwBC,KAF1B,EAGE;MACAC,MAAM,CAACC,QAAP,CAAgBC,MAAhB;MACA;IACD,CAXqB,CAatB;;;IACA,IAAMC,WAAW,GAAG,IAAAC,yBAAA,EAAeV,QAAQ,EAAvB,CAApB;;IACA,IAAIW,cAAA,CAAMC,OAAN,CAAc,MAAd,KAAyBH,WAAzB,aAAyBA,WAAzB,eAAyBA,WAAW,CAAEI,UAA1C,EAAsD;MACpDd,QAAQ,CAAC,IAAAe,8BAAA,GAAD,CAAR;IACD,CAjBqB,CAmBtB;;;IACAf,QAAQ,CAAC,IAAAgB,sBAAA,GAAD,CAAR;;IAEAJ,cAAA,CAAMK,UAAN,CAAiB,MAAjB;;IAEA,IAAIlB,aAAa,CAACmB,iBAAlB,EAAqC;MACnC,IAAMC,eAAe,GAAG,IAAxB;MACAnB,QAAQ,CACN,IAAAoB,8BAAA,EACEC,6BAAA,CAAmBC,OADrB,EAEE;QACEC,EAAE,EAAExB,aAAa,CAACwB,EADpB;QAEEC,cAAc,EAAEzB,aAAa,CAAC0B;MAFhC,CAFF,EAME,IANF,EAOEN,eAPF,CADM,CAAR;IAWD,CArCqB,CAuCtB;;;IACA,IAAMX,QAAQ,GAAGP,QAAQ,GAAGyB,MAAX,CAAkBlB,QAAnC;;IACA,IAAI,CAAAA,QAAQ,SAAR,IAAAA,QAAQ,WAAR,YAAAA,QAAQ,CAAEmB,QAAV,MAAuBC,qBAA3B,EAAuC;MAAA;;MACrC,IAAMC,YAAY,GAAGrB,QAAH,aAAGA,QAAH,0CAAGA,QAAQ,CAAEsB,KAAb,oDAAG,gBAAiBC,IAAtC;MACA,OAAO/B,QAAQ,CACb,IAAAgC,gBAAA,EAAQJ,qBAAR,EAAoB;QAClBG,IAAI,EAAEF,YAAY,GAAGA,YAAH,GAAkB5B,QAAQ,GAAGyB,MAAX,CAAkBlB,QADpC;QAElB;QACAyB,KAAK,EAAE;MAHW,CAApB,CADa,CAAf;IAOD;;IAED,OAAO;MAAEC,IAAI,EAAE;IAAR,CAAP;EACD,CAtDD;AAAA,CADK"}

package/lib/redux/actions/SignOut.js.flow

@@ -2,9 +2,9 @@
 import Authenticate from "../../modularui/Authenticate";
 import { startProgress, finishProgress } from "./ProgressIndicator";
 import { resetModularUI } from "../_modularui/actions";
+import { reloadApplication } from "./Application";
 
 import type { Dispatch, LogoutSuccessAction, ThunkAction } from "../types";
-import { reloadApplication } from "./Application";
 
 /**
  * Send logout success action

package/lib/redux/actions/SignOut.js.map

@@ -1 +1 @@
-{"version":3,"file":"SignOut.js","names":["logoutSuccess","type","logout","dispatch","startProgress","Authenticate","then","resetModularUI","reloadApplication","finishProgress"],"sources":["../../../src/redux/actions/SignOut.js"],"sourcesContent":["// @flow\nimport Authenticate from \"../../modularui/Authenticate\";\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\nimport { resetModularUI } from \"../_modularui/actions\";\n\nimport type { Dispatch, LogoutSuccessAction, ThunkAction } from \"../types\";\nimport { reloadApplication } from \"./Application\";\n\n/**\n * Send logout success action\n */\nexport const logoutSuccess = (): LogoutSuccessAction => ({\n  type: \"AUTHENTICATION_LOGOUT\",\n});\n\n/**\n */\nexport const logout = (): ThunkAction => (dispatch: Dispatch) => {\n  dispatch(startProgress());\n\n  return new Authenticate()\n    .logout()\n    .then(() => dispatch(resetModularUI()))\n    .then(() => dispatch(reloadApplication()))\n    .then(() => {\n      dispatch(logoutSuccess());\n      return dispatch(finishProgress());\n    });\n};\n"],"mappings":";;;;;;;;;AACA;;AACA;;AACA;;AAGA;;AAEA;AACA;AACA;AACO,IAAMA,aAAa,GAAG,SAAhBA,aAAgB;EAAA,OAA4B;IACvDC,IAAI,EAAE;EADiD,CAA5B;AAAA,CAAtB;AAIP;AACA;;;;;AACO,IAAMC,MAAM,GAAG,SAATA,MAAS;EAAA,OAAmB,UAACC,QAAD,EAAwB;IAC/DA,QAAQ,CAAC,IAAAC,gCAAA,GAAD,CAAR;IAEA,OAAO,IAAIC,qBAAJ,GACJH,MADI,GAEJI,IAFI,CAEC;MAAA,OAAMH,QAAQ,CAAC,IAAAI,uBAAA,GAAD,CAAd;IAAA,CAFD,EAGJD,IAHI,CAGC;MAAA,OAAMH,QAAQ,CAAC,IAAAK,8BAAA,GAAD,CAAd;IAAA,CAHD,EAIJF,IAJI,CAIC,YAAM;MACVH,QAAQ,CAACH,aAAa,EAAd,CAAR;MACA,OAAOG,QAAQ,CAAC,IAAAM,iCAAA,GAAD,CAAf;IACD,CAPI,CAAP;EAQD,CAXqB;AAAA,CAAf"}
+{"version":3,"file":"SignOut.js","names":["logoutSuccess","type","logout","dispatch","startProgress","Authenticate","then","resetModularUI","reloadApplication","finishProgress"],"sources":["../../../src/redux/actions/SignOut.js"],"sourcesContent":["// @flow\nimport Authenticate from \"../../modularui/Authenticate\";\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\nimport { resetModularUI } from \"../_modularui/actions\";\nimport { reloadApplication } from \"./Application\";\n\nimport type { Dispatch, LogoutSuccessAction, ThunkAction } from \"../types\";\n\n/**\n * Send logout success action\n */\nexport const logoutSuccess = (): LogoutSuccessAction => ({\n  type: \"AUTHENTICATION_LOGOUT\",\n});\n\n/**\n */\nexport const logout = (): ThunkAction => (dispatch: Dispatch) => {\n  dispatch(startProgress());\n\n  return new Authenticate()\n    .logout()\n    .then(() => dispatch(resetModularUI()))\n    .then(() => dispatch(reloadApplication()))\n    .then(() => {\n      dispatch(logoutSuccess());\n      return dispatch(finishProgress());\n    });\n};\n"],"mappings":";;;;;;;;;AACA;;AACA;;AACA;;AACA;;AAIA;AACA;AACA;AACO,IAAMA,aAAa,GAAG,SAAhBA,aAAgB;EAAA,OAA4B;IACvDC,IAAI,EAAE;EADiD,CAA5B;AAAA,CAAtB;AAIP;AACA;;;;;AACO,IAAMC,MAAM,GAAG,SAATA,MAAS;EAAA,OAAmB,UAACC,QAAD,EAAwB;IAC/DA,QAAQ,CAAC,IAAAC,gCAAA,GAAD,CAAR;IAEA,OAAO,IAAIC,qBAAJ,GACJH,MADI,GAEJI,IAFI,CAEC;MAAA,OAAMH,QAAQ,CAAC,IAAAI,uBAAA,GAAD,CAAd;IAAA,CAFD,EAGJD,IAHI,CAGC;MAAA,OAAMH,QAAQ,CAAC,IAAAK,8BAAA,GAAD,CAAd;IAAA,CAHD,EAIJF,IAJI,CAIC,YAAM;MACVH,QAAQ,CAACH,aAAa,EAAd,CAAR;MACA,OAAOG,QAAQ,CAAC,IAAAM,iCAAA,GAAD,CAAf;IACD,CAPI,CAAP;EAQD,CAXqB;AAAA,CAAf"}

package/lib/redux/actions/__tests__/Application.spec.js.flow

@@ -16,6 +16,10 @@ describe("application actions", () => {
     await store.dispatch(reloadApplication());
 
     expect(store.getActions()).toStrictEqual([
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "application(/)(en)",
+      },
       {
         type: "MODULARUI/STATUS",
         payload: { key: "application(/)(en)", status: "LOADING" },
@@ -39,6 +43,10 @@ describe("application actions", () => {
     store.dispatch(reloadApplication());
 
     expect(store.getActions()).toStrictEqual([
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "/",
+      },
       {
         type: "MODULARUI/STATUS",
         payload: { key: "/", status: "LOADING" },

package/lib/redux/actions/__tests__/Authorization.spec.js.flow

@@ -35,6 +35,10 @@ describe("authorization actions", () => {
     store.dispatch(handleUnauthorized(errorResponse));
 
     expect(store.getActions()).toStrictEqual([
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "/",
+      },
       {
         type: "MODULARUI/REMOVE_KEY",
         payload: "/",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.19.3",
+  "version": "1.19.4",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -51,19 +51,7 @@
     "dist",
     "esm",
     "lib",
-    "codemods",
-    "builder",
-    "exceptions",
-    "hooks",
-    "i18n",
-    "models",
-    "modularui",
-    "react",
-    "react-client",
-    "react-server",
-    "react-theme",
-    "redux",
-    "utils"
+    "codemods"
   ],
   "peerDependencies": {
     "history": "^4.0.0",

package/src/hooks/__tests__/useAuthentication.spec.js

@@ -61,6 +61,10 @@ describe("authentication hooks", () => {
 
     expect(store.getActions()).toStrictEqual([
       { type: "START_PROGRESS" },
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "application(/)(en)",
+      },
       {
         type: "MODULARUI/STATUS",
         payload: { key: "application(/)(en)", status: "LOADING" },
@@ -108,6 +112,10 @@ describe("authentication hooks", () => {
     expect(store.getActions()).toStrictEqual([
       { type: "START_PROGRESS" },
       { type: "MODULARUI/RESET" },
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "application(/)(en)",
+      },
       {
         type: "MODULARUI/STATUS",
         payload: { key: "application(/)(en)", status: "LOADING" },

package/src/redux/actions/Application.js

@@ -1,5 +1,5 @@
 // @flow
-import { loadModularUI } from "../_modularui/actions";
+import { loadModularUI, removeModelByKey } from "../_modularui/actions";
 import { keyByHref } from "../_modularui/selectors";
 import { ApplicationModel, Href } from "../../models";
 
@@ -16,6 +16,8 @@ export const reloadApplication =
       modelKey = `application(/)(${locale})`;
     }
 
+    dispatch(removeModelByKey(modelKey));
+
     return dispatch(
       loadModularUI(modelKey, new Href("/", "Application"), {
         targetModel: ApplicationModel,

package/src/redux/actions/Authorization.js

@@ -10,6 +10,7 @@ import { showNotification } from "./Notification";
 import Cache from "../../utils/browser/Cache";
 
 import { removeModelByKey } from "../_modularui/actions";
+import { getApplication } from "../_modularui/selectors";
 import { reloadApplication } from "./Application";
 
 import { getSetting } from "../../constants";
@@ -33,8 +34,9 @@ export const handleUnauthorized =
       return;
     }
 
-    // reload application when flag auth is set
-    if (Cache.getItem("auth")) {
+    // reload application when flag auth is set or isLogged
+    const application = getApplication(getState());
+    if (Cache.getItem("auth") || application?.isLoggedIn) {
       dispatch(reloadApplication());
     }
 

package/src/redux/actions/SignOut.js

@@ -2,9 +2,9 @@
 import Authenticate from "../../modularui/Authenticate";
 import { startProgress, finishProgress } from "./ProgressIndicator";
 import { resetModularUI } from "../_modularui/actions";
+import { reloadApplication } from "./Application";
 
 import type { Dispatch, LogoutSuccessAction, ThunkAction } from "../types";
-import { reloadApplication } from "./Application";
 
 /**
  * Send logout success action

package/src/redux/actions/__tests__/Application.spec.js

@@ -16,6 +16,10 @@ describe("application actions", () => {
     await store.dispatch(reloadApplication());
 
     expect(store.getActions()).toStrictEqual([
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "application(/)(en)",
+      },
       {
         type: "MODULARUI/STATUS",
         payload: { key: "application(/)(en)", status: "LOADING" },
@@ -39,6 +43,10 @@ describe("application actions", () => {
     store.dispatch(reloadApplication());
 
     expect(store.getActions()).toStrictEqual([
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "/",
+      },
       {
         type: "MODULARUI/STATUS",
         payload: { key: "/", status: "LOADING" },

package/src/redux/actions/__tests__/Authorization.spec.js

@@ -35,6 +35,10 @@ describe("authorization actions", () => {
     store.dispatch(handleUnauthorized(errorResponse));
 
     expect(store.getActions()).toStrictEqual([
+      {
+        type: "MODULARUI/REMOVE_KEY",
+        payload: "/",
+      },
       {
         type: "MODULARUI/REMOVE_KEY",
         payload: "/",

package/builder/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.builder",
-  "private": true,
-  "main": "../lib/builder/index.js",
-  "jsnext:main": "../esm/builder/index.js",
-  "module": "../esm/builder/index.js",
-  "esnext": "../src/builder/index.js"
-}

package/exceptions/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.exceptions",
-  "private": true,
-  "main": "../lib/exceptions/index.js",
-  "jsnext:main": "../esm/exceptions/index.js",
-  "module": "../esm/exceptions/index.js",
-  "esnext": "../src/exceptions/index.js"
-}

package/hooks/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.hooks",
-  "private": true,
-  "main": "../lib/hooks/index.js",
-  "jsnext:main": "../esm/hooks/index.js",
-  "module": "../esm/hooks/index.js",
-  "esnext": "../src/hooks/index.js"
-}

package/i18n/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.i18n",
-  "private": true,
-  "main": "../lib/i18n/index.js",
-  "jsnext:main": "../esm/i18n/index.js",
-  "module": "../esm/i18n/index.js",
-  "esnext": "../src/i18n/index.js"
-}

package/models/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.models",
-  "private": true,
-  "main": "../lib/models/index.js",
-  "jsnext:main": "../esm/models/index.js",
-  "module": "../esm/models/index.js",
-  "esnext": "../src/models/index.js"
-}

package/modularui/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.modularui",
-  "private": true,
-  "main": "../lib/modularui/index.js",
-  "jsnext:main": "../esm/modularui/index.js",
-  "module": "../esm/modularui/index.js",
-  "esnext": "../src/modularui/index.js"
-}

package/react/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.react",
-  "private": true,
-  "main": "../lib/react/index.js",
-  "jsnext:main": "../esm/react/index.js",
-  "module": "../esm/react/index.js",
-  "esnext": "../src/react/index.js"
-}

package/react-client/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.react-client",
-  "private": true,
-  "main": "../lib/react-client/index.js",
-  "jsnext:main": "../esm/react-client/index.js",
-  "module": "../esm/react-client/index.js",
-  "esnext": "../src/react-client/index.js"
-}

package/react-server/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.react-server",
-  "private": true,
-  "main": "../lib/react-server/index.js",
-  "jsnext:main": "../esm/react-server/index.js",
-  "module": "../esm/react-server/index.js",
-  "esnext": "../src/react-server/index.js"
-}

package/react-theme/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.react-theme",
-  "private": true,
-  "main": "../lib/react-theme/index.js",
-  "jsnext:main": "../esm/react-theme/index.js",
-  "module": "../esm/react-theme/index.js",
-  "esnext": "../src/react-theme/index.js"
-}

package/redux/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.redux",
-  "private": true,
-  "main": "../lib/redux/index.js",
-  "jsnext:main": "../esm/redux/index.js",
-  "module": "../esm/redux/index.js",
-  "esnext": "../src/redux/index.js"
-}

package/utils/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "@beinformed/ui.utils",
-  "private": true,
-  "main": "../lib/utils/index.js",
-  "jsnext:main": "../esm/utils/index.js",
-  "module": "../esm/utils/index.js",
-  "esnext": "../src/utils/index.js"
-}