handle organization null in frontend

codegouvfr · Dec 11, 2024 · def2f0e · def2f0e
1 parent 96f7b1d
commit def2f0e
Show file tree

Hide file tree

Showing 17 changed files with 270 additions and 80 deletions.
diff --git a/web/src/core/bootstrap.ts b/web/src/core/bootstrap.ts
@@ -95,7 +95,6 @@ export async function bootstrapCore(
                 isUserInitiallyLoggedIn,
                 jwtClaimByUserKey,
                 "user": {
-                    "organization": "DINUM",
                     "email": "[email protected]",
                     "id": "xxxxx"
                 }
@@ -150,7 +149,8 @@ export async function bootstrapCore(
         dispatch(usecases.externalDataOrigin.protectedThunks.initialize()),
         dispatch(usecases.softwareCatalog.protectedThunks.initialize()),
         dispatch(usecases.generalStats.protectedThunks.initialize()),
-        dispatch(usecases.redirect.protectedThunks.initialize())
+        dispatch(usecases.redirect.protectedThunks.initialize()),
+        dispatch(usecases.userAuthentication.protectedThunks.initialize())
     ]);
 
     return { core };

diff --git a/web/src/core/usecases/instanceForm/state.ts b/web/src/core/usecases/instanceForm/state.ts
@@ -35,7 +35,7 @@ namespace State {
             | {
                   type: "navigated from software form";
                   justRegisteredSoftwareSillId: number;
-                  userOrganization: string;
+                  userOrganization: string | null;
               }
             | undefined;
         step1Data:

diff --git a/web/src/core/usecases/instanceForm/thunks.ts b/web/src/core/usecases/instanceForm/thunks.ts
@@ -80,6 +80,7 @@ export const thunks = {
                     assert(oidc.isUserLoggedIn);
 
                     const user = await getUser();
+                    const { agent } = await sillApi.getAgent({ email: user.email });
 
                     dispatch(
                         actions.initializationCompleted({
@@ -91,7 +92,7 @@ export const thunks = {
                                           "type": "navigated from software form",
                                           "justRegisteredSoftwareSillId":
                                               software.softwareId,
-                                          "userOrganization": user.organization
+                                          "userOrganization": agent.organization
                                       }
                         })
                     );

diff --git a/web/src/core/usecases/softwareUserAndReferent/state.ts b/web/src/core/usecases/softwareUserAndReferent/state.ts
@@ -19,7 +19,7 @@ export namespace State {
     };
 
     export type SoftwareUser = {
-        organization: string;
+        organization: string | null;
         usecaseDescription: string;
         /** NOTE: undefined if the software is not of type desktop/mobile */
         os: ApiTypes.Os | undefined;
@@ -30,7 +30,7 @@ export namespace State {
 
     export type SoftwareReferent = {
         email: string;
-        organization: string;
+        organization: string | null;
         isTechnicalExpert: boolean;
         usecaseDescription: string;
         /** NOTE: Can be not undefined only if cloud */

diff --git a/web/src/core/usecases/userAccountManagement/state.ts b/web/src/core/usecases/userAccountManagement/state.ts
@@ -18,7 +18,7 @@ namespace State {
         allowedEmailRegexpStr: string;
         allOrganizations: string[];
         organization: {
-            value: string;
+            value: string | null;
             isBeingUpdated: boolean;
         };
         email: {
@@ -33,6 +33,17 @@ namespace State {
     };
 }
 
+type UpdateFieldPayload =
+    | {
+          fieldName: "organization";
+          value: string;
+      }
+    | {
+          fieldName: "aboutAndIsPublic";
+          about: string;
+          isPublic: boolean;
+      };
+
 export const { reducer, actions } = createUsecaseActions({
     name,
     "initialState": id<State>({
@@ -53,7 +64,7 @@ export const { reducer, actions } = createUsecaseActions({
                 payload: {
                     accountManagementUrl: string | undefined;
                     allowedEmailRegexpStr: string;
-                    organization: string;
+                    organization: string | null;
                     email: string;
                     allOrganizations: string[];
                     about: string;
@@ -95,23 +106,7 @@ export const { reducer, actions } = createUsecaseActions({
                 }
             };
         },
-        "updateFieldStarted": (
-            state,
-            {
-                payload
-            }: {
-                payload:
-                    | {
-                          fieldName: "organization" | "email";
-                          value: string;
-                      }
-                    | {
-                          fieldName: "aboutAndIsPublic";
-                          about: string;
-                          isPublic: boolean;
-                      };
-            }
-        ) => {
+        "updateFieldStarted": (state, { payload }: { payload: UpdateFieldPayload }) => {
             assert(state.stateDescription === "ready");
 
             if (payload.fieldName === "aboutAndIsPublic") {
@@ -129,16 +124,7 @@ export const { reducer, actions } = createUsecaseActions({
                 "isBeingUpdated": true
             };
         },
-        "updateFieldCompleted": (
-            state,
-            {
-                payload
-            }: {
-                payload: {
-                    fieldName: "organization" | "email" | "aboutAndIsPublic";
-                };
-            }
-        ) => {
+        "updateFieldCompleted": (state, { payload }: { payload: UpdateFieldPayload }) => {
             const { fieldName } = payload;
 
             assert(state.stateDescription === "ready");

diff --git a/web/src/core/usecases/userAccountManagement/thunks.ts b/web/src/core/usecases/userAccountManagement/thunks.ts
@@ -27,21 +27,21 @@ export const thunks = {
                 { keycloakParams },
                 allowedEmailRegexpStr,
                 allOrganizations,
-                {
-                    agent: { about = "", isPublic }
-                }
+                { agent }
             ] = await Promise.all([
                 sillApi.getOidcParams(),
                 sillApi.getAllowedEmailRegexp(),
                 sillApi.getAllOrganizations(),
                 sillApi.getAgent({ "email": user.email })
             ]);
 
+            const { about = "", isPublic, organization } = agent;
+
             dispatch(
                 actions.initialized({
                     allowedEmailRegexpStr,
                     "email": user.email,
-                    "organization": user.organization,
+                    "organization": organization,
                     "accountManagementUrl":
                         keycloakParams === undefined
                             ? undefined
@@ -101,7 +101,7 @@ export const thunks = {
                 }
             }
 
-            dispatch(actions.updateFieldCompleted({ "fieldName": params.fieldName }));
+            dispatch(actions.updateFieldCompleted(params));
         },
     "getAccountManagementUrl":
         () =>

diff --git a/web/src/core/usecases/userAuthentication/index.ts b/web/src/core/usecases/userAuthentication/index.ts
@@ -1,2 +1,3 @@
 export * from "./state";
 export * from "./thunks";
+export * from "./selectors";
diff --git a/web/src/core/usecases/userAuthentication/selectors.ts b/web/src/core/usecases/userAuthentication/selectors.ts
@@ -0,0 +1,9 @@
+import type { State as RootState } from "core/bootstrap";
+import { name } from "./state";
+
+const currentAgent = (rootState: RootState) => {
+    const state = rootState[name];
+    return { currentAgent: state.currentAgent };
+};
+
+export const selectors = { currentAgent };
diff --git a/web/src/core/usecases/userAuthentication/state.ts b/web/src/core/usecases/userAuthentication/state.ts
@@ -1,3 +1,66 @@
+import { Agent } from "api/dist/src/lib/ApiTypes";
+import { createUsecaseActions } from "redux-clean-architecture";
+import { assert } from "tsafe/assert";
+import { id } from "tsafe/id";
+import { actions as usersAccountManagementActions } from "../userAccountManagement";
+
 export const name = "userAuthentication";
 
-export const reducer = null;
+export type State = State.NotInitialized | State.Ready;
+
+export namespace State {
+    export type NotInitialized = {
+        stateDescription: "not initialized";
+        isInitializing: boolean;
+        currentAgent: null;
+    };
+
+    export type Ready = {
+        stateDescription: "ready";
+        currentAgent: Agent | null;
+    };
+}
+
+export const { reducer, actions } = createUsecaseActions({
+    name,
+    "initialState": id<State>({
+        "stateDescription": "not initialized",
+        "currentAgent": null,
+        "isInitializing": false
+    }),
+    "reducers": {
+        "initializationStarted": state => {
+            assert(state.stateDescription === "not initialized");
+        },
+        "initialized": (_, action: { payload: { agent: Agent | null } }) => ({
+            stateDescription: "ready",
+            currentAgent: action.payload.agent
+        })
+    },
+    extraReducers: builder => {
+        builder.addCase(
+            usersAccountManagementActions.updateFieldCompleted,
+            (state, action) => {
+                if (!state.currentAgent) return state;
+                if (action.payload.fieldName === "organization") {
+                    return {
+                        ...state,
+                        currentAgent: {
+                            ...state.currentAgent,
+                            organization: action.payload.value
+                        }
+                    };
+                }
+
+                return {
+                    ...state,
+                    currentAgent: {
+                        ...state.currentAgent,
+                        about: action.payload.about,
+                        isPublic: action.payload.isPublic
+                    }
+                };
+            }
+        );
+    }
+});
diff --git a/web/src/core/usecases/userAuthentication/thunks.ts b/web/src/core/usecases/userAuthentication/thunks.ts
@@ -1,12 +1,27 @@
 import type { Thunks } from "core/bootstrap";
 import { assert } from "tsafe/assert";
+import { name, actions } from "./state";
+
+export const protectedThunks = {
+    initialize:
+        () =>
+        async (dispatch, getState, { sillApi, oidc, getUser }) => {
+            console.log("OIDC : is user logged in ?", oidc.isUserLoggedIn);
+            if (!oidc.isUserLoggedIn) return;
+            const state = getState()[name];
+            if (state.stateDescription === "ready" || state.isInitializing) return;
+            dispatch(actions.initializationStarted());
+            const user = await getUser();
+            const { agent } = await sillApi.getAgent({ "email": user.email });
+            dispatch(actions.initialized({ agent }));
+        }
+} satisfies Thunks;
 
 export const thunks = {
     "getIsUserLoggedIn":
         () =>
         (...args): boolean => {
             const [, , { oidc }] = args;
-
             return oidc.isUserLoggedIn;
         },
     "login":
@@ -16,6 +31,7 @@ export const thunks = {
 
             const [, , { oidc }] = args;
 
+            console.log("asesrting user not logged : ", oidc.isUserLoggedIn);
             assert(!oidc.isUserLoggedIn);
 
             return oidc.login({ doesCurrentHrefRequiresAuth });

diff --git a/web/src/core/usecases/userProfile/state.ts b/web/src/core/usecases/userProfile/state.ts
@@ -13,7 +13,7 @@ export namespace State {
     export type Ready = {
         stateDescription: "ready";
         email: string;
-        organization: string;
+        organization: string | null;
         about: string | undefined;
         isHimself: boolean;
         declarations: ApiTypes.Agent["declarations"];
@@ -40,7 +40,7 @@ export const { reducer, actions } = createUsecaseActions({
             }: {
                 payload: {
                     email: string;
-                    organization: string;
+                    organization: string | null;
                     about: string | undefined;
                     isHimself: boolean;
                     declarations: ApiTypes.Agent["declarations"];

diff --git a/web/src/ui/App.tsx b/web/src/ui/App.tsx
@@ -4,7 +4,7 @@ import { useRoute } from "ui/routes";
 import { Header } from "ui/shared/Header";
 import { Footer } from "ui/shared/Footer";
 import { declareComponentKeys } from "i18nifty";
-import { useCore } from "core";
+import { useCore, useCoreState } from "core";
 import { RouteProvider } from "ui/routes";
 import { evtLang } from "ui/i18n";
 import { createCoreProvider } from "core";
@@ -17,6 +17,7 @@ import { keyframes } from "tss-react";
 import { LoadingFallback, loadingFallbackClassName } from "ui/shared/LoadingFallback";
 import { useDomRect } from "powerhooks/useDomRect";
 import { apiUrl, appUrl, appPath } from "urls";
+import { PromptForOrganization } from "./shared/PromptForOrganization";
 
 const { CoreProvider } = createCoreProvider({
     apiUrl,
@@ -69,6 +70,7 @@ function ContextualizedApp() {
     const route = useRoute();
 
     const { userAuthentication, sillApiVersion } = useCore().functions;
+    const { currentAgent } = useCoreState("userAuthentication", "currentAgent");
 
     const headerUserAuthenticationApi = useConst(() =>
         userAuthentication.getIsUserLoggedIn()
@@ -116,6 +118,10 @@ function ContextualizedApp() {
                                     return <LoadingFallback />;
                                 }
 
+                                if (currentAgent && !currentAgent.organization) {
+                                    return <PromptForOrganization firstTime={true} />;
+                                }
+
                                 return (
                                     <page.LazyComponent
                                         route={route}
@@ -158,13 +164,13 @@ const useStyles = tss
         },
         "page": {
             "animation": `${keyframes`
-            0% {
-                opacity: 0;
-            }
-            100% {
-                opacity: 1;
-            }
-            `} 400ms`
+          0% {
+              opacity: 0;
+          }
+          100% {
+              opacity: 1;
+          }
+      `} 400ms`
         }
     }));