Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

fix invites

Carl-Gerhard Lindesvärdb5b126f05dde
diff --git a/packages/db/src/services/project.service.ts b/packages/db/src/services/project.service.ts
index 7f05ac561..41d574bff 100644
--- a/packages/db/src/services/project.service.ts
+++ b/packages/db/src/services/project.service.ts
@@ -63,6 +63,9 @@ export async function getCurrentProjects(organizationSlug: string) {
where: {
organizationSlug,
},
+ orderBy: {
+ eventsCount: 'desc',
+ },
}),
db.member.findMany({
where: {
@@ -73,6 +76,7 @@ export async function getCurrentProjects(organizationSlug: string) {
db.projectAccess.findMany({
where: {
userId: session.userId,
+ organizationId: organizationSlug,
},
}),
]);
diff --git a/packages/trpc/src/routers/organization.ts b/packages/trpc/src/routers/organization.ts
index bd13402bc..dbe0c4f6e 100644
--- a/packages/trpc/src/routers/organization.ts
+++ b/packages/trpc/src/routers/organization.ts
@@ -29,9 +29,13 @@ export const organizationRouter = createTRPCRouter({
inviteUser: protectedProcedure
.input(zInviteUser)
.mutation(async ({ input, ctx }) => {
- const userExists = await db.user.findUnique({
+ const email = input.email.toLowerCase();
+ const userExists = await db.user.findFirst({
where: {
- email: input.email,
+ email: {
+ equals: email,
+ mode: 'insensitive',
+ },
},
});
@@ -39,7 +43,7 @@ export const organizationRouter = createTRPCRouter({
if (!userExists) {
const ticket = await clerkClient.invitations.createInvitation({
- emailAddress: input.email,
+ emailAddress: email,
notify: true,
});
invitationId = ticket.id;
@@ -47,7 +51,7 @@ export const organizationRouter = createTRPCRouter({
return db.member.create({
data: {
- email: input.email,
+ email,
organizationId: input.organizationSlug,
role: input.role,
invitedById: ctx.session.userId,