Merge pull request #266 from dekart-xyz/fix-cloud-regression-for-sso

Enhance authentication flow and add regression tests

Author: delfrrr

.github/workflows/e2e.yaml

@@ -76,7 +76,7 @@ jobs:
             sleep $((attempt * 10))
           done
 
-      - name: E2E part 1
+      - name: E2E part 1 (start + login regression)
         run: |
           docker run -i \
             --network="host" \
@@ -99,7 +99,7 @@ jobs:
             -e DEKART_GOOGLE_OAUTH_SECRET=${{ secrets.GOOGLE_OAUTH_SECRET }} \
             -e DEKART_DEV_REFRESH_TOKEN=${{ secrets.DEV_REFRESH_TOKEN_INFO }} \
             -e DEKART_DATA_ENCRYPTION_KEY=projects/910252011719/secrets/dekart-dev-user-data-encoding-key/versions/latest \
-          	-e DEKART_CORS_ORIGIN=http://localhost:3000 \
+            -e DEKART_CORS_ORIGIN=http://localhost:3000 \
             -e DEKART_ALLOW_WORKSPACE_CREATION=1 \
             -e DEKART_UX_DISABLE_VERSION_CHECK=1 \
             -e DEKART_DEV_NO_DATASET_CACHE=1 \

AGENTS.md

@@ -25,6 +25,7 @@ Self-check before finalizing:
 
 - Follow existing project conventions before introducing new patterns.
 - Prefer established libraries for standard concerns over custom implementations.
+- Use canonical state, not ad-hoc component logic: before deriving behavior in components, check reducers/actions/selectors for an existing field and reuse it; if missing, add it once in the state layer (reducer/selector) and consume that everywhere.
 - Do not use debug-level logging in production code paths.
 - Keep test structure consistent with neighboring tests in the same folder.
 - Match existing UI patterns and placement
@@ -72,4 +73,3 @@ Why: this environment exports `ELECTRON_RUN_AS_NODE=1` by default, which prevent
 2. Re-run with env override:
    - `ELECTRON_RUN_AS_NODE= npx cypress run --spec "<spec-path>"`
 
-

cypress/e2e/cloud/cloudBasicFlowStart.cy.js

@@ -4,7 +4,7 @@ describe('cloud basic flow', () => {
   it('with info token', () => {
     // create workspace
     cy.visit('/')
-    cy.get('button:contains("Create Workspace")').click()
+    cy.get('button#dekart-create-workspace').click()
     cy.get('input#name').type('test')
     cy.get('button:contains("Create")').click()
 
@@ -41,4 +41,35 @@ describe('cloud basic flow', () => {
     cy.get('button:contains("Connect with Google")').click()
     cy.get('button:contains("Continue to Google")').should('be.visible')
   })
+
+  it('anonymous public report login uses auth redirect', () => {
+    cy.visit('/')
+    cy.get('button#dekart-create-report').click()
+    cy.get('button:contains("Upload File")').click()
+    cy.get('input[type="file"]').selectFile('cypress/fixtures/sample.csv', { force: true })
+    cy.get('button:contains("Upload")').click()
+    cy.get('div:contains("8,276 rows")', { timeout: 20000 }).should('be.visible')
+
+    cy.get('button#dekart-share-report').click()
+    cy.get('button#dekart-publish-report').click()
+    cy.get('button#dekart-publish-report')
+      .should('have.class', 'ant-switch-checked')
+      .and('not.have.class', 'ant-switch-loading')
+
+    cy.location('pathname').then((reportPath) => {
+      cy.clearLocalStorage()
+      cy.window().then((win) => {
+        win.sessionStorage.clear()
+      })
+      cy.visit(reportPath)
+    })
+
+    cy.get('#dekart-login-button').should('be.visible').and('contain', 'Login with Google')
+    cy.contains('button', 'Create Map').should('not.exist')
+    cy.contains('Login requires SSO').should('not.exist')
+
+    cy.intercept('GET', '**/api/v1/authenticate*').as('authenticate')
+    cy.get('#dekart-login-button').click()
+    cy.wait('@authenticate')
+  })
 })

src/client/Header.jsx

@@ -35,10 +35,10 @@ function User ({ buttonDivider }) {
   const token = useSelector(state => state.token)
   const history = useHistory()
   const userStream = useSelector(state => state.user.stream)
-  const { authEnabled } = useSelector(state => state.env)
+  const env = useSelector(state => state.env)
+  const { authEnabled, authConfigured, isSnowpark } = env
   const isPlayground = useSelector(state => state.user.isPlayground)
   const isDefaultWorkspace = useSelector(state => state.user.isDefaultWorkspace)
-  const isSnowpark = useSelector(state => state.env.isSnowpark)
   const dispatch = useDispatch()
   const [showSSOModal, setShowSSOModal] = useState(false)
 
@@ -68,6 +68,18 @@ function User ({ buttonDivider }) {
         disabled: true
       }
     )
+    const handleLoginClick = () => {
+      if (!authConfigured) {
+        setShowSSOModal(true)
+        return
+      }
+      const state = new AuthState()
+      state.setUiUrl(window.location.href)
+      state.setAction(AuthState.Action.ACTION_REQUEST_CODE)
+      dispatch(authRedirect(state))
+    }
+    const loginButtonText = env.isCloud ? 'Login with Google' : 'Login'
+
     return (
       <>
         <div className={classNames(
@@ -77,7 +89,7 @@ function User ({ buttonDivider }) {
         >
           {isAnonymous
             ? (
-              <Button id='dekart-login-button' type='primary' onClick={() => setShowSSOModal(true)}>Login</Button>
+              <Button id='dekart-login-button' type='primary' onClick={handleLoginClick}>{loginButtonText}</Button>
               )
             : (
               <Dropdown

src/client/ReportHeaderButtons.jsx

@@ -194,29 +194,34 @@ function useRequireWorkspace () {
 
 function WorkspaceOnboarding () {
   const history = useHistory()
+  const isAnonymous = useSelector(state => state.user.isAnonymous)
   useEffect(() => {
     track('WorkspaceOnboarding')
   }, [])
   return (
     <div className={styles.reportHeaderButtons}>
-      <Button
-        type='text' icon={<InfoCircleOutlined />}
-        href='https://dekart.xyz/?ref=about-maps-button'
-        target='_blank'
-        title='About Dekart Maps'
-        onClick={() => {
-          track('AboutDekartMaps')
-        }}
-      >About Dekart Maps
-      </Button>
-      <Button
-        icon={<PlusOutlined />}
-        type='primary' onClick={() => {
-          track('WorkspaceOnboardingCreateMap')
-          history.push('/workspace')
-        }}
-      >Create Map
-      </Button>
+      <div className={styles.hideOnMobile}>
+        <Button
+          type='text' icon={<InfoCircleOutlined />}
+          href='https://dekart.xyz/?ref=about-maps-button'
+          target='_blank'
+          title='About this map'
+          onClick={() => {
+            track('AboutDekartMaps')
+          }}
+        >About this map
+        </Button>
+      </div>
+      {!isAnonymous && (
+        <Button
+          icon={<PlusOutlined />}
+          type='primary' onClick={() => {
+            track('WorkspaceOnboardingCreateMap')
+            history.push('/workspace')
+          }}
+        >Create Map
+        </Button>
+      )}
     </div>
   )
 }

src/client/WorkspacePage.jsx

@@ -334,6 +334,7 @@ function WelcomeScreen ({ setNextStep }) {
       extra={(
         <>
           <Button
+            id='dekart-create-workspace'
             type='primary' key='1' disabled={invites.length > 0} onClick={() => {
               track('CreateWorkspace')
               setNextStep('workspace')

src/client/reducers/rootReducer.js

@@ -75,28 +75,40 @@ function usage (state = defaultUsage, action) {
   }
 }
 
-const defaultEnv = { loaded: false, variables: {}, authEnabled: null, authType: 'UNSPECIFIED', serverTime: null, receivedTime: null }
+const defaultEnv = { loaded: false, variables: {}, authEnabled: null, authConfigured: false, authType: 'UNSPECIFIED', serverTime: null, receivedTime: null }
 function env (state = defaultEnv, action) {
   switch (action.type) {
     case setRedirectState.name:
       return {
         ...state,
         loaded: false // reset when user auth details like token change
       }
-    case setEnv.name:
+    case setEnv.name: {
+      const googleOAuthEnabled = action.variables.REQUIRE_GOOGLE_OAUTH === '1'
+      const oidcEnabled = action.variables.REQUIRE_OIDC === '1'
+      const isSnowpark = action.variables.IS_SNOWPARK === '1'
+      const authConfigured = (
+        googleOAuthEnabled ||
+        oidcEnabled ||
+        action.variables.REQUIRE_IAP === '1' ||
+        action.variables.REQUIRE_AMAZON_OIDC === '1' ||
+        isSnowpark
+      )
       return {
         loaded: true,
         variables: action.variables,
         authEnabled: action.variables.AUTH_ENABLED === '1',
-        googleOAuthEnabled: action.variables.REQUIRE_GOOGLE_OAUTH === '1',
-        oidcEnabled: action.variables.REQUIRE_OIDC === '1',
+        authConfigured,
+        googleOAuthEnabled,
+        oidcEnabled,
         secretsEnabled: action.variables.SECRETS_ENABLED === '1',
         uxConfig: JSON.parse(action.variables.CLOUD_UX_CONFIG_JSON || '{}'),
         isCloud: action.variables.DEKART_CLOUD === '1',
-        isSnowpark: action.variables.IS_SNOWPARK === '1',
+        isSnowpark,
         serverTime: action.serverTime,
         receivedTime: Math.floor(Date.now() / 1000)
       }
+    }
     default:
       return state
   }