implement session creation when logging in

This commit is contained in:
m5r 2021-08-08 13:34:51 +08:00
parent 0b34e861e0
commit b4aa79bd85
2 changed files with 27 additions and 7 deletions

View File

@ -6,7 +6,18 @@ import { Login } from "../validations";
export const authenticateUser = async (rawEmail: string, rawPassword: string) => {
const email = rawEmail.toLowerCase().trim();
const password = rawPassword.trim();
const user = await db.user.findFirst({ where: { email } });
const user = await db.user.findFirst({
where: { email },
include: {
memberships: {
include: {
organization: {
include: { phoneNumbers: true },
},
},
},
},
});
if (!user) throw new AuthenticationError();
const result = await SecurePassword.verify(user.hashedPassword, password);
@ -14,7 +25,10 @@ export const authenticateUser = async (rawEmail: string, rawPassword: string) =>
if (result === SecurePassword.VALID_NEEDS_REHASH) {
// Upgrade hashed password with a more secure hash
const improvedHash = await SecurePassword.hash(password);
await db.user.update({ where: { id: user.id }, data: { hashedPassword: improvedHash } });
await db.user.update({
where: { id: user.id },
data: { hashedPassword: improvedHash },
});
}
const { hashedPassword, ...rest } = user;
@ -25,12 +39,18 @@ export default resolver.pipe(resolver.zod(Login), async ({ email, password }, ct
// This throws an error if credentials are invalid
const user = await authenticateUser(email, password);
const hasCompletedOnboarding = undefined; // TODO
const organization = user.memberships[0]!.organization;
const hasCompletedOnboarding =
Boolean(organization.twilioAccountSid) &&
Boolean(organization.twilioAuthToken) &&
Boolean(organization.twilioApiKey) &&
Boolean(organization.twilioApiSecret) &&
Boolean(organization.phoneNumbers.length > 1);
await ctx.session.$create({
userId: user.id,
roles: [user.role],
hasCompletedOnboarding,
orgId: "user.memberships[0].organizationId",
roles: [user.role, user.memberships[0]!.role],
hasCompletedOnboarding: hasCompletedOnboarding || undefined,
orgId: organization.id,
});
return user;

View File

@ -17,7 +17,7 @@ export default function ConversationsList() {
<li key={recipient} className="py-2">
<Link
href={Routes.ConversationPage({
recipient: encodeURIComponent(recipient),
recipient: encodeURI(recipient),
})}
>
<a className="flex flex-col">