Skip to content

fix(server): align organization access control type #296

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.

Sign up for GitHub

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
siisee11 merged 1 commit into from
Jun 26, 2026
Merged

fix(server): align organization access control type #296

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion packages/server/src/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@ const AUTH_SESSION_UPDATE_AGE_SECONDS =
const AUTH_SESSION_EXPIRES_IN_SECONDS =
AUTH_SESSION_EXPIRES_IN_DAYS * SECONDS_PER_DAY;
const AUTH_SESSION_COOKIE_CACHE_MAX_AGE_SECONDS = 15 * SECONDS_PER_MINUTE;
type OrganizationPluginOptions = NonNullable<
Parameters<typeof organization>[0]
>;
type OrganizationAccessControlOption = NonNullable<
OrganizationPluginOptions["ac"]
>;

const authOrganizationAccessControl =
organizationAccessControl as OrganizationAccessControlOption;

// ============================================================================
// Database-Backed Session Cache Configuration
Expand Down Expand Up @@ -150,7 +159,7 @@ export function createAuth(config: AuthConfig) {
verificationUri: "/api/device",
}),
organization({
ac: organizationAccessControl,
ac: authOrganizationAccessControl,
allowUserToCreateOrganization: true,
// Comment: Org deletion is operator-assisted only because Better Auth's
// default endpoint hard-deletes all org-owned rows transitively.
Expand Down