Merge pull request #319 from sasjs/issue-318

fix: local login component should not pop up when login mechanism is …

Author: sabhas

src/context/sasContext.tsx

@@ -138,6 +138,23 @@ const SASProvider = (props: { children: ReactNode }) => {
       if (!startupData) {
         fetchStartupData()
       }
+    } else if (sasjsConfig.loginMechanism === 'Redirected') {
+      sasService
+        .logIn()
+        .then(
+          (res: { isLoggedIn: boolean; userName: string }) => {
+            setIsUserLoggedIn(res.isLoggedIn)
+          },
+          (err) => {
+            console.error(err)
+            setIsUserLoggedIn(false)
+          }
+        )
+        .catch((e) => {
+          if (e === 403) {
+            console.error('Invalid host')
+          }
+        })
     }
   }, [isUserLoggedIn, startupData, fetchStartupData])
 

src/layouts/Main.jsx

@@ -192,9 +192,11 @@ const Main = (props) => {
           open={open}
         />
       </div>
-      {!(sasContext.isUserLoggedIn || sasContext.checkingSession) && (
-        <LoginComponent />
-      )}
+      {!(
+        window.sasjsConfig.loginMechanism === 'Redirected' ||
+        sasContext.isUserLoggedIn ||
+        sasContext.checkingSession
+      ) && <LoginComponent />}
     </>
   )
 }