:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.
Python ab-testingai-analyticsanalyticscdpdata-warehouseexperimentsfeature-flagsjavascriptproduct-analyticspythonreactsession-replaysurveystypescriptweb-analytics
fix(oauth): make the org picker a select and default to current org (#130073)
Yasenfa04167d11ad
diff --git a/frontend/src/scenes/oauth/oauthAuthorizeLogic.test.ts b/frontend/src/scenes/oauth/oauthAuthorizeLogic.test.tsindex edf973516232..7c4661378983 100644--- a/frontend/src/scenes/oauth/oauthAuthorizeLogic.test.ts+++ b/frontend/src/scenes/oauth/oauthAuthorizeLogic.test.ts@@ -432,6 +432,12 @@ describe('oauthAuthorizeLogic', () => {earlierAccess: { scoped_teams: [22], scoped_organizations: [] },expected: { access_type: 'teams', scoped_teams: [22] },},+ {+ name: 'its organization when the app requires one',+ requiredAccessLevel: 'organization',+ earlierAccess: { scoped_teams: [], scoped_organizations: ['org-b'] },+ expected: { access_type: 'organizations', scoped_organizations: ['org-b'] },+ },])('a step-up pre-selects the earlier grant: $name', ({ requiredAccessLevel, earlierAccess, expected }) => {window.POSTHOG_APP_CONTEXT = {...window.POSTHOG_APP_CONTEXT,@@ -492,6 +498,14 @@ describe('oauthAuthorizeLogic', () => {expect(logic.values.oauthAuthorization.scoped_teams).toEqual(expectedTeams)})+ it('pre-selects the current organization when the app requires organization access', () => {+ logic.actions.setRequiredAccessLevel('organization')+ expect(logic.values.oauthAuthorization).toMatchObject({+ access_type: 'organizations',+ scoped_organizations: [MOCK_DEFAULT_USER.organization?.id],+ })+ })+// Opaque client-owned params must reach the API byte-for-byte, whatever they look like.it.each([{ name: 'the server sets no flag', flag: undefined, expected: false },diff --git a/frontend/src/scenes/oauth/oauthAuthorizeLogic.ts b/frontend/src/scenes/oauth/oauthAuthorizeLogic.tsindex 4fc49e551471..d95f299f736c 100644--- a/frontend/src/scenes/oauth/oauthAuthorizeLogic.ts+++ b/frontend/src/scenes/oauth/oauthAuthorizeLogic.ts@@ -635,6 +635,10 @@ export const oauthAuthorizeLogic = kea<oauthAuthorizeLogicType>([setRequiredAccessLevel: ({ requiredAccessLevel }) => {if (requiredAccessLevel === 'organization') {actions.setOauthAuthorizationValue('access_type', 'organizations')+ const currentOrganizationId = userLogic.values.user?.organization?.id+ if (currentOrganizationId) {+ actions.setOauthAuthorizationValue('scoped_organizations', [currentOrganizationId])+ }} else if (requiredAccessLevel === 'team') {actions.setOauthAuthorizationValue('access_type', 'teams')// With a team_id hint pending, let it drive org+project selection oncediff --git a/frontend/src/scenes/settings/user/scopes/ScopeAccessSelector/OrganizationSelector.tsx b/frontend/src/scenes/settings/user/scopes/ScopeAccessSelector/OrganizationSelector.tsxindex 8317cdba5be6..c04e9d3826de 100644--- a/frontend/src/scenes/settings/user/scopes/ScopeAccessSelector/OrganizationSelector.tsx+++ b/frontend/src/scenes/settings/user/scopes/ScopeAccessSelector/OrganizationSelector.tsx@@ -1,21 +1,36 @@-import { LemonInputSelect } from '@posthog/lemon-ui'+import { LemonInputSelect, LemonSelect } from '@posthog/lemon-ui'import type { OrganizationSelectorProps } from './types'-import { createOrganizationOption } from './utils'+import { createOrganizationOption, organizationTooltip } from './utils'export const OrganizationSelector = ({organizations,mode,value,onChange,-}: OrganizationSelectorProps): JSX.Element => (- <LemonInputSelect- mode={mode}- data-attr="organizations"- value={value}- onChange={onChange}- options={organizations.map((org) => createOrganizationOption(org)) ?? []}- loading={organizations === undefined}- placeholder={mode === 'single' ? 'Select an organization...' : 'Select organizations...'}- />-)+}: OrganizationSelectorProps): JSX.Element =>+ mode === 'single' ? (+ <LemonSelect+ fullWidth+ data-attr="organizations"+ value={value?.[0]}+ onChange={(organizationId) => onChange?.(organizationId ? [organizationId] : [])}+ options={organizations.map((org) => ({+ value: org.id,+ label: org.name,+ tooltip: organizationTooltip(org),+ }))}+ loading={organizations === undefined}+ placeholder="Select an organization..."+ />+ ) : (+ <LemonInputSelect+ mode="multiple"+ data-attr="organizations"+ value={value}+ onChange={onChange}+ options={organizations.map((org) => createOrganizationOption(org)) ?? []}+ loading={organizations === undefined}+ placeholder="Select organizations..."+ />+ )diff --git a/frontend/src/scenes/settings/user/scopes/ScopeAccessSelector/utils.tsx b/frontend/src/scenes/settings/user/scopes/ScopeAccessSelector/utils.tsxindex 8b16bd67385b..f19312bd3396 100644--- a/frontend/src/scenes/settings/user/scopes/ScopeAccessSelector/utils.tsx+++ b/frontend/src/scenes/settings/user/scopes/ScopeAccessSelector/utils.tsx@@ -2,18 +2,18 @@ import { LemonInputSelectOption, Tooltip } from '@posthog/lemon-ui'import type { OrganizationOption, TeamOption } from './types'+export const organizationTooltip = (org: OrganizationOption): JSX.Element => (+ <div>+ <div className="font-semibold">{org.name}</div>+ <div className="text-xs whitespace-nowrap">ID: {org.id}</div>+ </div>+)+export const createOrganizationOption = (org: OrganizationOption): LemonInputSelectOption<string> => ({key: `${org.id}`,label: org.name,labelComponent: (- <Tooltip- title={- <div>- <div className="font-semibold">{org.name}</div>- <div className="text-xs whitespace-nowrap">ID: {org.id}</div>- </div>- }- >+ <Tooltip title={organizationTooltip(org)}><span className="flex-1 font-semibold">{org.name}</span></Tooltip>),