fix invites
This commit is contained in:
@@ -63,6 +63,9 @@ export async function getCurrentProjects(organizationSlug: string) {
|
|||||||
where: {
|
where: {
|
||||||
organizationSlug,
|
organizationSlug,
|
||||||
},
|
},
|
||||||
|
orderBy: {
|
||||||
|
eventsCount: 'desc',
|
||||||
|
},
|
||||||
}),
|
}),
|
||||||
db.member.findMany({
|
db.member.findMany({
|
||||||
where: {
|
where: {
|
||||||
@@ -73,6 +76,7 @@ export async function getCurrentProjects(organizationSlug: string) {
|
|||||||
db.projectAccess.findMany({
|
db.projectAccess.findMany({
|
||||||
where: {
|
where: {
|
||||||
userId: session.userId,
|
userId: session.userId,
|
||||||
|
organizationId: organizationSlug,
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
]);
|
]);
|
||||||
|
|||||||
@@ -29,9 +29,13 @@ export const organizationRouter = createTRPCRouter({
|
|||||||
inviteUser: protectedProcedure
|
inviteUser: protectedProcedure
|
||||||
.input(zInviteUser)
|
.input(zInviteUser)
|
||||||
.mutation(async ({ input, ctx }) => {
|
.mutation(async ({ input, ctx }) => {
|
||||||
const userExists = await db.user.findUnique({
|
const email = input.email.toLowerCase();
|
||||||
|
const userExists = await db.user.findFirst({
|
||||||
where: {
|
where: {
|
||||||
email: input.email,
|
email: {
|
||||||
|
equals: email,
|
||||||
|
mode: 'insensitive',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -39,7 +43,7 @@ export const organizationRouter = createTRPCRouter({
|
|||||||
|
|
||||||
if (!userExists) {
|
if (!userExists) {
|
||||||
const ticket = await clerkClient.invitations.createInvitation({
|
const ticket = await clerkClient.invitations.createInvitation({
|
||||||
emailAddress: input.email,
|
emailAddress: email,
|
||||||
notify: true,
|
notify: true,
|
||||||
});
|
});
|
||||||
invitationId = ticket.id;
|
invitationId = ticket.id;
|
||||||
@@ -47,7 +51,7 @@ export const organizationRouter = createTRPCRouter({
|
|||||||
|
|
||||||
return db.member.create({
|
return db.member.create({
|
||||||
data: {
|
data: {
|
||||||
email: input.email,
|
email,
|
||||||
organizationId: input.organizationSlug,
|
organizationId: input.organizationSlug,
|
||||||
role: input.role,
|
role: input.role,
|
||||||
invitedById: ctx.session.userId,
|
invitedById: ctx.session.userId,
|
||||||
|
|||||||
Reference in New Issue
Block a user