login bug solved

ganning127 · Jun 25, 2024 · c46435c · c46435c
1 parent 6faedde
commit c46435c
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 13 deletions.
diff --git a/airavata-local-agent/main/background.js b/airavata-local-agent/main/background.js
@@ -111,7 +111,6 @@ ipcMain.on('ci-logon-logout', (event) => {
 ipcMain.on('ci-logon-login', async (event) => {
 
   console.log("Logging in with CI logon");
-  log.warn('__dirname:', __dirname);
   log.warn("Logging in with CI logon");
   var authWindow = createWindow('authWindow', {
     width: 1200,
@@ -124,18 +123,52 @@ ipcMain.on('ci-logon-login', async (event) => {
   authWindow.loadURL('https://md.cybershuttle.org/auth/redirect_login/cilogon/');
 
   authWindow.show();
+  /*
+   setTimeout(async () => {
+        const tokens = await getToken(url);
+
+        if (tokens.length > 0) {
+          const [accessToken, refreshToken] = tokens;
+          console.log("Tokens", accessToken, refreshToken);
+          event.sender.send('ci-logon-success', accessToken, refreshToken);
+
+          // authWindow.loadURL('https://md.cybershuttle.org/auth/redirect_login/cilogon/');
+
+        }
+      }, 5000);
+  */
+  // after we hit https://md.cybershuttle.org/auth/callback, once we get the next URL that starts with md.cybershuttle.org, we can send the info back to the user
+
+  let hitUrl = false;
   authWindow.webContents.on('will-redirect', async (e, url) => {
     if (url.startsWith("https://md.cybershuttle.org/auth/callback/")) {
-      const tokens = await getToken(url);
-
-      if (tokens.length > 0) {
-        const [accessToken, refreshToken] = tokens;
-        console.log("Tokens", accessToken, refreshToken);
-        event.sender.send('ci-logon-success', accessToken, refreshToken);
-      }
-      authWindow.close();
-      authWindow.loadURL('https://md.cybershuttle.org/auth/redirect_login/cilogon/');
+      // hitUrl = true;
+
+      setTimeout(async () => {
+        const tokens = await getToken(url);
+
+        if (tokens.length > 0) {
+          const [accessToken, refreshToken] = tokens;
+          console.log("Tokens", accessToken, refreshToken);
+          event.sender.send('ci-logon-success', accessToken, refreshToken);
+          authWindow.close();
+          // authWindow.loadURL('https://md.cybershuttle.org/auth/redirect_login/cilogon/');
+
+        }
+      }, 5000);
+
+      authWindow.hide();
     }
+
+    // if (hitUrl && url.startsWith("https://md.cybershuttle.org/")) {
+    //   const tokens = await getToken(url);
+
+    //   if (tokens.length > 0) {
+    //     const [accessToken, refreshToken] = tokens;
+    //     event.sender.send('ci-logon-success', accessToken, refreshToken);
+    //     // authWindow.hide();
+    //   }
+    // }
   });
 });
 

diff --git a/airavata-local-agent/renderer/pages/login.jsx b/airavata-local-agent/renderer/pages/login.jsx
@@ -33,6 +33,7 @@ const Login = () => {
 
   useEffect(() => {
     if (localStorage.getItem("ciLoginAuto") === "true") {
+      setLoading(true);
       localStorage.removeItem("ciLoginAuto");
       window.auth.ciLogonLogin();
     }
@@ -89,9 +90,11 @@ const Login = () => {
             <Heading size='md' textAlign="left" color='blue.500'>
 
               Log in with your existing organizational login</Heading>
-            <Button colorScheme='blue' w='full' mt={4} onClick={handleCiLogin}> {
-              loading && <Spinner mr={2} />
-            }Login with Existing Institution Credentials</Button>
+            <Button colorScheme='blue' w='full' mt={4} onClick={handleCiLogin}
+              isDisabled={loading}
+            > {
+                loading && <Spinner mr={2} />
+              }Login with CILogon</Button>
           </Box>
 
           {/* <Box shadow='md' rounded='md' p={4} mt={8}>