Merge branch 'coronasafe:develop' into fix#6360

ohcnetwork · Oct 6, 2023 · d09cd54 · d09cd54
2 parents 1ab65b7 + 91abee0
commit d09cd54
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/Components/Auth/Login.tsx b/src/Components/Auth/Login.tsx
@@ -151,7 +151,7 @@ export const Login = (props: { forgot?: boolean }) => {
         body: { ...valid },
       });
       setLoading(false);
-      if (res && res.statusText === "OK") {
+      if (res?.ok) {
         Notification.Success({
           msg: t("password_sent"),
         });

diff --git a/src/Components/Auth/ResetPassword.tsx b/src/Components/Auth/ResetPassword.tsx
@@ -72,7 +72,7 @@ export const ResetPassword = (props: any) => {
       const { res, error } = await request(routes.resetPassword, {
         body: { ...valid },
       });
-      if (res && res.statusText === "OK") {
+      if (res?.ok) {
         localStorage.removeItem(LocalStorageKeys.accessToken);
         Notification.Success({
           msg: t("password_reset_success"),
@@ -89,7 +89,7 @@ export const ResetPassword = (props: any) => {
       const { res } = await request(routes.checkResetToken, {
         body: { token: props.token },
       });
-      if (!res || res.statusText !== "OK") {
+      if (!res || !res.ok) {
         navigate("/invalid-reset");
       }
     };

diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
@@ -63,20 +63,23 @@ const routes = {
   checkResetToken: {
     path: "/api/v1/password_reset/check/",
     method: "POST",
+    noAuth: true,
     TRes: Type<Record<string, never>>(),
     TBody: Type<{ token: string }>(),
   },
 
   resetPassword: {
     path: "/api/v1/password_reset/confirm/",
     method: "POST",
+    noAuth: true,
     TRes: Type<Record<string, never>>(),
     TBody: Type<{ password: string; confirm: string }>(),
   },
 
   forgotPassword: {
     path: "/api/v1/password_reset/",
     method: "POST",
+    noAuth: true,
     TRes: Type<Record<string, never>>(),
     TBody: Type<{ username: string }>(),
   },