Skip to content

feat(auth): migrate to better-auth admin plugin with unified Admin tab #3612

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
waleedlatif1 merged 12 commits into from
Mar 17, 2026
Merged

feat(auth): migrate to better-auth admin plugin with unified Admin tab #3612

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c86954f
feat(auth): migrate to better-auth admin plugin
waleedlatif1 Mar 16, 2026
95dde52
feat(settings): add unified Admin tab with user management
waleedlatif1 Mar 16, 2026
c2cc5c4
fix(db): backfill existing super users to admin role in migration
waleedlatif1 Mar 16, 2026
dbde6e6
fix(admin): resolve type errors in admin tab
waleedlatif1 Mar 16, 2026
f51e1d9
improvement(auth): remove /api/user/super-user route, use session role
waleedlatif1 Mar 16, 2026
2b6cb7e
chore(auth): remove redundant role override in customSession
waleedlatif1 Mar 16, 2026
6f54337
improvement(queries): clean up admin-users hooks per React Query best…
waleedlatif1 Mar 16, 2026
0665b93
fix(admin): address review feedback on admin tab
waleedlatif1 Mar 16, 2026
ea6b1f8
fix(settings): align superUserModeEnabled default to false everywhere
waleedlatif1 Mar 17, 2026
fec89ef
fix(admin): fix stale pendingUserId, add isPending guard and error fe…
waleedlatif1 Mar 17, 2026
02ac5da
fix(admin): concurrent pending users Set, session loading guard, doma…
waleedlatif1 Mar 17, 2026
b38ae6f
fix(admin): close OAuth domain bypass, fix stale errors, deduplicate …
waleedlatif1 Mar 17, 2026
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
4 changes: 2 additions & 2 deletions apps/sim/app/api/user/super-user/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export async function GET(request: NextRequest) {
}

const currentUser = await db
.select({ isSuperUser: user.isSuperUser })
.select({ role: user.role })
.from(user)
.where(eq(user.id, session.user.id))
.limit(1)
Expand All @@ -33,7 +33,7 @@ export async function GET(request: NextRequest) {
}

return NextResponse.json({
isSuperUser: currentUser[0].isSuperUser,
isSuperUser: currentUser[0].role === 'admin',
})
} catch (error) {
logger.error(`[${requestId}] Error checking super user status`, error)
Expand Down
6 changes: 3 additions & 3 deletions apps/sim/app/workspace/[workspaceId]/templates/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ export default async function TemplatesPage({ params }: TemplatesPageProps) {
redirect(`/workspace/${workspaceId}`)
}

// Determine effective super user (DB flag AND UI mode enabled)
// Determine effective super user (admin role AND UI mode enabled)
const currentUser = await db
.select({ isSuperUser: user.isSuperUser })
.select({ role: user.role })
.from(user)
.where(eq(user.id, session.user.id))
.limit(1)
Expand All @@ -56,7 +56,7 @@ export default async function TemplatesPage({ params }: TemplatesPageProps) {
.where(eq(settings.userId, session.user.id))
.limit(1)

const isSuperUser = currentUser[0]?.isSuperUser || false
const isSuperUser = currentUser[0]?.role === 'admin'
const superUserModeEnabled = userSettings[0]?.superUserModeEnabled ?? true
const effectiveSuperUser = isSuperUser && superUserModeEnabled

Expand Down
2 changes: 2 additions & 0 deletions apps/sim/lib/auth/auth-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useContext } from 'react'
import { ssoClient } from '@better-auth/sso/client'
import { stripeClient } from '@better-auth/stripe/client'
import {
adminClient,
customSessionClient,
emailOTPClient,
genericOAuthClient,
Expand All @@ -17,6 +18,7 @@ import { SessionContext, type SessionHookResult } from '@/app/_shell/providers/s
export const client = createAuthClient({
baseURL: getBaseUrl(),
plugins: [
adminClient(),
emailOTPClient(),
genericOAuthClient(),
customSessionClient<typeof auth>(),
Expand Down
2 changes: 2 additions & 0 deletions apps/sim/lib/auth/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { betterAuth } from 'better-auth'
import { drizzleAdapter } from 'better-auth/adapters/drizzle'
import { nextCookies } from 'better-auth/next-js'
import {
admin,
createAuthMiddleware,
customSession,
emailOTP,
Expand Down Expand Up @@ -625,6 +626,7 @@ export const auth = betterAuth({
},
plugins: [
nextCookies(),
admin(),
jwt({
jwks: {
keyPairConfig: { alg: 'RS256' },
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/lib/templates/permissions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export async function verifyEffectiveSuperUser(userId: string): Promise<{
superUserModeEnabled: boolean
}> {
const [currentUser] = await db
.select({ isSuperUser: user.isSuperUser })
.select({ role: user.role })
.from(user)
.where(eq(user.id, userId))
.limit(1)
Expand All @@ -28,7 +28,7 @@ export async function verifyEffectiveSuperUser(userId: string): Promise<{
.where(eq(settings.userId, userId))
.limit(1)

const isSuperUser = currentUser?.isSuperUser || false
const isSuperUser = currentUser?.role === 'admin'
const superUserModeEnabled = userSettings?.superUserModeEnabled ?? false

return {
Expand Down
6 changes: 6 additions & 0 deletions packages/db/migrations/0177_wise_puma.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ALTER TABLE "session" ADD COLUMN "impersonated_by" text;--> statement-breakpoint
ALTER TABLE "user" ADD COLUMN "role" text DEFAULT 'user';--> statement-breakpoint
ALTER TABLE "user" ADD COLUMN "banned" boolean DEFAULT false;--> statement-breakpoint
ALTER TABLE "user" ADD COLUMN "ban_reason" text;--> statement-breakpoint
ALTER TABLE "user" ADD COLUMN "ban_expires" timestamp;--> statement-breakpoint
ALTER TABLE "user" DROP COLUMN "is_super_user";
Loading
Loading