12hr login link

lilith · Aug 12, 2023 · 60c59a6 · 60c59a6
1 parent e2ac595
commit 60c59a6
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/src/lib/date.ts b/src/lib/date.ts
@@ -1,4 +1,4 @@
 import { DateTime } from 'luxon';
 
 export const toLocalTimezone = (d: Date, timeZone: string) =>
-	DateTime.fromJSDate(d, { zone: 'utc' }).setZone(timeZone);
+	DateTime.fromJSDate(d).setZone(timeZone);
diff --git a/src/lib/server/login.ts b/src/lib/server/login.ts
@@ -5,7 +5,7 @@ const prisma = new PrismaClient();
 export const generate = async () => {
 	const createdAt = new Date();
 	const expires = new Date();
-	expires.setHours(createdAt.getHours() + 1);
+	expires.setHours(createdAt.getHours() + 12);
 
 	let crypto;
 	try {

diff --git a/src/lib/server/twilio.ts b/src/lib/server/twilio.ts
@@ -6,6 +6,7 @@ import { PrismaClient, type User } from '@prisma/client';
 import { circleNotif } from './sanitize';
 import { generate, save } from './login';
 import { toLocalTimezone } from '../date';
+import { DateTime } from 'luxon';
 
 const prisma = new PrismaClient();
 const MessagingResponse = Twilio.twiml.MessagingResponse;
@@ -20,9 +21,27 @@ const msgToSend = async (
 	let msg;
 	switch (type) {
 		case 'login': {
-			const { phone, time, token } = msgComps;
+			const { phone, token, timeZone } = msgComps;
+			const magicLink = await prisma.magicLink
+				.findUnique({
+					where: {
+						token
+					},
+					select: {
+						expires: true
+					}
+				})
+				.catch((err) => console.error(err));
+			if (!magicLink) {
+				throw error(404, {
+					message: `No magic link with token ${token}`
+				});
+			}
 
-			msg = `Your login link to playdate.help will expire at ${time}: ${url}/login/${phone.slice(
+			const localTime = toLocalTimezone(magicLink.expires, timeZone).toLocaleString(
+				DateTime.TIME_SIMPLE
+			);
+			msg = `Your login link to playdate.help will expire at ${localTime}: ${url}/login/${phone.slice(
 				1
 			)}/${token}`;
 			break;

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -40,11 +40,13 @@
 			const { time, token } = await res.json();
 			if (public_env.PUBLIC_ENV === 'test') console.log('PHONE_TOKEN', phone, token);
 
+			const region = new Intl.DateTimeFormat();
+			const { timeZone } = region.resolvedOptions();
 			const msgRes = await writeReq('/twilio?nocookie=true', {
 				phone,
 				type: 'login',
-				time,
-				token
+				token,
+				timeZone
 			});
 			const { message } = await msgRes.json();
 			if (msgRes.status === 200) {

diff --git a/src/routes/login/+server.ts b/src/routes/login/+server.ts
@@ -1,5 +1,6 @@
 import { generate, save } from '$lib/server/login';
 import { PrismaClient } from '@prisma/client';
+import { DateTime } from 'luxon';
 
 const prisma = new PrismaClient({
 	log: ['query', 'info', 'warn', 'error']
@@ -19,7 +20,6 @@ export async function POST({ request }: { request: Request }) {
 	}
 
 	const { token, createdAt, expires } = await generate();
-
 	if (!token) {
 		console.error('token generation failed');
 		return new Response(
@@ -43,15 +43,8 @@ export async function POST({ request }: { request: Request }) {
 			process.exit(1);
 		});
 
-	// put the expiration date in a human-readable format for the text message
-	const hrs = expires.getHours();
-	const time = `${hrs > 12 ? hrs - 12 : hrs}:${
-		expires.getMinutes() < 10 ? '0' : ''
-	}${expires.getMinutes()}${hrs >= 12 ? 'PM' : 'AM'}`;
-
 	return new Response(
 		JSON.stringify({
-			time,
 			token
 		}),
 		{