fix: allow organizations to sign up with existing usernames #25941

Rakshit-gen · 2025-12-16T15:51:36Z

Summary

Fixes username validation during organization signup to allow organizations to use usernames that exist in other organizations or the global namespace. Previously, org signups were incorrectly blocked by global username conflicts.

Changes

Updated usernameCheck function in packages/lib/server/username.ts to check organization context when currentOrgDomain is provided
Organizations now check username availability only within their specific organization
Username suggestions are also scoped to the organization context

Problem

Organizations have their own unique usernames (enforced by @@unique([username, organizationId]) in the schema), but the signup validation was checking the global namespace (organizationId: null), preventing org signups from using usernames that existed elsewhere.

Solution

When currentOrgDomain is provided:

Resolve the organizationId from the org slug
Check username availability only within that specific organization
Scope similar username queries to the organization

This allows organizations to reuse usernames from other orgs or the global namespace, while still preventing duplicates within the same organization.

Testing

Code follows existing patterns (similar to checkRegularUsername)
Backward compatible - global namespace checks unchanged
Manual testing: Sign up an organization with a username that exists globally
Manual testing: Sign up an organization with a username that exists in another org

- Update usernameCheck to check organization context when currentOrgDomain is provided - Organizations can now use usernames that exist in other orgs or global namespace - Only checks username availability within the specific organization - Fixes issue where org signups were blocked by global username conflicts Refs calcom#25800

vercel · 2025-12-16T15:51:42Z

@Rakshit-gen is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

CLAassistant · 2025-12-16T15:51:44Z

All committers have signed the CLA.

sean-brydon · 2025-12-16T15:54:37Z

Hey @Rakshit-gen - code looks good to me - would you be able to upload a before and after demo of the issue youre fixing here.

Thanks

cubic-dev-ai

1 issue found across 1 file

Prompt for AI agents (all 1 issues)


Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name="packages/lib/server/username.ts">

<violation number="1" location="packages/lib/server/username.ts:134">
P2: When `currentOrgDomain` is provided but the organization is not found, the code silently falls back to checking the global namespace. Consider returning early with an error or explicitly handling this case to avoid unexpected behavior where an invalid org domain causes global namespace checks instead of the intended org-specific check.</violation>
</file>

_{Reply to cubic to teach it or ask questions. Re-run a review with @cubic-dev-ai review this PR}

packages/lib/server/username.ts

Rakshit-gen · 2025-12-16T16:11:46Z

hey @sean-brydon i am trying to test it on local but the setup is having some issues, can you please check it on your local

sean-brydon · 2025-12-16T16:36:26Z

hey @sean-brydon i am trying to test it on local but the setup is having some issues, can you please check it on your local

Sure i can test - can you write me the steps to reproduce the issue you are fixing?

Rakshit-gen · 2025-12-16T16:51:19Z

hey @sean-brydon here are the steps for testing

Switch to branch: git checkout fix/allow-org-signup-with-existing-usernames
Start dev: yarn dx
Sign up user 1:
Go to http://localhost:3000
Sign up: [email protected] / username: testuser / password: Test1234!
Logout
Sign up user 2 (org owner):
Sign up: [email protected] / username: orgowner / password: Test1234!
Create organization:
Settings > Organizations > Create Organization
Name: Test Org
Username: testuser (same as step 3)
Expected: Should succeed. Organization can use testuser even though it exists globally.
Before fix (main branch): Step 5 fails with "Username already taken".
Verify: Check DB - both users exist with username='testuser' but different organizationId values.

sean-brydon · 2025-12-16T16:58:56Z

hey @sean-brydon here are the steps for testing

Switch to branch: git checkout fix/allow-org-signup-with-existing-usernames Start dev: yarn dx Sign up user 1: Go to http://localhost:3000 Sign up: [email protected] / username: testuser / password: Test1234! Logout Sign up user 2 (org owner): Sign up: [email protected] / username: orgowner / password: Test1234! Create organization: Settings > Organizations > Create Organization Name: Test Org Username: testuser (same as step 3) Expected: Should succeed. Organization can use testuser even though it exists globally. Before fix (main branch): Step 5 fails with "Username already taken". Verify: Check DB - both users exist with username='testuser' but different organizationId values.

Oh sweet okay - testing this!

Rakshit-gen · 2025-12-16T17:00:42Z

Yes @sean-brydon thanks!!

diffray-bot · 2025-12-16T17:38:57Z

Changes Summary

This PR fixes a bug in username validation during organization signup. Previously, users signing up to an organization were incorrectly blocked if their username existed in the global namespace or another organization. The fix properly scopes username checks to the specific organization context when currentOrgDomain is provided.

Type: bugfix

Components Affected: packages/lib/server/username.ts, username validation, organization signup

Architecture Impact

Dependencies: added: @calcom/lib/errorCodes, added: @calcom/lib/errors
Coupling: Added dependency on ErrorWithCode for proper error handling when organization is not found

Risk Areas: Organization lookup may fail or return incorrect results if slug/requestedSlug matching is inconsistent, Additional database query (Team lookup) adds latency to username checks for organization signups, Edge case: If organization exists but is not marked as isOrganization=true, lookup will fail, The similar usernames query now uses conditional scoping which could behave differently than expected

Suggestions

Add index on Team.slug for better query performance if not already indexed
Consider caching organization ID lookups to reduce database round trips
Add unit tests for edge cases: non-existent org, org without isOrganization flag, username collision within same org

_{Full review in progress... | Powered by diffray}

github-actions · 2025-12-16T17:51:52Z

E2E results are ready!

Workflow #93693.1 latest results

pull-request-size bot added the size/S label Dec 16, 2025

github-actions bot added the consumer label Dec 16, 2025

graphite-app bot added the community Created by Linear-GitHub Sync label Dec 16, 2025

graphite-app bot requested a review from a team December 16, 2025 15:51

Rakshit-gen mentioned this pull request Dec 16, 2025

Sign up with existing usernames (Orgs) #25800

Closed

cubic-dev-ai bot reviewed Dec 16, 2025

View reviewed changes

packages/lib/server/username.ts Outdated Show resolved Hide resolved

Update username.ts

9274616

pull-request-size bot added size/M and removed size/S labels Dec 16, 2025

sean-brydon approved these changes Dec 16, 2025

View reviewed changes

graphite-app bot added the ready-for-e2e label Dec 16, 2025

sean-brydon enabled auto-merge (squash) December 16, 2025 17:15

sean-brydon merged commit 47a5fc7 into calcom:main Dec 16, 2025
74 of 82 checks passed

fix: allow organizations to sign up with existing usernames #25941

fix: allow organizations to sign up with existing usernames #25941

Uh oh!

Conversation

Rakshit-gen commented Dec 16, 2025

Summary

Changes

Problem

Solution

Testing

Related

Uh oh!

vercel bot commented Dec 16, 2025

Uh oh!

CLAassistant commented Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sean-brydon commented Dec 16, 2025

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Rakshit-gen commented Dec 16, 2025

Uh oh!

sean-brydon commented Dec 16, 2025

Uh oh!

Rakshit-gen commented Dec 16, 2025

Uh oh!

sean-brydon commented Dec 16, 2025

Uh oh!

Rakshit-gen commented Dec 16, 2025

Uh oh!

diffray-bot commented Dec 16, 2025

Changes Summary

Changes Summary

Uh oh!

Uh oh!

github-actions bot commented Dec 16, 2025

E2E results are ready!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

CLAassistant commented Dec 16, 2025 •

edited

Loading