-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Cloud: remove extension_bridge_enabled for personal users #7638
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+9
−18
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -563,11 +563,7 @@ export class WebAuthService extends EventEmitter<AuthServiceEvents> implements A | |
| )?.email_address | ||
| } | ||
|
|
||
| // Check for extension_bridge_enabled in user's public metadata | ||
| let extensionBridgeEnabled = false | ||
| if (userData.public_metadata?.extension_bridge_enabled === true) { | ||
| extensionBridgeEnabled = true | ||
| } | ||
| let extensionBridgeEnabled = true | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this intentional as a breaking change? The default changing from to could affect existing users who haven't explicitly set this flag. Should there be a migration strategy or announcement for this change?
jr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| // Fetch organization info if user is in organization context | ||
| try { | ||
|
|
@@ -583,11 +579,7 @@ export class WebAuthService extends EventEmitter<AuthServiceEvents> implements A | |
| if (userMembership) { | ||
| this.setUserOrganizationInfo(userInfo, userMembership) | ||
|
|
||
| // Check organization public metadata for extension_bridge_enabled | ||
| // Organization setting takes precedence over user setting | ||
| if (await this.isExtensionBridgeEnabledForOrganization(storedOrgId)) { | ||
| extensionBridgeEnabled = true | ||
| } | ||
| extensionBridgeEnabled = await this.isExtensionBridgeEnabledForOrganization(storedOrgId) | ||
jr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| this.log("[auth] User in organization context:", { | ||
| id: userMembership.organization.id, | ||
|
|
@@ -608,10 +600,9 @@ export class WebAuthService extends EventEmitter<AuthServiceEvents> implements A | |
| if (primaryOrgMembership) { | ||
| this.setUserOrganizationInfo(userInfo, primaryOrgMembership) | ||
|
|
||
| // Check organization public metadata for extension_bridge_enabled | ||
| if (await this.isExtensionBridgeEnabledForOrganization(primaryOrgMembership.organization.id)) { | ||
| extensionBridgeEnabled = true | ||
| } | ||
| extensionBridgeEnabled = await this.isExtensionBridgeEnabledForOrganization( | ||
| primaryOrgMembership.organization.id, | ||
| ) | ||
|
|
||
| this.log("[auth] Legacy credentials: Found organization membership:", { | ||
| id: primaryOrgMembership.organization.id, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Business logic change: For personal users, extensionBridgeEnabled is now always set to true. Please add a clarifying comment explaining that personal accounts always have the extension bridge enabled and that the user metadata flag is no longer used.