Skip to content

Commit e7922ff

Browse files
committed
Cloud: remove extension_bridge_enabled for personal users
1 parent 8dbd30a commit e7922ff

File tree

2 files changed

+9
-18
lines changed

2 files changed

+9
-18
lines changed

packages/cloud/src/WebAuthService.ts

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -563,11 +563,7 @@ export class WebAuthService extends EventEmitter<AuthServiceEvents> implements A
563563
)?.email_address
564564
}
565565

566-
// Check for extension_bridge_enabled in user's public metadata
567-
let extensionBridgeEnabled = false
568-
if (userData.public_metadata?.extension_bridge_enabled === true) {
569-
extensionBridgeEnabled = true
570-
}
566+
let extensionBridgeEnabled = true
571567

572568
// Fetch organization info if user is in organization context
573569
try {
@@ -583,11 +579,7 @@ export class WebAuthService extends EventEmitter<AuthServiceEvents> implements A
583579
if (userMembership) {
584580
this.setUserOrganizationInfo(userInfo, userMembership)
585581

586-
// Check organization public metadata for extension_bridge_enabled
587-
// Organization setting takes precedence over user setting
588-
if (await this.isExtensionBridgeEnabledForOrganization(storedOrgId)) {
589-
extensionBridgeEnabled = true
590-
}
582+
extensionBridgeEnabled = await this.isExtensionBridgeEnabledForOrganization(storedOrgId)
591583

592584
this.log("[auth] User in organization context:", {
593585
id: userMembership.organization.id,
@@ -608,10 +600,9 @@ export class WebAuthService extends EventEmitter<AuthServiceEvents> implements A
608600
if (primaryOrgMembership) {
609601
this.setUserOrganizationInfo(userInfo, primaryOrgMembership)
610602

611-
// Check organization public metadata for extension_bridge_enabled
612-
if (await this.isExtensionBridgeEnabledForOrganization(primaryOrgMembership.organization.id)) {
613-
extensionBridgeEnabled = true
614-
}
603+
extensionBridgeEnabled = await this.isExtensionBridgeEnabledForOrganization(
604+
primaryOrgMembership.organization.id,
605+
)
615606

616607
this.log("[auth] Legacy credentials: Found organization membership:", {
617608
id: primaryOrgMembership.organization.id,

packages/cloud/src/__tests__/WebAuthService.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ describe("WebAuthService", () => {
560560
name: "John Doe",
561561
562562
picture: "https://example.com/avatar.jpg",
563-
extensionBridgeEnabled: false,
563+
extensionBridgeEnabled: true,
564564
},
565565
})
566566
})
@@ -725,7 +725,7 @@ describe("WebAuthService", () => {
725725
name: "Jane Smith",
726726
727727
picture: "https://example.com/jane.jpg",
728-
extensionBridgeEnabled: false,
728+
extensionBridgeEnabled: true,
729729
})
730730
})
731731

@@ -844,7 +844,7 @@ describe("WebAuthService", () => {
844844
name: "John Doe",
845845
email: undefined,
846846
picture: undefined,
847-
extensionBridgeEnabled: false,
847+
extensionBridgeEnabled: true,
848848
})
849849
})
850850
})
@@ -969,7 +969,7 @@ describe("WebAuthService", () => {
969969
name: "Test User",
970970
email: undefined,
971971
picture: undefined,
972-
extensionBridgeEnabled: false,
972+
extensionBridgeEnabled: true,
973973
},
974974
})
975975
})

0 commit comments

Comments
 (0)