Skip to content

Add organization billing model and members/billing console flows#2

Merged
RhysSullivan merged 23 commits into
mainfrom
feat/org-workspace-billing-members-v2
Feb 8, 2026
Merged

Add organization billing model and members/billing console flows#2
RhysSullivan merged 23 commits into
mainfrom
feat/org-workspace-billing-members-v2

Conversation

@RhysSullivan
Copy link
Copy Markdown
Owner

Supersedes #1 with correct base after main push.

Comment thread executor/convex/app.ts

const workosEnabled = Boolean(process.env.WORKOS_CLIENT_ID && process.env.WORKOS_API_KEY);

export const getClientConfig = query({
Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

probably bad

Comment thread executor/convex/auth.ts Outdated
return baseSlug;
}

for (let i = 0; i < 20; i += 1) {
Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

make reusable

Comment thread executor/convex/auth.ts Outdated
}

async function upsertOrganizationMembership(
ctx: { db: any },
Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

dont use any

Comment thread executor/convex/auth.ts Outdated

async function ensureOrganizationForWorkspace(
ctx: { db: any },
args: {
Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

can you import thistype from somewhere

Comment thread executor/convex/auth.ts
}
}

async function ensurePersonalWorkspace(
Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

lets solve this by just making organizationId not nullable in our schema instead then its always required to be defined and we can get rid of all this ensure crap in the codebase

@RhysSullivan RhysSullivan merged commit b8feacb into main Feb 8, 2026
RhysSullivan added a commit that referenced this pull request Mar 3, 2026
…mbers-v2

Add organization billing model and members/billing console flows
RhysSullivan added a commit that referenced this pull request Apr 5, 2026
…mbers-v2

Add organization billing model and members/billing console flows
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant