DO NOT MERGE: Feat/cloud auth gates #6174

arjansingh · 2025-10-21T01:47:05Z

Summary

Changes

What:
Breaking:
Dependencies:

Review Focus

Screenshots (if applicable)

┆Issue is synchronized with this Notion page by Unito

Merge conflicts: - src/scripts/api.ts - Content conflict

Merge conflicts: - src/composables/auth/useCurrentUser.ts - Content conflict - src/types/comfy.ts - Content conflict

Merge conflicts: - src/locales/en/main.json - Content conflict - src/onboardingCloudRoutes.ts - Modify/delete conflict (file deleted in HEAD, modified in commit) - src/platform/onboarding/cloud/UserCheckView.vue - Modify/delete conflict (file deleted in HEAD, modified in commit)

github-actions · 2025-10-21T01:47:34Z

🎨 Storybook Build Status

❌ Build failed!

⏰ Completed at: 10/21/2025, 01:48:20 AM UTC

🔗 Links

📊 View Workflow Run
⏭️ Storybook deployment skipped (build did not succeed)

⚠️ Please check the workflow logs for error details.

github-actions · 2025-10-21T01:47:37Z

🎭 Playwright Test Results

🕵🏻 No test results found

⏰ Completed at: 10/21/2025, 01:51:13 AM UTC

📊 Test Reports by Browser

❌ chromium: Deployment failed
❌ chromium-2x: Deployment failed
❌ chromium-0.5x: Deployment failed
❌ mobile-chrome: Deployment failed

🎉 Click on the links above to view detailed test results for each browser configuration.

arjansingh · 2025-10-21T02:12:33Z

src/router.ts

 })

+// Global authentication guard
+router.beforeEach(async (_to, _from, next) => {


short term: isCloud
long term: extension for router hooks

arjansingh · 2025-10-21T02:13:54Z

src/router.ts

+  // Check if user is authenticated (Firebase or API key)
+  const authHeader = await authStore.getAuthHeader()
+
+  if (!authHeader) {


if (authHeader) { next() return }

arjansingh · 2025-10-21T02:15:18Z

src/scripts/api.ts

+  /**
+   * Waits for Firebase auth to be initialized before proceeding
+   */
+  async #waitForAuthInitialization(): Promise<void> {


private typescript

arjansingh · 2025-10-21T02:15:52Z

src/scripts/api.ts

+      return
+    }
+
+    return new Promise<void>((resolve) => {


arjansingh

0562d87 - look at moving code either into to @/platform/cloud/auth or alongside firebase stuff.

arjansingh · 2025-10-21T02:21:57Z

src/router.ts

+  if (!authHeader) {
+    // User is not authenticated, show sign-in dialog
+    const dialogService = useDialogService()
+    const loginSuccess = await dialogService.showSignInDialog()


double check to see if this is part of the app already.

arjansingh

249e27a - confirm that this websocket auth token re-init (with firebase) is needed?

if so try to merge without isCloud gate.

arjansingh

4abdaa3 - no isCloud needed. this cherry-pick might not even be needed.

arjansingh · 2025-10-21T02:42:20Z

src/composables/auth/useCurrentUser.ts

+=======
+  const onUserResolved = (callback: (user: AuthUserInfo) => void) => {
+    if (resolvedUserInfo.value) {
+      callback(resolvedUserInfo.value)
+    }
+
+    const stop = whenever(resolvedUserInfo, callback)
+    return () => stop()
+  }
+>>>>>>> 775c856bf (port user ID expose hook from 6786d8e to cloud)


do note use this. take HEAD

arjansingh · 2025-10-21T02:43:07Z

src/composables/auth/useCurrentUser.ts

+<<<<<<< HEAD
    handleDeleteAccount,
+=======
+>>>>>>> 775c856bf (port user ID expose hook from 6786d8e to cloud)


Take deletion

arjansingh · 2025-10-21T02:43:52Z

src/types/comfy.ts

   * Extensions can register at any time and will receive the latest value immediately.
   * This is an experimental API and may be changed or removed in the future.
+=======
+   * Fired whenever authentication resolves, providing the user id.


arjansingh

13b429a - see inline comments

arjansingh · 2025-10-21T02:54:56Z

src/composables/auth/useFirebaseAuthActions.ts

+
+    // Redirect to login page if we're on cloud domain
+    const hostname = window.location.hostname
+    if (hostname.includes('cloud.comfy.org')) {


short term: if(isCloud)...

longer term: /logout route that calls firebase and then redirects the users.

arjansingh · 2025-10-21T03:01:36Z

src/locales/en/main.json

        "Close": "Close"
      }
+<<<<<<< HEAD
+=======


just resolve this to take the strings

arjansingh · 2025-10-21T03:07:49Z

src/router.ts

  const authStore = useFirebaseAuthStore()

-  // Wait for Firebase auth to initialize
+  // Wait for Firebase auth to initialize with timeout


should be protected by isCloud on line 60

arjansingh

82e9a22 - we probably don't need this for auth gating. Merge this commit when we get to the onboarding workflow.

arjansingh · 2025-10-22T23:56:24Z

see #6195 for actual implementation.

arjansingh added 5 commits October 20, 2025 17:51

Cherry-pick 23e881e - Prevent access without login (with conflicts)

0562d87

Merge conflicts: - src/scripts/api.ts - Content conflict

Cherry-pick 799795c - Add ensureUser function (no conflicts)

249e27a

Cherry-pick 775c856 - Port user ID expose hook (with conflicts)

4abdaa3

Merge conflicts: - src/composables/auth/useCurrentUser.ts - Content conflict - src/types/comfy.ts - Content conflict

Cherry-pick 80b1c2a - Firebase auth actions updates (no conflicts)

13b429a

arjansingh commented Oct 21, 2025

View reviewed changes

src/scripts/api.ts

return

}

return new Promise<void>((resolve) => {

Copy link

Contributor Author

arjansingh Oct 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

await

arjansingh commented Oct 21, 2025

View reviewed changes

src/locales/en/main.json

"Close": "Close"

}

<<<<<<< HEAD

=======

Copy link

Contributor Author

arjansingh Oct 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just resolve this to take the strings

arjansingh commented Oct 21, 2025

View reviewed changes

arjansingh closed this Oct 22, 2025

arjansingh deleted the feat/cloud-auth-gates branch October 22, 2025 23:56

DO NOT MERGE: Feat/cloud auth gates #6174

DO NOT MERGE: Feat/cloud auth gates #6174

Uh oh!

Conversation

arjansingh commented Oct 21, 2025 • edited by sync-by-unito bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Changes

Review Focus

Screenshots (if applicable)

Uh oh!

github-actions bot commented Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🎨 Storybook Build Status

🔗 Links

Uh oh!

github-actions bot commented Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🎭 Playwright Test Results

📊 Test Reports by Browser

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arjansingh Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arjansingh left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arjansingh left a comment

Choose a reason for hiding this comment

Uh oh!

arjansingh left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arjansingh left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arjansingh Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arjansingh left a comment

Choose a reason for hiding this comment

Uh oh!

arjansingh commented Oct 22, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

arjansingh commented Oct 21, 2025 •

edited by sync-by-unito bot

Loading

github-actions bot commented Oct 21, 2025 •

edited

Loading

github-actions bot commented Oct 21, 2025 •

edited

Loading

arjansingh Oct 21, 2025 •

edited

Loading

arjansingh left a comment •

edited

Loading

arjansingh Oct 21, 2025 •

edited

Loading