feat(Logout): use quartz logout endpoint (#6020)

Author: ChitlangeSahas

src/Logout.tsx

@@ -7,10 +7,15 @@ import {useHistory} from 'react-router-dom'
 import {postSignout} from 'src/client'
 
 // Constants
-import {CLOUD, CLOUD_SIGNOUT_PATHNAME} from 'src/shared/constants'
+import {
+  CLOUD,
+  CLOUD_LOGOUT_PATH,
+  CLOUD_SIGNOUT_PATHNAME,
+} from 'src/shared/constants'
 
 // Components
 import {reset} from 'src/shared/actions/flags'
+import {isFlagEnabled} from 'src/shared/utils/featureFlag'
 
 const Logout: FC = () => {
   const history = useHistory()
@@ -19,6 +24,17 @@ const Logout: FC = () => {
   useEffect(() => {
     const handleSignOut = async () => {
       if (CLOUD) {
+        if (isFlagEnabled('universalLogin')) {
+          fetch('/api/env/quartz-login-url')
+            .then(async response => {
+              const quartzUrl = await response.text()
+              const redirectUrl = `${quartzUrl}${CLOUD_LOGOUT_PATH}`
+              console.warn('Redirect to cloud url: ', redirectUrl)
+              window.location.replace(`${redirectUrl}`)
+            })
+            .catch(error => console.error(error))
+          return null
+        }
         const url = new URL(
           `${window.location.origin}${CLOUD_SIGNOUT_PATHNAME}`
         ).href

src/onboarding/containers/LoginPage.tsx

@@ -57,20 +57,10 @@ export const LoginPage: FC = () => {
     if (isFlagEnabled('universalLogin')) {
       if (CLOUD) {
         fetch('/api/env/quartz-login-url')
-          .then(response => {
-            response
-              .text()
-              .then(response => {
-                const redirectUrl = response
-                console.warn('Redirect to cloud url: ', redirectUrl)
-                window.location.replace(redirectUrl)
-              })
-              .catch(error => {
-                console.error(
-                  'Failed to fetch /api/env/quartz-login-url',
-                  error
-                )
-              })
+          .then(async response => {
+            const quartzUrl = await response.text()
+            console.warn('Redirect to cloud url: ', quartzUrl)
+            window.location.replace(quartzUrl)
           })
           .catch(error => console.error(error))
         return null