maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug, send email

This commit is contained in:
Joe Au-Yeung 2022-11-03 22:02:23 -04:00
parent 6f59210787
commit 618968c57c
2 changed files with 6 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
packages/features/ee/teams/lib/inviteMember.ts
View File

@ -25,7 +25,7 @@ export const createMember = async ({
const translation = await getTranslation(pendingMember.locale || teamOwnerLocale || "en", "common");
if (pendingMember.username && pendingMember.id) {
await prisma.membership.create({
const user = await prisma.membership.create({
data: {
teamId,
userId: pendingMember.id,
@ -33,8 +33,6 @@ export const createMember = async ({
},
});
console.log("membership created");
const sendEmail = await sendTeamInviteEmail({
language: translation,
from: inviter,
@ -42,18 +40,8 @@ export const createMember = async ({
teamName,
joinLink: WEBAPP_URL + `/settings/teams/${teamId}/members`,
});
console.log("🚀 ~ file: inviteMember.ts ~ line 43 ~ sendEamil", sendEmail);
// If user's are not on Cal.com
} else {
// Check if user is already in DB
const user = await prisma.user.findUnique({
where: {
email: pendingMember.email,
},
select: {
id: true,
},
});
if (user) {
await prisma.user.update({
where: {
@ -83,8 +71,6 @@ export const createMember = async ({
},
});
console.log("Creating member triggers");
const token: string = randomBytes(32).toString("hex");
await prisma.verificationToken.create({
@ -95,50 +81,13 @@ export const createMember = async ({
},
});
console.log("token created");
const sendEmail = await sendTeamInviteEmail({
await sendTeamInviteEmail({
language: translation,
from: inviter,
to: pendingMember.email,
teamName: teamName,
joinLink: `${WEBAPP_URL}/signup?token=${token}&callbackUrl=/settings/teams`,
});
console.log("🚀 ~ file: inviteMember.ts ~ line 98 ~ sendEmail", sendEmail);
}
}
};
// export const sendTeamInvite = async ({ member, inviter, teamOwnerLocale, teamId, teamName }) => {
// if (member.role === "OWNER") return;
// if (member.username) {
// await sendTeamInviteEmail({
// language: translation,
// from: inviter,
// to: member.email,
// teamName,
// joinLink: WEBAPP_URL + `/settings/teams/${teamId}/members`,
// });
// // Send an invite with a signup link if not a user
// } else {
// const token: string = randomBytes(32).toString("hex");
// await prisma.verificationToken.create({
// data: {
// identifier: pendingMember.email,
// token,
// expires: new Date(new Date().setHours(168)), // +1 week
// },
// });
// await sendTeamInviteEmail({
// language: translation,
// from: inviter,
// to: member.email,
// teamName: teamName,
// joinLink: `${WEBAPP_URL}/signup?token=${token}&callbackUrl=/settings/teams`,
// });
// }
// };

8
packages/trpc/server/routers/viewer/teams.tsx
View File

@ -677,14 +677,13 @@ export const viewerTeamsRouter = createProtectedRouter()
}
return {
userId: user?.id || undefined,
id: user?.id || undefined,
name: user?.name || "",
email: user?.email || emailOrUsername,
username: user?.username || "",
avatar: user?.avatar || "",
role: input.role.value,
sendInviteEmail: input.sendInviteEmail,
locale: user.locale || "en",
locale: user?.locale || "en",
};
},
})
@ -817,7 +816,7 @@ export const viewerTeamsRouter = createProtectedRouter()
});
for (const member of members) {
if (member.id !== ctx.user.id)
if (member.id !== ctx.user.id) {
await createMember({
teamId: createTeam.id,
teamName: name,
@ -825,6 +824,7 @@ export const viewerTeamsRouter = createProtectedRouter()
pendingMember: member,
teamOwnerLocale: ctx.user.locale,
});
}
}
return createTeam;