Fix autologin redirect

yandex-praktikum · Oct 18, 2023 · d0f0372 · d0f0372
1 parent c902ad2
commit d0f0372
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/src/controllers/AuthController.ts b/src/controllers/AuthController.ts
@@ -14,7 +14,8 @@ class AuthController {
           return;
         }
 
-        Store.set('error', res.response);
+        const { reason } = res.response;
+        Store.set('error', reason);
       })
       .catch((error) => {
         console.error(`${error}`);
@@ -31,14 +32,16 @@ class AuthController {
           return;
         }
 
-        if (res.response === 'User already in system') {
+        const { reason } = res.response;
+
+        if (reason === 'User already in system') {
           sessionStorage.setItem("inSystem", "true");
           router.go('/messenger');
 
           return;
         }
 
-        Store.set('error', res.response);
+        Store.set('error', reason);
       })
       .catch((error) => {
         console.error(`${error}`);

diff --git a/src/controllers/ChatsController.ts b/src/controllers/ChatsController.ts
@@ -20,7 +20,8 @@ class ChatsController {
           return;
         }
 
-        Store.set('error', res.response);
+        const { reason } = res.response;
+        Store.set('error', reason);
       })
       .catch((error) => {
         console.error(`${error}`);
@@ -36,7 +37,8 @@ class ChatsController {
           return;
         }
 
-        Store.set('error', res.response);
+        const { reason } = res.response;
+        Store.set('error', reason);
       })
       .catch((error) => {
         console.error(`${error}`);
@@ -61,7 +63,8 @@ class ChatsController {
           return;
         }
 
-        Store.set('error', res.response);
+        const { reason } = res.response;
+        Store.set('error', reason);
       })
       .catch((error) => {
         console.error(`${error}`);
@@ -129,7 +132,8 @@ class ChatsController {
           return;
         }
 
-        Store.set('error', res.response);
+        const { reason } = res.response;
+        Store.set('error', reason);
       })
       .catch((error) => {
         console.error(`${error}`);

diff --git a/src/controllers/UsersController.ts b/src/controllers/UsersController.ts
@@ -17,7 +17,8 @@ class UsersController {
           return;
         }
 
-        Store.set('error', res.response);
+        const { reason } = res.response;
+        Store.set('error', reason);
       })
       .catch((error) => {
         console.error(`${error}`);
@@ -33,7 +34,8 @@ class UsersController {
           return;
         }
 
-        Store.set('error', res.response);
+        const { reason } = res.response;
+        Store.set('error', reason);
       })
       .catch((error) => {
         console.error(`${error}`);
@@ -47,7 +49,8 @@ class UsersController {
           return;
         }
 
-        Store.set('error', res.response);
+        const { reason } = res.response;
+        Store.set('error', reason);
       })
       .catch((error) => {
         console.error(`${error}`);
@@ -61,7 +64,8 @@ class UsersController {
       return res.response;
     }
 
-    Store.set('error', res.response);
+    const { reason } = res.response;
+    Store.set('error', reason);
   }
 
   public async request(id: number) {

diff --git a/src/utils/http.ts b/src/utils/http.ts
@@ -96,7 +96,7 @@ class HTTP implements IHTTP {
         try {
           response = JSON.parse(xhr.responseText);
         } catch (error) {
-          console.error(error);
+          // Send error to logger
         }
 
         const data = {