Skip to content

fix(auth): sort org memberships by creation date #1268

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
saddlepaddle merged 1 commit into from
Feb 7, 2026
Merged

fix(auth): sort org memberships by creation date #1268

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion packages/auth/src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
mcp,
organization,
} from "better-auth/plugins";
import { and, count, eq } from "drizzle-orm";
import { and, count, desc, eq } from "drizzle-orm";
import type Stripe from "stripe";
import { env } from "./env";
import { acceptInvitationEndpoint } from "./lib/accept-invitation-endpoint";
Expand Down Expand Up @@ -406,6 +406,7 @@ export const auth = betterAuth({
eq(members.organizationId, activeOrganizationId),
)
: eq(members.userId, session.userId ?? user.id),
orderBy: desc(members.createdAt),
});

if (!activeOrganizationId && membership?.organizationId) {
Expand Down
4 changes: 3 additions & 1 deletion packages/trpc/src/router/user/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { db } from "@superset/db/client";
import { members, users } from "@superset/db/schema";
import { TRPCError, type TRPCRouterRecord } from "@trpc/server";
import { del, put } from "@vercel/blob";
import { and, eq } from "drizzle-orm";
import { and, desc, eq } from "drizzle-orm";
import { z } from "zod";

import { protectedProcedure } from "../../trpc";
Expand All @@ -20,6 +20,7 @@ export const userRouter = {
eq(members.organizationId, activeOrganizationId),
)
: eq(members.userId, ctx.session.user.id),
orderBy: desc(members.createdAt),
with: {
organization: true,
},
Expand All @@ -31,6 +32,7 @@ export const userRouter = {
myOrganizations: protectedProcedure.query(async ({ ctx }) => {
const memberships = await db.query.members.findMany({
where: eq(members.userId, ctx.session.user.id),
orderBy: desc(members.createdAt),
with: {
organization: true,
},
Expand Down