From e214ea53e7220776c9fabd14ba778861507b0774 Mon Sep 17 00:00:00 2001
From: dm1sh <me@dmitriy.icu>
Date: Sat, 29 Jul 2023 18:11:05 +0300
Subject: [PATCH] Fixed sign in redirect on success

---
 front/src/components/AuthForm.tsx | 8 +++++---
 front/src/hooks/api/useSignIn.ts  | 4 ++++
 front/src/hooks/useSend.ts        | 6 +++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/front/src/components/AuthForm.tsx b/front/src/components/AuthForm.tsx
index 1c8cd03..92bff78 100644
--- a/front/src/components/AuthForm.tsx
+++ b/front/src/components/AuthForm.tsx
@@ -26,9 +26,11 @@ function AuthForm({ goBack, register }: AuthFormProps) {
             ) : true
 
             if (accountCreated) {
-                await handleSignIn(composeSignInBody(formData))
-                goBack()
+                if (await handleSignIn(composeSignInBody(formData))) {
+                    goBack()
+                }
             }
+
         })()
     }, [register, goBack, handleSignUp, handleSignIn])
 
@@ -61,7 +63,7 @@ function AuthForm({ goBack, register }: AuthFormProps) {
                     <Form.Check>
                         <Form.Check.Input type='checkbox' required />
                         <Form.Check.Label>
-                            Я согласен с <a href={`${document.location.origin}/privacy_policy.pdf`} target='_blank' rel='noopener noreferrer'>условиями обработки персональных данных</a>
+                            Я согласен с <a href={`${document.location.origin}/privacy_policy.pdf`} target='_blank'>условиями обработки персональных данных</a>
                         </Form.Check.Label>
                     </Form.Check>
                 </Form.Group>
diff --git a/front/src/hooks/api/useSignIn.ts b/front/src/hooks/api/useSignIn.ts
index 3a18f66..057ef05 100644
--- a/front/src/hooks/api/useSignIn.ts
+++ b/front/src/hooks/api/useSignIn.ts
@@ -22,7 +22,11 @@ function useSignIn() {
 
         if (token !== undefined) {
             setToken(token)
+
+            return true
         }
+
+        return false
     }
 
     return { handleSignIn, signInButton: button }
diff --git a/front/src/hooks/useSend.ts b/front/src/hooks/useSend.ts
index 12e1839..6632bd1 100644
--- a/front/src/hooks/useSend.ts
+++ b/front/src/hooks/useSend.ts
@@ -74,7 +74,11 @@ function useSend<R, T extends NonNullable<unknown>>(
 
         } catch (err) {
             if (err instanceof Error && !isAborted(err)) {
-                setError('Ошибка сети')
+                if (err instanceof TypeError) {
+                    setError('Ошибка сети')
+                } else {
+                    setError(err.message)
+                }
 
                 if (import.meta.env.DEV) {
                     console.log(url, params, err)