[#146] fix error in loading (#147)

Co-authored-by: Camille Moussu <cmoussu@linagora.com>

src/components/Calendar/Calendar.tsx

@@ -86,9 +86,11 @@ export default function CalendarApp({
   const tokens = useAppSelector((state) => state.user.tokens);
   const dispatch = useAppDispatch();
 
-  if (!tokens) {
+  useEffect(() => {
-    dispatch(push("/"));
+    if (!tokens || !user) {
-  }
+      dispatch(push("/"));
+    }
+  }, [tokens, user]);
 
   const calendars = useAppSelector((state) => state.calendars.list);
   const tempcalendars =

src/components/Calendar/CalendarSearch.tsx

@@ -178,7 +178,7 @@ export default function CalendarSearch({
 }) {
   const dispatch = useAppDispatch();
   const openpaasId =
-    useAppSelector((state) => state.user.userData.openpaasId) ?? "";
+    useAppSelector((state) => state.user.userData?.openpaasId) ?? "";
   const calendars = useAppSelector((state) => state.calendars.list);
 
   const [selectedCal, setSelectedCalendars] = useState<CalendarWithOwner[]>([]);

src/features/User/HandleLogin.tsx

@@ -24,8 +24,8 @@ export function HandleLogin() {
         if (savedToken && savedUser) {
           dispatch(setTokens(savedToken));
           dispatch(setUserData(savedUser));
-          dispatch(getOpenPaasUserDataAsync());
+          await dispatch(getOpenPaasUserDataAsync());
-          dispatch(getCalendarsListAsync());
+          await dispatch(getCalendarsListAsync());
           dispatch(push("/calendar"));
           return;
         }
@@ -46,13 +46,14 @@ export function HandleLogin() {
 
     initiateLogin();
   }, [userData, dispatch]);
-
+  useEffect(() => {
-  if (!calendars.pending && !userData.loading) {
+    if (!calendars.pending && !userData.loading) {
-    dispatch(push("/error"));
+      dispatch(push("/error"));
-  }
+    }
-  if (!calendars.pending && !userData.loading) {
+    if (!calendars.pending && !userData.loading) {
-    dispatch(push("/calendar"));
+      dispatch(push("/calendar"));
-  }
+    }
+  }, [calendars.pending, userData.loading]);
   return <Loading />;
 }
 

src/features/User/LoginCallback.tsx

@@ -22,8 +22,8 @@ export function CallbackResume() {
         const data = await Callback(saved?.code_verifier, saved?.state);
         dispatch(setUserData(data?.userinfo));
         dispatch(setTokens(data?.tokenSet));
-        dispatch(getOpenPaasUserDataAsync());
+        await dispatch(getOpenPaasUserDataAsync());
-        dispatch(getCalendarsListAsync());
+        await dispatch(getCalendarsListAsync());
 
         sessionStorage.removeItem("redirectState");
         sessionStorage.setItem("tokenSet", JSON.stringify(data?.tokenSet));