@crystaldesign/diva-core 25.10.0-beta.2 → 25.10.0-beta.20

package/build/esm/{index-2c19f473.js → index-34c20317.js}

@@ -19,6 +19,7 @@ import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import MobileDetect from 'mobile-detect';
 import platform from 'platform';
 import i18n from 'i18next';
+import LanguageDetector from 'i18next-browser-languagedetector';
 import HttpApi from 'i18next-http-backend';
 import * as CoreStyles from '@mui/material/styles';
 import { StyledEngineProvider, ThemeProvider, createTheme } from '@mui/material/styles';
@@ -46,7 +47,7 @@ import { actions } from '@storybook/addon-actions';
 import * as Styles from '@mui/styles';
 
 (function() {
-    const env = {"STAGE":"production","VERSION":"25.10.0-beta.2"};
+    const env = {"STAGE":"production","VERSION":"25.10.0-beta.20"};
     try {
         if (process) {
             process.env = Object.assign({}, process.env);
@@ -1595,75 +1596,71 @@ var DataStore = /*#__PURE__*/function () {
   }]);
 }();
 
-var instance = i18n.createInstance();
-function init(_x) {
-  return _init.apply(this, arguments);
-}
-function _init() {
-  _init = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
-    var url, namespace, available, defaultLng, apiConfig;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          url = _ref.url, namespace = _ref.namespace, available = _ref.available, defaultLng = _ref.defaultLng, apiConfig = _ref.apiConfig;
-          return _context.abrupt("return", new Promise(function (resolve, reject) {
-            var loadPath = "".concat(apiConfig.adminService, "/locales?lng={{lng}}&ns={{ns}}");
-            if (url) {
-              loadPath = url.includes('{{lng}}') ? url : "".concat(url, "?lng={{lng}}&ns={{ns}}");
-            }
-            var namespaces = ['default'];
-            if (namespace) {
-              namespaces.push(namespace);
-            }
-            var lang = defaultLng || (available === null || available === void 0 ? void 0 : available[0]) || 'de';
-            var initOptions = {
-              lng: lang,
-              debug: false,
-              defaultNS: namespace !== null && namespace !== void 0 ? namespace : 'default',
-              fallbackNS: 'default',
-              ns: namespaces,
-              supportedLngs: available || [defaultLng || 'de'],
-              interpolation: {
-                escapeValue: false // not needed for react as it escapes by default
-              },
-              backend: {
-                loadPath: loadPath,
-                crossDomain: true
-              }
-            };
-            instance.use(HttpApi).init(initOptions, function (error) {
-              if (error) {
-                reject(error);
-              } else {
-                resolve(lang);
-              }
-            });
-          }));
-        case 2:
-        case "end":
-          return _context.stop();
+var instance = i18n.createInstance().use(HttpApi).use(LanguageDetector);
+function init(_ref) {
+  var apiConfig = _ref.apiConfig;
+  if (instance.isInitialized) {
+    return Promise.resolve();
+  } else if (instance.isInitializing) {
+    return new Promise(function (resolve, reject) {
+      instance.on('loaded', function () {
+        resolve();
+      });
+      instance.on('failedLoading', function (error) {
+        reject(error);
+      });
+    });
+  }
+  return new Promise(function (resolve, reject) {
+    var loadPath = "".concat(apiConfig.adminService, "/locales?lng={{lng}}&ns={{ns}}");
+    var initOptions = {
+      debug: false,
+      defaultNS: 'default',
+      fallbackNS: 'default',
+      ns: ['default'],
+      fallbackLng: false,
+      supportedLngs: ['de', 'en', 'it', 'fr'],
+      interpolation: {
+        escapeValue: false // not needed for react as it escapes by default
+      },
+      detection: {
+        order: ['querystring', 'localStorage', 'navigator'],
+        lookupQuerystring: 'lang'
+      },
+      backend: {
+        loadPath: loadPath,
+        crossDomain: true
       }
-    }, _callee);
-  }));
-  return _init.apply(this, arguments);
+    };
+    instance.init(initOptions, function (error) {
+      if (error) {
+        reject(error);
+      }
+      resolve();
+    });
+  });
 }
-function changeNamespace(_x2) {
+function changeNamespace(_x) {
   return _changeNamespace.apply(this, arguments);
 }
 function _changeNamespace() {
-  _changeNamespace = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(namespace) {
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+  _changeNamespace = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(namespace) {
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
         case 0:
-          instance.options.ns = [namespace, 'default'];
-          instance.options.defaultNS = namespace;
-          _context2.next = 4;
-          return instance.reloadResources(undefined, namespace);
+          if (instance.hasLoadedNamespace(namespace)) {
+            _context.next = 3;
+            break;
+          }
+          _context.next = 3;
+          return instance.loadNamespaces([namespace]);
+        case 3:
+          instance.setDefaultNamespace(namespace);
         case 4:
         case "end":
-          return _context2.stop();
+          return _context.stop();
       }
-    }, _callee2);
+    }, _callee);
   }));
   return _changeNamespace.apply(this, arguments);
 }
@@ -2015,14 +2012,14 @@ var ContentWrapper = observer(function (_ref2) {
         overflow: 'hidden'
       },
       className: (isPortrait ? ' portrait' : '') + (isMobile ? '  mobile' : '') + (isMobile && !isPortrait ? '  landscape' : '') + (context.dataStore.isMobile ? ' actual-mobile' : ''),
-      children: /*#__PURE__*/jsx(I18nextProvider, {
-        i18n: instance,
-        children: /*#__PURE__*/jsx(ErrorBoundary, {
-          root: context,
-          children: /*#__PURE__*/jsx(ThemeProvider, {
-            theme: context.contentStore.materialUiTheme,
-            children: /*#__PURE__*/jsx(Suspense, {
-              fallback: /*#__PURE__*/jsx(Fallback, {}),
+      children: /*#__PURE__*/jsx(Suspense, {
+        fallback: /*#__PURE__*/jsx(Fallback, {}),
+        children: /*#__PURE__*/jsx(I18nextProvider, {
+          i18n: instance,
+          children: /*#__PURE__*/jsx(ErrorBoundary, {
+            root: context,
+            children: /*#__PURE__*/jsx(ThemeProvider, {
+              theme: context.contentStore.materialUiTheme,
               children: children
             })
           })
@@ -2287,7 +2284,7 @@ var ContentStore = /*#__PURE__*/function () {
       Object.entries(parameters || {}).forEach(function (param) {
         return param[1] ? params.append(param[0], param[1]) : false;
       });
-      params.append('lang', this.root.language);
+      params.append('lang', instance.language);
       params.append('organizationId', this.root.dataStore.organizationId);
       return url.href;
     }
@@ -2387,7 +2384,7 @@ var ContentStore = /*#__PURE__*/function () {
               callback: function callback(accept) {
                 if (accept) {
                   var _config5;
-                  var url = "".concat(window.location.origin).concat((_config5 = config) === null || _config5 === void 0 ? void 0 : _config5.route, "?lang=").concat(_this2.root.language, "&organizationId=").concat(parent._id);
+                  var url = "".concat(window.location.origin).concat((_config5 = config) === null || _config5 === void 0 ? void 0 : _config5.route, "?lang=").concat(instance.language, "&organizationId=").concat(parent._id);
                   _this2.openInNewTab({
                     url: url,
                     openInNewTab: true
@@ -3197,7 +3194,9 @@ var ContentStore = /*#__PURE__*/function () {
       var dialogText = _ref4.dialogText,
         showDialog = _ref4.showDialog,
         callback = _ref4.callback,
-        content = _ref4.content;
+        content = _ref4.content,
+        mailSendCallback = _ref4.mailSendCallback,
+        dialogAcceptMailSend = _ref4.dialogAcceptMailSend;
       return /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
         var accepted, _content$language$toU, _content$language;
         return _regeneratorRuntime.wrap(function _callee3$(_context5) {
@@ -3233,7 +3232,7 @@ var ContentStore = /*#__PURE__*/function () {
             case 6:
               if (showDialog !== false) _this9.root.loadingAndErrorStore.toggleLoading('sendingEmail');
               _context5.prev = 7;
-              content.language = (_content$language$toU = (_content$language = content.language) === null || _content$language === void 0 ? void 0 : _content$language.toUpperCase()) !== null && _content$language$toU !== void 0 ? _content$language$toU : _this9.root.language.toUpperCase();
+              content.language = (_content$language$toU = (_content$language = content.language) === null || _content$language === void 0 ? void 0 : _content$language.toUpperCase()) !== null && _content$language$toU !== void 0 ? _content$language$toU : instance.language.toUpperCase();
               _context5.next = 11;
               return _this9.root.apiHandler.sendEmail({
                 content: content,
@@ -3246,7 +3245,13 @@ var ContentStore = /*#__PURE__*/function () {
                 if (showDialog !== false) {
                   _this9.openModal({
                     text: _this9.root.t('email.send.success'),
-                    accept: true
+                    accept: dialogAcceptMailSend !== null && dialogAcceptMailSend !== void 0 ? dialogAcceptMailSend : true,
+                    reject: dialogAcceptMailSend ? true : false,
+                    callback: function callback(accept) {
+                      if (accept && mailSendCallback) {
+                        mailSendCallback === null || mailSendCallback === void 0 || mailSendCallback();
+                      }
+                    }
                   });
                 }
               }
@@ -3506,7 +3511,7 @@ var ContentStore = /*#__PURE__*/function () {
     key: "materialUiTheme",
     get: function get() {
       var theme = this.root.configurationStore.theme;
-      return createTheme(theme, this.getLang(this.root.language));
+      return createTheme(theme, this.getLang(instance.language));
     }
 
     /**
@@ -3641,9 +3646,7 @@ var ContentStore = /*#__PURE__*/function () {
         Object.entries(parameters || {}).forEach(function (param) {
           return param[1] ? params.append(param[0], param[1]) : false;
         });
-        if (this.root.language) {
-          params.append('lang', this.root.language);
-        }
+        params.append('lang', instance.language);
         if ((_this$root$dataStore$8 = this.root.dataStore.organization) !== null && _this$root$dataStore$8 !== void 0 && _this$root$dataStore$8._id) {
           params.append('organizationId', this.root.dataStore.organization._id);
         }
@@ -3924,7 +3927,6 @@ var _default = /*#__PURE__*/function () {
 var LOG$7 = getLogger('Framework', 'BrowserStateStore');
 var BANNER_STATE_LOCALSTORAGE_KEY = 'diva-banner-state';
 var NTOKEN_LOCALSTORAGE_KEY = 'diva-ntoken';
-var LANGUAGE_LOCALSTORAGE_KEY = 'diva-language';
 var ORGANIZATION_LOCALSTORAGE_KEY = 'diva-organization';
 var LOGIN_METHOD_LOCALSTORAGE_KEY = 'diva-login-method';
 var BrowserStateStore = /*#__PURE__*/function () {
@@ -3959,7 +3961,7 @@ var BrowserStateStore = /*#__PURE__*/function () {
     value: (function () {
       var _loadUrlState = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _route, _searchParams$get;
-        var searchParams, currentUrl, state, route;
+        var searchParams, currentUrl, state, route, authdataString, _state$authdata;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -3980,17 +3982,14 @@ var BrowserStateStore = /*#__PURE__*/function () {
               };
               state.organization = (_searchParams$get = searchParams.get('organizationId')) !== null && _searchParams$get !== void 0 ? _searchParams$get : undefined;
               searchParams["delete"]('organizationId');
-
-              //for backwards compatibilty, if the channelId is set in the url, use that one as organization and update the url in the browser
-              if (searchParams.get('channelId')) {
-                state.organization = searchParams.get('channelId');
-                searchParams["delete"]('channelId');
-                currentUrl.searchParams.set('organizationId', state.organization);
-                currentUrl.searchParams["delete"]('channelId');
+              authdataString = searchParams.get('authdata') || undefined;
+              if (authdataString) {
+                state.authdata = JSON.parse(atob(authdataString));
+                if ((_state$authdata = state.authdata) !== null && _state$authdata !== void 0 && _state$authdata.organizationId) {
+                  state.organization = state.authdata.organizationId;
+                }
               }
-              state.language = searchParams.get('lang') || undefined;
               searchParams["delete"]('lang');
-              state.authdata = searchParams.get('authdata') || undefined;
               searchParams["delete"]('authdata');
               searchParams.forEach(function (value, key) {
                 state.component.parameters[key] = value;
@@ -3999,7 +3998,7 @@ var BrowserStateStore = /*#__PURE__*/function () {
               currentUrl.searchParams["delete"]('authdata');
               history.replaceState(null, '', currentUrl.href);
               return _context.abrupt("return", state);
-            case 19:
+            case 18:
             case "end":
               return _context.stop();
           }
@@ -4170,30 +4169,6 @@ var BrowserStateStore = /*#__PURE__*/function () {
       }
     }
 
-    /**
-     * Get the currently stored language
-     */
-  }, {
-    key: "getStoredLanguage",
-    value: function getStoredLanguage() {
-      return localStorage.getItem(LANGUAGE_LOCALSTORAGE_KEY) || undefined;
-    }
-
-    /**
-     * Updates or removes language in storage
-     *
-     * @param language the new language or undefined to remove it
-     */
-  }, {
-    key: "setStoredLanguage",
-    value: function setStoredLanguage(language) {
-      if (language) {
-        localStorage.setItem(LANGUAGE_LOCALSTORAGE_KEY, language);
-      } else {
-        localStorage.removeItem(LANGUAGE_LOCALSTORAGE_KEY);
-      }
-    }
-
     /**
      * Applies the current state represented by the url to the application
      */
@@ -4210,16 +4185,13 @@ var BrowserStateStore = /*#__PURE__*/function () {
               return this.loadUrlState();
             case 3:
               state = _context2.sent;
-              if (state.language) {
-                this.root.changeLanguage(state.language);
-              }
               if (state.organization) {
                 this.root.dataStore.updateOrganization(state.organization);
               }
               if (state.component) {
                 this.root.contentStore.openComponent(state.component);
               }
-            case 7:
+            case 6:
             case "end":
               return _context2.stop();
           }
@@ -4238,7 +4210,7 @@ var BrowserStateStore = /*#__PURE__*/function () {
     key: "enableUrlSyncronization",
     value: function enableUrlSyncronization() {
       var _this2 = this;
-      autorun(function () {
+      var updateFunction = function updateFunction() {
         var _this2$root$authoriza;
         if (!_this2.isUrlSyncEnabled) {
           return;
@@ -4255,19 +4227,23 @@ var BrowserStateStore = /*#__PURE__*/function () {
           }
           var componentState = _this2.root.contentStore.getState(componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.type);
           url = new URL("".concat(location.origin).concat((_componentState$path = componentState.path) !== null && _componentState$path !== void 0 ? _componentState$path : componentConfig.route));
-          url.searchParams.append('lang', _this2.root.language);
-          url.searchParams.append('organizationId', _this2.root.dataStore.organizationId);
+          url.searchParams.set('lang', instance.language);
+          url.searchParams.set('organizationId', _this2.root.dataStore.organizationId);
           Object.entries(componentState.parameters || {}).forEach(function (_ref) {
             var _ref2 = _slicedToArray(_ref, 2),
               key = _ref2[0],
               value = _ref2[1];
-            return url.searchParams.append(key, value);
+            return url.searchParams.set(key, value);
           });
         }
         if (_this2._url != url.href) {
           _this2.setUrl(url.href);
           history.pushState(null, '', url.href);
         }
+      };
+      instance.on('languageChanged', updateFunction);
+      autorun(function () {
+        return updateFunction();
       }, {
         name: 'onUrlChange'
       });
@@ -4802,7 +4778,7 @@ var AuthorizationStore = /*#__PURE__*/function () {
       var parameters = (_componentConfig = componentConfig) !== null && _componentConfig !== void 0 && _componentConfig.type ? (_this$root$contentSto = this.root.contentStore.getState((_componentConfig2 = componentConfig) === null || _componentConfig2 === void 0 ? void 0 : _componentConfig2.type)) === null || _this$root$contentSto === void 0 ? void 0 : _this$root$contentSto.parameters : undefined;
       if (!parameters && (_componentConfig3 = componentConfig) !== null && _componentConfig3 !== void 0 && _componentConfig3.parameters) parameters = componentConfig.parameters;
       var redirectUrl = new URL("".concat(location.origin).concat((_componentConfig4 = componentConfig) !== null && _componentConfig4 !== void 0 && _componentConfig4.route ? componentConfig.route : ''));
-      redirectUrl.searchParams.append('lang', this.root.language);
+      redirectUrl.searchParams.append('lang', instance.language);
       redirectUrl.searchParams.append('organizationId', currentOrganization !== null && currentOrganization !== void 0 ? currentOrganization : this.root.dataStore.organizationId);
       if (provider) redirectUrl.searchParams.append('provider', provider);
       Object.entries(parameters || {}).forEach(function (_ref) {
@@ -8374,7 +8350,6 @@ var RootStore = /*#__PURE__*/function () {
     _defineProperty(this, "_onEvent", void 0);
     _defineProperty(this, "events", []);
     _defineProperty(this, "_initializing", true);
-    _defineProperty(this, "_language", 'de');
     _defineProperty(this, "_loginMode", (_ref2 = localStorage.getItem(LOGINMODE_LOCALSTORAGE_KEY)) !== null && _ref2 !== void 0 ? _ref2 : 'offline');
     _defineProperty(this, "_apiHandler", void 0);
     _defineProperty(this, "_productHandler", void 0);
@@ -8389,9 +8364,7 @@ var RootStore = /*#__PURE__*/function () {
     _defineProperty(this, "_initalComponent", void 0);
     makeObservable(this, {
       _initializing: observable,
-      _language: observable,
       _loginMode: observable,
-      language: computed,
       changeLanguage: action,
       changeLoginMode: action,
       initializing: computed
@@ -8416,18 +8389,19 @@ var RootStore = /*#__PURE__*/function () {
     this._supportHandler = new SupportHandler(this);
     this._authorizationHandler = new AuthorizationHandler(this);
     this._clientArticleHandler = new ClientArticleHandler(this);
-
-    //every time the organizationId changes call initCache,
-    //no idea what it does
     DivaUtils.loginMode = this._loginMode;
     reaction(function () {
-      var _this$configurationSt;
+      var _this$configurationSt, _this$configurationSt2;
       return {
-        namespace: (_this$configurationSt = _this.configurationStore.locales) === null || _this$configurationSt === void 0 ? void 0 : _this$configurationSt.namespace
+        namespace: (_this$configurationSt = _this.configurationStore.locales) === null || _this$configurationSt === void 0 ? void 0 : _this$configurationSt.namespace,
+        languages: (_this$configurationSt2 = _this.configurationStore.locales) === null || _this$configurationSt2 === void 0 ? void 0 : _this$configurationSt2.available
       };
     }, function (value, prev) {
-      if (!instance.isInitialized || value.namespace == prev.namespace) return;
+      if (!instance.isInitialized || value.namespace == prev.namespace && value.languages == prev.languages) return;
       if (value.namespace) changeNamespace(value.namespace);else changeNamespace('default');
+      if (value.languages && !value.languages.includes(instance.language)) {
+        instance.changeLanguage(value.languages[0]);
+      }
     });
     autorun(function () {
       DivaUtils.initPriceFormat(_this.configurationStore.priceFormat);
@@ -8460,10 +8434,8 @@ var RootStore = /*#__PURE__*/function () {
           }));
         } else {
           runInAction(function () {
-            _this2._language = lang;
-            _this2.browserStateStore.setStoredLanguage(_this2._language);
-            if (['de', 'en', 'fr', 'it'].includes(_this2._language) && _this2.authorizationStore.loginState !== 'anon') {
-              _this2._authorizationHandler.updateUserLanguage(_this2._language);
+            if (['de', 'en', 'fr', 'it'].includes(lang) && _this2.authorizationStore.loginState !== 'anon') {
+              _this2._authorizationHandler.updateUserLanguage(lang);
             }
           });
         }
@@ -8471,15 +8443,6 @@ var RootStore = /*#__PURE__*/function () {
       });
     }
 
-    /**
-     * The current language of the application
-     */
-  }, {
-    key: "language",
-    get: function get() {
-      return this._language;
-    }
-
     /**
      * Changes the current userMode
      * @param mode the new mode
@@ -8520,8 +8483,8 @@ var RootStore = /*#__PURE__*/function () {
   }, {
     key: "languages",
     get: function get() {
-      var _this$configurationSt2, _this$configurationSt3;
-      return (_this$configurationSt2 = (_this$configurationSt3 = this.configurationStore.locales) === null || _this$configurationSt3 === void 0 ? void 0 : _this$configurationSt3.available) !== null && _this$configurationSt2 !== void 0 ? _this$configurationSt2 : ['de'];
+      var _this$configurationSt3, _this$configurationSt4;
+      return (_this$configurationSt3 = (_this$configurationSt4 = this.configurationStore.locales) === null || _this$configurationSt4 === void 0 ? void 0 : _this$configurationSt4.available) !== null && _this$configurationSt3 !== void 0 ? _this$configurationSt3 : ['de'];
     }
 
     /**
@@ -8710,7 +8673,7 @@ var RootStore = /*#__PURE__*/function () {
     value: (function () {
       var _initialize = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(telemetry, identifier, organizationId, domain, language, component, analyticsProps) {
         var _this4 = this;
-        var _this$_initalComponen, _this$_initalComponen2, _configuration$pwa, _this$contentStore$cu, urlState, storedLanguage, storedOrganization, initialOrganization, initialLanguage, configuration, initLocalesResult, telemetrySettings, enableApm, disableDivaAnalyticsLocalStorage, disableDivaAnalytics, enableBusinessMetrics, _configuration$enviro5, _configuration$enviro6, myUserAgentInfo, header, manifest, result, warningText, _this$contentStore, verifyEmailToken, authObject, _urlState$component, _initialOrganization, email, _this$contentStore$cu2;
+        var _this$_initalComponen, _this$_initalComponen2, _configuration$pwa, _this$contentStore$cu, urlState, storedOrganization, initialOrganization, localizationPromise, configuration, header, manifest, verifyEmailToken, authObject, _authObject$code, _urlState$component, _authObject$code2, _authObject$code3, _authObject$code4, _authObject$additiona, _authObject$additiona2, _this$configurationSt5, email, _this$contentStore$cu2;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -8738,17 +8701,19 @@ var RootStore = /*#__PURE__*/function () {
               return this.browserStateStore.loadUrlState();
             case 7:
               urlState = _context.sent;
-              storedLanguage = this.browserStateStore.getStoredLanguage();
               storedOrganization = this.browserStateStore.getStoredOrganization(); //the inital state is derived in the fallowing order: component params > url > browserstore > configuration
               initialOrganization = organizationId || urlState.organization || storedOrganization;
-              initialLanguage = language || urlState.language || storedLanguage;
+              if (initialOrganization) {
+                this.initializeAuthorization(initialOrganization);
+              }
               LOG$4.startTransaction({
                 event: 'onLoadConfig',
                 message: 'loading Config',
                 eventId: 'LOAD_CONFIG'
               });
-
-              //load core configuration based on initaly available information
+              localizationPromise = init({
+                apiConfig: this.configurationStore.apiConfig
+              }); //load core configuration based on initaly available information
               _context.next = 15;
               return this.configurationStore.fetchConfiguration({
                 identifier: identifier,
@@ -8770,53 +8735,7 @@ var RootStore = /*#__PURE__*/function () {
                 message: 'load server data',
                 eventId: 'LOAD_SERVER_DATA'
               });
-
-              //async load locales data
-              initLocalesResult = init(_objectSpread$7(_objectSpread$7({}, this.configurationStore.locales), {}, {
-                defaultLng: initialLanguage,
-                apiConfig: this.configurationStore.apiConfig
-              }));
-              telemetrySettings = this.configurationStore.telemetrySettings;
-              enableApm = telemetry && (telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.apm) != false;
-              disableDivaAnalyticsLocalStorage = localStorage.getItem('disableDivaAnalytics');
-              disableDivaAnalytics = disableDivaAnalyticsLocalStorage !== undefined && disableDivaAnalyticsLocalStorage !== null && disableDivaAnalyticsLocalStorage === 'true';
-              enableBusinessMetrics = telemetrySettings && (telemetrySettings.businessEvents == undefined || (telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.businessEvents)) && telemetry && !disableDivaAnalytics;
-              if (telemetry && telemetrySettings !== null && telemetrySettings !== void 0 && telemetrySettings.cookieBotCbid) {
-                initCookieBot(telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.cookieBotCbid, function (consent) {
-                  if (consent.statistics) {
-                    var _configuration$enviro;
-                    init$1(enableApm, (_configuration$enviro = configuration.environment) !== null && _configuration$enviro !== void 0 ? _configuration$enviro : 'PROD', configuration.applicationName, typeof (telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.apm) == 'string' ? telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.apm : undefined);
-                  }
-                  if (consent.necessary && enableBusinessMetrics) {
-                    var _configuration$enviro2;
-                    var myUserAgentInfo = getUserAgentInfo();
-                    DivaUtils.businessMetrics.init("production" != 'development', // true, - to local test on PETERPC
-                    (_configuration$enviro2 = configuration.environment) !== null && _configuration$enviro2 !== void 0 ? _configuration$enviro2 : 'PROD', window.DIVA_VERSION, _this4.apiConfig.analyticsService, _this4.jwt, telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.personalData, myUserAgentInfo.family, myUserAgentInfo.os, myUserAgentInfo.deviceName, myUserAgentInfo.browser, myUserAgentInfo.screenWidth, myUserAgentInfo.screenHeight, myUserAgentInfo.osVersion, configuration.applicationEnvironment, initialLanguage, analyticsProps);
-                  }
-                }, function (reason) {
-                  var _configuration$enviro3;
-                  LOG$4.error(new DivaError('Cookiebot initialization failed', {
-                    code: 'CORE_0009',
-                    custom: {
-                      reason: reason
-                    }
-                  }));
-                  init$1(enableApm, (_configuration$enviro3 = configuration.environment) !== null && _configuration$enviro3 !== void 0 ? _configuration$enviro3 : 'PROD', configuration.applicationName, typeof (telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.apm) == 'string' ? telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.apm : undefined);
-                  if (enableBusinessMetrics) {
-                    var _configuration$enviro4;
-                    var myUserAgentInfo = getUserAgentInfo();
-                    DivaUtils.businessMetrics.init("production" != 'development', (_configuration$enviro4 = configuration.environment) !== null && _configuration$enviro4 !== void 0 ? _configuration$enviro4 : 'PROD', window.DIVA_VERSION, _this4.apiConfig.analyticsService, _this4.jwt, telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.personalData, myUserAgentInfo.family, myUserAgentInfo.os, myUserAgentInfo.deviceName, myUserAgentInfo.browser, myUserAgentInfo.screenWidth, myUserAgentInfo.screenHeight, myUserAgentInfo.osVersion, configuration.applicationEnvironment, initialLanguage, analyticsProps);
-                  }
-                });
-              } else {
-                init$1(enableApm, (_configuration$enviro5 = configuration.environment) !== null && _configuration$enviro5 !== void 0 ? _configuration$enviro5 : 'PROD', configuration.applicationName, typeof (telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.apm) == 'string' ? telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.apm : undefined);
-                if (enableBusinessMetrics) {
-                  myUserAgentInfo = getUserAgentInfo();
-                  DivaUtils.businessMetrics.init("production" != 'development', // true, - to local test on PETERPC
-                  (_configuration$enviro6 = configuration.environment) !== null && _configuration$enviro6 !== void 0 ? _configuration$enviro6 : 'PROD', window.DIVA_VERSION, this.apiConfig.analyticsService, this.jwt, telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.personalData, myUserAgentInfo.family, myUserAgentInfo.os, myUserAgentInfo.deviceName, myUserAgentInfo.browser, myUserAgentInfo.screenWidth, myUserAgentInfo.screenHeight, myUserAgentInfo.osVersion, configuration.applicationEnvironment, initialLanguage, analyticsProps);
-                }
-              }
-              apmIsInitalized();
+              this.initializeTelemetry(telemetry, configuration.environment, configuration.applicationEnvironment, configuration.applicationName, analyticsProps);
               if (configuration.cssCustomFile) {
                 header = document.getElementsByTagName('HEAD')[0];
                 if (header) DivaUtils.loadCSS(configuration.cssCustomFile, header, undefined);
@@ -8836,26 +8755,19 @@ var RootStore = /*#__PURE__*/function () {
                   }
                 });
               });
-
-              //wait for all asnyc processes to finish and set the last state data
-              _context.next = 34;
-              return initLocalesResult;
-            case 34:
-              result = _context.sent;
-              runInAction(function () {
-                _this4._language = result;
-                _this4.browserStateStore.setStoredLanguage(_this4._language);
-              });
-              warningText = this.t('init.deploymentwarntext', '');
-              if (warningText.trim() !== '' && this.doShowInitWarnBanner) {
-                (_this$contentStore = this.contentStore) === null || _this$contentStore === void 0 || _this$contentStore.openBanner({
-                  key: 'InitialWarningBanner',
-                  type: 'WARNING',
-                  title: this.t('modals.warning', 'Warnung'),
-                  text: warningText,
-                  useLocalStorage: true
-                });
-              }
+              localizationPromise.then(function () {
+                var warningText = _this4.t('init.deploymentwarntext', '');
+                if (warningText.trim() !== '' && _this4.doShowInitWarnBanner) {
+                  var _this4$contentStore;
+                  (_this4$contentStore = _this4.contentStore) === null || _this4$contentStore === void 0 || _this4$contentStore.openBanner({
+                    key: 'InitialWarningBanner',
+                    type: 'WARNING',
+                    title: _this4.t('modals.warning', 'Warnung'),
+                    text: warningText,
+                    useLocalStorage: true
+                  });
+                }
+              });
               LOG$4.successTransaction('LOAD_SERVER_DATA');
               LOG$4.startTransaction({
                 event: 'onLoadUserData',
@@ -8864,148 +8776,110 @@ var RootStore = /*#__PURE__*/function () {
               });
 
               //load userdata
-              _context.prev = 40;
+              _context.prev = 28;
               if (!urlState.authdata) {
-                _context.next = 65;
+                _context.next = 53;
                 break;
               }
-              authObject = JSON.parse(atob(urlState.authdata));
+              authObject = urlState.authdata;
               _context.t0 = authObject === null || authObject === void 0 ? void 0 : authObject.path;
-              _context.next = _context.t0 === 'openIdCallback' ? 46 : _context.t0 === 'resetPassword' ? 48 : _context.t0 === 'confirmEmail' ? 50 : _context.t0 === 'acceptInvitation' ? 52 : 62;
+              _context.next = _context.t0 === 'openIdCallback' ? 34 : _context.t0 === 'resetPassword' ? 36 : _context.t0 === 'confirmEmail' ? 38 : _context.t0 === 'acceptInvitation' ? 40 : 50;
               break;
-            case 46:
+            case 34:
               if (authObject.error) {
-                LOG$4.errorTransaction('LOAD_USER_DATA', 'CORE_0006', authObject.error);
+                LOG$4.errorTransaction('LOAD_USER_DATA', (_authObject$code = authObject.code) !== null && _authObject$code !== void 0 ? _authObject$code : 'CORE_0006', authObject.error);
                 this.authorizationStore.showLogin(false, true);
               } else {
-                initialOrganization = authObject.organizationId;
                 if (urlState !== null && urlState !== void 0 && (_urlState$component = urlState.component) !== null && _urlState$component !== void 0 && (_urlState$component = _urlState$component.parameters) !== null && _urlState$component !== void 0 && _urlState$component.provider) {
                   this.browserStateStore.setStoredLoginMethod(urlState.component.parameters.provider);
                 }
                 this.browserStateStore.setStoredNToken(authObject.token, authObject.expiresBy);
               }
-              return _context.abrupt("break", 63);
-            case 48:
+              return _context.abrupt("break", 51);
+            case 36:
               if (authObject.error) {
-                LOG$4.errorTransaction('LOAD_USER_DATA', authObject.code, authObject.error);
+                LOG$4.errorTransaction('LOAD_USER_DATA', (_authObject$code2 = authObject.code) !== null && _authObject$code2 !== void 0 ? _authObject$code2 : 'CORE_0006', authObject.error);
                 this.loadingAndErrorStore.setError(authObject.error);
               } else {
                 this.authorizationStore.showChangePassword(authObject.token);
               }
-              return _context.abrupt("break", 63);
-            case 50:
+              return _context.abrupt("break", 51);
+            case 38:
               if (authObject.error) {
-                LOG$4.errorTransaction('LOAD_USER_DATA', authObject.code, authObject.error);
+                LOG$4.errorTransaction('LOAD_USER_DATA', (_authObject$code3 = authObject.code) !== null && _authObject$code3 !== void 0 ? _authObject$code3 : 'CORE_0006', authObject.error);
                 this.loadingAndErrorStore.setError(authObject.error);
               } else {
                 verifyEmailToken = authObject.token;
               }
-              return _context.abrupt("break", 63);
-            case 52:
+              return _context.abrupt("break", 51);
+            case 40:
               if (!authObject.error) {
-                _context.next = 57;
+                _context.next = 45;
                 break;
               }
-              LOG$4.errorTransaction('LOAD_INVITATION', authObject.code, authObject.error);
+              LOG$4.errorTransaction('LOAD_INVITATION', (_authObject$code4 = authObject.code) !== null && _authObject$code4 !== void 0 ? _authObject$code4 : 'CORE_0006', authObject.error);
               this.loadingAndErrorStore.setError(authObject.error);
-              _context.next = 61;
+              _context.next = 49;
               break;
-            case 57:
+            case 45:
               if (!this.browserStateStore.getStoredNToken()) {
-                _context.next = 60;
+                _context.next = 48;
                 break;
               }
-              _context.next = 60;
+              _context.next = 48;
               return this.authorizationStore.logout(undefined, undefined, undefined, true);
-            case 60:
-              this.authorizationStore.showWelcomeScreen(authObject.additionalParams.isNewUser, authObject.token, authObject.additionalParams.invitationOrgId);
-            case 61:
-              return _context.abrupt("break", 63);
-            case 62:
-              return _context.abrupt("break", 63);
-            case 63:
-              _context.next = 65;
+            case 48:
+              this.authorizationStore.showWelcomeScreen((_authObject$additiona = authObject.additionalParams) === null || _authObject$additiona === void 0 ? void 0 : _authObject$additiona.isNewUser, authObject.token, (_authObject$additiona2 = authObject.additionalParams) === null || _authObject$additiona2 === void 0 ? void 0 : _authObject$additiona2.invitationOrgId);
+            case 49:
+              return _context.abrupt("break", 51);
+            case 50:
+              return _context.abrupt("break", 51);
+            case 51:
+              _context.next = 53;
               break;
-            case 65:
+            case 53:
               LOG$4.successTransaction('LOAD_USER_DATA');
+              if (initialOrganization) {
+                _context.next = 57;
+                break;
+              }
+              _context.next = 57;
+              return this.initializeAuthorization((_this$configurationSt5 = this.configurationStore.organizations) === null || _this$configurationSt5 === void 0 ? void 0 : _this$configurationSt5[0]);
+            case 57:
               if (!(!this.browserStateStore.getStoredNToken() && this.configurationStore.hasAuthentication)) {
-                _context.next = 80;
+                _context.next = 61;
                 break;
               }
-              _context.prev = 67;
-              _context.next = 70;
-              return flowResult(this.authorizationStore.autorize((_initialOrganization = initialOrganization) !== null && _initialOrganization !== void 0 ? _initialOrganization : configuration.organizations[0]));
-            case 70:
-              _context.next = 77;
-              break;
-            case 72:
-              _context.prev = 72;
-              _context.t1 = _context["catch"](67);
-              this.loadingAndErrorStore.setError(_context.t1);
-              LOG$4.errorTransaction('INITIALIZE_CORE', _context.t1.code, 'Organization Error');
-              return _context.abrupt("return");
-            case 77:
-              //now Login Page opens. The overwritten initComponent params get saved in restrictedComponent. this will later be evaluated in getRedirectUrl
+              //if user is not logged in, show login form and exit initialization
+              //The overwritten initComponent params get saved in restrictedComponent. this will later be evaluated in getRedirectUrl
               this.contentStore.restrictedComponent = this._initalComponent;
               this.authorizationStore.showLogin(urlState.debugLogin, false, initialOrganization);
               return _context.abrupt("return");
-            case 80:
-              //user is either logged in or no authentication is required
-              if (!initialOrganization && !this.configurationStore.hasAuthentication) {
-                //if no authentication, fallback to first organization in config
-                initialOrganization = configuration.organizations[0];
-              }
-              _context.prev = 81;
-              _context.next = 84;
-              return flowResult(this.authorizationStore.autorize(initialOrganization, this.browserStateStore.getStoredNToken()));
-            case 84:
-              initialOrganization = _context.sent;
-              _context.next = 92;
-              break;
-            case 87:
-              _context.prev = 87;
-              _context.t2 = _context["catch"](81);
-              LOG$4.errorTransaction('INITIALIZE_CORE', 'CORE_0002', 'Error initializing Organization');
-              this.loadingAndErrorStore.setError(_context.t2, 'CORE_0002', true);
-              return _context.abrupt("return");
-            case 92:
-              _context.prev = 92;
-              _context.next = 95;
-              return flowResult(this.dataStore.updateOrganizationInternal(initialOrganization));
-            case 95:
-              _context.next = 102;
-              break;
-            case 97:
-              _context.prev = 97;
-              _context.t3 = _context["catch"](92);
-              LOG$4.errorTransaction('INITIALIZE_CORE', 'CORE_0002', 'Error updating Organization');
-              this.loadingAndErrorStore.setError(_context.t3);
-              return _context.abrupt("return");
-            case 102:
+            case 61:
               if (!verifyEmailToken) {
-                _context.next = 108;
+                _context.next = 67;
                 break;
               }
-              _context.next = 105;
+              _context.next = 64;
               return this.apiHandler.verifyEmail({
                 token: verifyEmailToken
               });
-            case 105:
+            case 64:
               email = _context.sent;
-              _context.next = 108;
+              _context.next = 67;
               return flowResult(this.authorizationStore.login(email, undefined, true, initialOrganization));
-            case 108:
-              _context.next = 113;
+            case 67:
+              _context.next = 72;
               break;
-            case 110:
-              _context.prev = 110;
-              _context.t4 = _context["catch"](40);
-              if (_context.t4 instanceof DivaError && _context.t4.name == 'AUTH_0006') {
+            case 69:
+              _context.prev = 69;
+              _context.t1 = _context["catch"](28);
+              if (_context.t1 instanceof DivaError && _context.t1.name == 'AUTH_0006') {
                 LOG$4.errorTransaction('INITIALIZE_CORE', 'AUTH_0006', 'Existing verification token not valid.');
               } else {
                 LOG$4.errorTransaction('INITIALIZE_CORE', 'CORE_0006', 'An error occured during initialization.');
               }
-            case 113:
+            case 72:
               this.initalizeView();
               if (this.jwt) {
                 DivaUtils.businessMetrics.jwtSetter = this.jwt;
@@ -9016,41 +8890,182 @@ var RootStore = /*#__PURE__*/function () {
                 identifier: identifier,
                 organizationId: this.dataStore.organizationId,
                 domain: domain,
-                language: this._language,
+                language: instance.language,
                 component: (_this$contentStore$cu = this.contentStore.currentComponent) === null || _this$contentStore$cu === void 0 ? void 0 : _this$contentStore$cu.type
               });
-              _context.next = 123;
+              _context.next = 82;
               break;
-            case 118:
-              _context.prev = 118;
-              _context.t5 = _context["catch"](1);
+            case 77:
+              _context.prev = 77;
+              _context.t2 = _context["catch"](1);
               this.loadingAndErrorStore.toggleLoading('initalize', false);
-              this.loadingAndErrorStore.setError(_context.t5);
-              LOG$4.errorTransaction('INITIALIZE_CORE', 'CORE_0000', _context.t5.message, {
+              this.loadingAndErrorStore.setError(_context.t2);
+              LOG$4.errorTransaction('INITIALIZE_CORE', 'CORE_0000', _context.t2.message, {
                 identifier: identifier,
                 organizationId: this.dataStore.organizationId,
                 domain: domain,
-                language: this._language,
+                language: instance.language,
                 component: (_this$contentStore$cu2 = this.contentStore.currentComponent) === null || _this$contentStore$cu2 === void 0 ? void 0 : _this$contentStore$cu2.type
               });
-            case 123:
-              _context.prev = 123;
+            case 82:
+              _context.prev = 82;
               this.loadingAndErrorStore.toggleLoading('initalize');
               runInAction(function () {
                 _this4._initializing = false;
               });
-              return _context.finish(123);
-            case 127:
+              return _context.finish(82);
+            case 86:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[1, 118, 123, 127], [40, 110], [67, 72], [81, 87], [92, 97]]);
+        }, _callee, this, [[1, 77, 82, 86], [28, 69]]);
       }));
       function initialize(_x, _x2, _x3, _x4, _x5, _x6, _x7) {
         return _initialize.apply(this, arguments);
       }
       return initialize;
+    }()
+    /**
+     * initalize cookiebot, telemetry and business metrics
+     *
+     * @param telemetry if telemetry is enabled
+     * @param environment defines if we are running in development or production
+     * @param applicationEnvironment defines if we are running in seller or web
+     * @param applicationName the name of the application
+     * @param analyticsProps the analytics props
+     */
+    )
+  }, {
+    key: "initializeTelemetry",
+    value: (function () {
+      var _initializeTelemetry = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(telemetry) {
+        var _this5 = this;
+        var environment,
+          applicationEnvironment,
+          applicationName,
+          analyticsProps,
+          telemetrySettings,
+          enableApm,
+          _args2 = arguments;
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              environment = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : 'PROD';
+              applicationEnvironment = _args2.length > 2 ? _args2[2] : undefined;
+              applicationName = _args2.length > 3 ? _args2[3] : undefined;
+              analyticsProps = _args2.length > 4 ? _args2[4] : undefined;
+              telemetrySettings = this.configurationStore.telemetrySettings;
+              enableApm = telemetry && (telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.apm) != false;
+              if (telemetry && telemetrySettings !== null && telemetrySettings !== void 0 && telemetrySettings.cookieBotCbid) {
+                initCookieBot(telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.cookieBotCbid, function (consent) {
+                  if (consent.statistics) {
+                    init$1(enableApm, environment, applicationName, typeof (telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.apm) == 'string' ? telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.apm : undefined);
+                  }
+                  if (consent.necessary) {
+                    _this5.initializeBusinessMetrics(telemetry, environment, applicationEnvironment, telemetrySettings, analyticsProps);
+                  }
+                }, function (reason) {
+                  LOG$4.error(new DivaError('Cookiebot initialization failed', {
+                    code: 'CORE_0009',
+                    custom: {
+                      reason: reason
+                    }
+                  }));
+                  init$1(enableApm, environment, applicationName, typeof (telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.apm) == 'string' ? telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.apm : undefined);
+                  _this5.initializeBusinessMetrics(telemetry, environment, applicationEnvironment, telemetrySettings, analyticsProps);
+                });
+              } else {
+                init$1(enableApm, environment, applicationName, typeof (telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.apm) == 'string' ? telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.apm : undefined);
+                this.initializeBusinessMetrics(telemetry, environment, applicationEnvironment, telemetrySettings, analyticsProps);
+              }
+              apmIsInitalized();
+            case 8:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function initializeTelemetry(_x8) {
+        return _initializeTelemetry.apply(this, arguments);
+      }
+      return initializeTelemetry;
+    }()
+    /**
+     * initalize business metrics
+     *
+     * @param telementryActive if telemetry is enabled
+     * @param environment defines if we are running in development or production
+     * @param applicationEnvironment defines if we are running in seller or web
+     * @param telemetryActive the telemetry settings
+     * @param analyticsProps the analytics props
+     */
+    )
+  }, {
+    key: "initializeBusinessMetrics",
+    value: (function () {
+      var _initializeBusinessMetrics = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(telemetryActive, environment, applicationEnvironment, telemetrySettings, analyticsProps) {
+        var disableDivaAnalyticsLocalStorage, disableDivaAnalytics, enableBusinessMetrics, myUserAgentInfo;
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              disableDivaAnalyticsLocalStorage = localStorage.getItem('disableDivaAnalytics');
+              disableDivaAnalytics = disableDivaAnalyticsLocalStorage !== undefined && disableDivaAnalyticsLocalStorage !== null && disableDivaAnalyticsLocalStorage === 'true';
+              enableBusinessMetrics = telemetrySettings && (telemetrySettings.businessEvents == undefined || (telemetrySettings === null || telemetrySettings === void 0 ? void 0 : telemetrySettings.businessEvents)) && telemetryActive && !disableDivaAnalytics;
+              if (enableBusinessMetrics) {
+                _context3.next = 5;
+                break;
+              }
+              return _context3.abrupt("return");
+            case 5:
+              myUserAgentInfo = getUserAgentInfo();
+              DivaUtils.businessMetrics.init("production" != 'development', environment, window.DIVA_VERSION, this.apiConfig.analyticsService, this.jwt, telemetrySettings.personalData, myUserAgentInfo.family, myUserAgentInfo.os, myUserAgentInfo.deviceName, myUserAgentInfo.browser, myUserAgentInfo.screenWidth, myUserAgentInfo.screenHeight, myUserAgentInfo.osVersion, applicationEnvironment, instance.language, analyticsProps);
+            case 7:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function initializeBusinessMetrics(_x9, _x10, _x11, _x12, _x13) {
+        return _initializeBusinessMetrics.apply(this, arguments);
+      }
+      return initializeBusinessMetrics;
     }())
+  }, {
+    key: "initializeAuthorization",
+    value: function () {
+      var _initializeAuthorization = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(initialOrganization) {
+        var organizationId;
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.prev = 0;
+              _context4.next = 3;
+              return flowResult(this.authorizationStore.autorize(initialOrganization, this.browserStateStore.getStoredNToken()));
+            case 3:
+              organizationId = _context4.sent;
+              _context4.next = 6;
+              return flowResult(this.dataStore.updateOrganizationInternal(organizationId));
+            case 6:
+              _context4.next = 14;
+              break;
+            case 8:
+              _context4.prev = 8;
+              _context4.t0 = _context4["catch"](0);
+              this.loadingAndErrorStore.setError(_context4.t0);
+              LOG$4.errorTransaction('INITIALIZE_CORE', 'CORE_0002', 'Error initializing Organization');
+              this.loadingAndErrorStore.setError(_context4.t0, 'CORE_0002', true);
+              return _context4.abrupt("return");
+            case 14:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this, [[0, 8]]);
+      }));
+      function initializeAuthorization(_x14) {
+        return _initializeAuthorization.apply(this, arguments);
+      }
+      return initializeAuthorization;
+    }()
   }, {
     key: "initalizeView",
     value: function initalizeView() {
@@ -9621,7 +9636,7 @@ var SideMenu$1 = observer(SideMenu);
 function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LazyModals$1 = /*#__PURE__*/React.lazy(function () {
-  return import('./ModalsWrapper-02ea1849.js');
+  return import('./ModalsWrapper-6f905201.js');
 });
 function Fullscreen(_ref) {
   var inAbsoluteFullscreen = _ref.inAbsoluteFullscreen;
@@ -10079,10 +10094,10 @@ function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymb
 function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$2 = getLogger('Framework', 'Root');
 var LazyAuth = /*#__PURE__*/React.lazy(function () {
-  return import('./index-42d5057d.js');
+  return import('./index-c94e6531.js');
 });
 var LazyModals = /*#__PURE__*/React.lazy(function () {
-  return import('./ModalsWrapper-02ea1849.js');
+  return import('./ModalsWrapper-6f905201.js');
 });
 function ContentComponent() {
   var context = useDivaCoreContext();
@@ -10484,21 +10499,16 @@ var MockedRootStore = /*#__PURE__*/function () {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _this$data$language;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (this.data.priceFormat) DivaUtils.initPriceFormat(this.data.priceFormat);
               updateCssThemeVariables(this.container, this.theme);
-              _context.next = 4;
-              return init(_objectSpread(_objectSpread({}, this.data.locales), {}, {
-                apiConfig: this.apiConfig,
-                defaultLng: (_this$data$language = this.data.language) !== null && _this$data$language !== void 0 ? _this$data$language : this.language
+              init(_objectSpread(_objectSpread({}, this.data.locales), {}, {
+                apiConfig: this.apiConfig
               }));
-            case 4:
-              this._language = _context.sent;
               this.initalized();
-            case 6:
+            case 4:
             case "end":
               return _context.stop();
           }