From 16eb0b3f78279d7e55088e4bc5aab8ce959c9b8f Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Thu, 26 Mar 2026 09:44:59 +0100
Subject: [PATCH] - updated login flow;

---
 src/pages/Login/index.js              |  3 ++-
 src/service/authentication-service.js |  4 ++--
 src/service/network-service.js        | 24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/pages/Login/index.js b/src/pages/Login/index.js
index 565d5e9..094f92c 100644
--- a/src/pages/Login/index.js
+++ b/src/pages/Login/index.js
@@ -46,6 +46,7 @@ const Login = () => {
                 token: data.data.token,
                 userData: data.data.user
             });
+            window.location.replace('/');
         } else {
             if (errorMsgs.current) {
                 errorMsgs.current.show([
@@ -99,7 +100,7 @@ const Login = () => {
     useEffect(() => {
         const queryParams = Object.fromEntries(searchParams);
 
-        if (!isEmpty(token) && isNil(queryParams.redirectReason)) {
+        if (!isEmpty(token) && isNil(queryParams.redirectReason) && isNil(queryParams.temp_token)) {
             window.location.replace('/')
         }
     }, [token]);
diff --git a/src/service/authentication-service.js b/src/service/authentication-service.js
index be3f600..3053527 100644
--- a/src/service/authentication-service.js
+++ b/src/service/authentication-service.js
@@ -78,10 +78,10 @@ export default class AuthenticationService {
     };
 
     static validateNewUser = (token, callback, errCallback) => {
-        NetworkService.get(`${API_BASE_URL}/user/sso/validate/new-user/${token}`, callback, errCallback);
+        NetworkService.unauthorizedGet(`${API_BASE_URL}/user/sso/validate/new-user/${token}`, callback, errCallback);
     };
 
     static validateExistingUser = (token, callback, errCallback) => {
-        NetworkService.get(`${API_BASE_URL}/user/sso/validate/existing-user/${token}`, callback, errCallback);
+        NetworkService.unauthorizedGet(`${API_BASE_URL}/user/sso/validate/existing-user/${token}`, callback, errCallback);
     };
 }
diff --git a/src/service/network-service.js b/src/service/network-service.js
index a7d4e3f..79e3e71 100644
--- a/src/service/network-service.js
+++ b/src/service/network-service.js
@@ -148,6 +148,30 @@ export class NetworkService {
             .catch(err => errorCallback(err));
     };
 
+    static unauthorizedGet = (url, callback, errorCallback) => {
+        fetch(url, {
+            method: 'GET',
+            mode: 'cors',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+        })
+            .then(async response => {
+                let status = response.status;
+                this.logApiError(url, status);
+                return { response: await response.json(), status: status }
+            })
+            .then(data => {
+                if (data.status >= 400 && data.status <= 599) {
+                    errorCallback(data.response);
+                    this.logApiError(url, data.status, data.response);
+                } else {
+                    callback(data.response)
+                }
+            })
+            .catch(err => errorCallback(err));
+    };
+
     static unauthorizedPost = (url, body, callback, errorCallback, queryParams) => {
         if (queryParams) {
             url += '?'