Progress

client/src/components/sign-in-form/sign-in-form.component.jsx

@@ -1,10 +1,10 @@
 import { LockOutlined, UserOutlined } from "@ant-design/icons";
 import { Button, Form, Input, Typography } from "antd";
 import queryString from "query-string";
-import React from "react";
+import React, {useEffect} from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { Link, useNavigate, useLocation } from "react-router-dom";
+import { Link, useNavigate, useSearchParams } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import ImEXOnlineLogo from "../../assets/logo192.png";
 import {
@@ -38,8 +38,10 @@ export function SignInComponent({
   sendPasswordReset,
   loginLoading,
 }) {
-  const { redirect } = queryString.parse(useLocation().search);
+  const [searchParams] = useSearchParams();
+  const redirect = searchParams.get("redirect");
   const navigate = useNavigate();
+
   const { t } = useTranslation();
   const handleFinish = (values) => {
     const { email, password } = values;
@@ -47,8 +49,13 @@ export function SignInComponent({
   };
   const [form] = Form.useForm();
 
-  if (currentUser.authorized === true)
-    return navigate("/manage");
+  useEffect(() => {
+    console.log('navigating to ' + redirect || "/manage");
+    if (currentUser.authorized === true) {
+      navigate(redirect || "/manage");
+    }
+  }, [currentUser, redirect, navigate]);
+
 
   return (
     <div className="login-container">