v1.0.5

nginx.conf

@@ -36,5 +36,13 @@ http {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
         }
+
+        location /auth {
+            proxy_pass http://sci.cugrader.com:5050;  # Ensure this matches the backend URL and port
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
     }
 }

src/src/pages/Callback.js

@@ -22,19 +22,19 @@ function Callback() {
                 },
                 body: JSON.stringify({
                     url: window.location.href,
-                    state: Cookies.get("state")
+                    // state: Cookies.get("state")
                 })
             })
 
             var data = await response.json();
             //if user valid set cookie and sent to Home
             if(data['success']){
-                Cookies.remove('state')
+                // Cookies.remove('state')
                 Cookies.set("email", data["data"]["email"])
                 Cookies.set("uid", data["data"]["uid"])
                 Cookies.set('csrf_token', data["data"]["csrf_token"])
 
-                Cookies.set("role", 2)
+                Cookies.set("role", data["data"]["role"])
 
                 withReactContent(Swal).fire({
                     title: "Login successfully!",

src/src/pages/Login.js

@@ -7,14 +7,14 @@ import Cookies from 'js-cookie';
 
 
 const loginRedir  = async () => {
-  	var data = await fetch(`${process.env.REACT_APP_HOST}/glob/auth/login`);
+  	// var data = await fetch(`${process.env.REACT_APP_HOST}/glob/auth/login`);
 
-  	data = await data.json();
+  	// data = await data.json();
 
-    // localStorage.setItem("state", data["data"]["state"])
-    // sessionStorage.setItem("state", data["data"]["state"])
-  	Cookies.set("state", data["data"]["state"])
-  	window.location.href = data["data"]["url"]
+    // // localStorage.setItem("state", data["data"]["state"])
+    // // sessionStorage.setItem("state", data["data"]["state"])
+  	// Cookies.set("state", data["data"]["state"])
+  	window.location.href = "/auth/login"
 }
 
 function Login() {