@beinformed/ui 1.45.3 → 1.46.1

package/src/models/types.js

@@ -45,6 +45,7 @@ import type BaseFilterModel from "./filters/BaseFilterModel";
 import type AttributeCollection from "./attributes/AttributeCollection";
 import type AttributeModel from "./attributes/AttributeModel";
 import type LayoutHintCollection from "./layouthint/LayoutHintCollection";
+import type ErrorResponse from "./error/ErrorResponse";
 
 export type ModularUIModel =
   | ApplicationModel
@@ -151,7 +152,10 @@ export interface ILayoutHintRule {
 
 export interface IModelWithChildModels {
   getInitialChildModelLinks(): Array<LinkModel>;
-  setChildModels(models: Array<ModularUIModel>): void;
+  setChildModels(
+    models: Array<ModularUIModel>,
+    errors: Array<ErrorResponse>,
+  ): void;
 }
 
 export type AuthenticationType = {

package/src/models/user/UserServicesModel.js

@@ -1,6 +1,7 @@
 // @flow
 import ResourceModel from "../base/ResourceModel";
 import UserModel from "../user/UserModel";
+import ErrorResponse from "../error/ErrorResponse";
 
 import type { ModularUIModel } from "../types";
 import type { ModularUIResponse } from "../../modularui";
@@ -12,6 +13,7 @@ import type Href from "../href/Href";
  */
 class UserServicesModel extends ResourceModel {
   _user: ?UserModel;
+  _mustChangePassword: boolean = false;
 
   /**
    */
@@ -43,7 +45,10 @@ class UserServicesModel extends ResourceModel {
 
   /**
    */
-  setChildModels(models: Array<ModularUIModel>) {
+  setChildModels(models: Array<ModularUIModel>, errors: Array<ErrorResponse>) {
+    this.mustChangePassword = Array.isArray(errors)
+      ? errors.some((error) => error.isChangePassword) ?? false
+      : false;
     this.user = models.find((model) => model.type === "User");
   }
 
@@ -109,6 +114,18 @@ class UserServicesModel extends ResourceModel {
     const UNSECURE_LINK_COUNT = 3;
     return this.links.length > UNSECURE_LINK_COUNT || hasUser;
   }
+
+  /**
+   */
+  set mustChangePassword(mustChangePassword: boolean) {
+    this._mustChangePassword = mustChangePassword;
+  }
+
+  /**
+   */
+  get mustChangePassword(): boolean {
+    return this._mustChangePassword;
+  }
 }
 
 export default UserServicesModel;

package/src/modularui/ModularUIRequest.js

@@ -13,6 +13,7 @@ import universalFetch from "../utils/fetch/universalFetch";
 import resolveModel from "../models/resolveModel";
 import FormModel from "../models/form/FormModel";
 import ContentModel from "../models/content/ContentModel";
+import ErrorResponse from "../models/error/ErrorResponse";
 
 import ModularUIResponse from "./ModularUIResponse";
 
@@ -670,22 +671,25 @@ class ModularUIRequest {
 
     return Promise.allSettled(childModelRequests).then((childModels) => {
       const resolvedChildModels = [];
+      const errorChildModels = [];
 
       childModels.forEach((childModel) => {
         if (childModel.status === "rejected") {
           const { reason } = childModel;
           if (reason.name !== "Error.ChangePasswordRequired") {
-            console.error(
+            // eslint-disable-next-line no-console
+            console.debug(
               "Unexpected error when retrieving child model:",
               reason,
             );
           }
+          errorChildModels.push(new ErrorResponse(reason));
         } else {
           resolvedChildModels.push(childModel.value);
         }
       });
 
-      model.addChildModels(resolvedChildModels);
+      model.addChildModels(resolvedChildModels, errorChildModels);
 
       return model;
     });
@@ -798,7 +802,7 @@ class ModularUIRequest {
         locale: this.locale,
       }).fetchSync();
     });
-    model.addChildModels(childModels);
+    model.addChildModels(childModels, []);
 
     return model;
   }

package/src/react-client/rehydrate.js

@@ -22,7 +22,7 @@ const recreateModel = (data: Object) => {
       recreateModel(childModel),
     );
 
-    model.addChildModels(childModels);
+    model.addChildModels(childModels, []);
 
     return model;
   }

package/src/redux/actions/SignIn.js

@@ -1,6 +1,7 @@
 // @flow
 import Cache from "../../utils/browser/Cache";
 import Authenticate from "../../modularui/Authenticate";
+import { getApplication } from "../_modularui/ModularUISelectors";
 
 import { reloadApplication } from "./Application";
 
@@ -68,7 +69,7 @@ export const changePassword = (): ThunkAction => (dispatch, getState) => {
  */
 export const login =
   (username: string, password: string): ThunkAction =>
-  (dispatch) => {
+  (dispatch, getState) => {
     dispatch(startProgress());
 
     return new Authenticate()
@@ -76,8 +77,12 @@ export const login =
       .then(() => dispatch(reloadApplication()))
       .then(() => {
         Cache.addItem("auth", true);
-        dispatch(loginSuccess());
-
+        const application = getApplication(getState());
+        if (application?.userMustChangePassword) {
+          dispatch(changePassword());
+        } else {
+          dispatch(loginSuccess());
+        }
         return dispatch(finishProgress());
       })
       .catch((error) => {

package/src/redux/store/configureStore.js

@@ -13,6 +13,8 @@ import { modularUIMiddleware } from "../_modularui/ModularUIMiddleware";
 import { createReducer } from "../reducers/createReducer";
 import { locationChange } from "../_router/RouterActions";
 
+import { updateLocale } from "../_i18n/I18nActions";
+
 import type { RouterHistory } from "react-router";
 import type { ReduxAction, ReduxState, ReduxStore } from "../types";
 import type { Reducer } from "redux";
@@ -52,6 +54,12 @@ const configureStore = (
   if (!initialState?.router) {
     store.dispatch(locationChange(routerHistory.location, "PUSH"));
   }
+
+  const locale = initialState?.i18n.locale;
+  if (locale) {
+    store.dispatch(updateLocale(locale));
+  }
+
   return { routerHistory, store };
 };