Passkey timetolive and ics day error (#181)

elmpoint-org · Sep 18, 2024 · 7d7a4be · 7d7a4be
1 parent a404163
commit 7d7a4be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/server/src/auth/passkeys.ts b/server/src/auth/passkeys.ts
@@ -1,6 +1,6 @@
 import { EMAIL_LOGIN_EXPIRE } from '@@/CONSTANTS';
 import { emails } from '@@/email';
-import { isDev, siteDomain } from '@@/util/dev';
+import { siteDomain } from '@@/util/dev';
 import { PasswordlessClient } from '@passwordlessdev/passwordless-nodejs';
 import axios from 'axios';
 import qs from 'qs';
@@ -33,10 +33,10 @@ export async function passwordlessSendMagicLink(p: {
   const { data } = await axios
     .post(
       PASSWORDLESS_API + '/signin/generate-token',
-      { userId: params.userId },
+      { userId: params.userId, timeToLive: EMAIL_LOGIN_EXPIRE },
       { headers: { ApiSecret: PASSWORDLESS_SECRET } }
     )
-    .catch(() => ({ data: null }));
+    .catch((e) => ({ data: console.log(new Error(e)) }));
   if (!data?.token) throw new Error();
 
   const url = params.urlTemplate.replace('$TOKEN', data.token);

diff --git a/server/src/ics/functions.ts b/server/src/ics/functions.ts
@@ -115,7 +115,7 @@ async function makeICS() {
     event.uid = `${stay.id}@elmpoint.org`;
     event.summary = stay.title;
     event.startDate = getICALTime(stay.dateStart);
-    event.endDate = getICALTime(stay.dateEnd);
+    event.endDate = getICALTime(stay.dateEnd, /* plusOne = */ true);
     event.description = stay.description + autoDescription(stay);
     if (stay.reservations.length && stay.reservations[0].room) {
       const room = stay.reservations[0].room;
@@ -166,8 +166,9 @@ function roomText(room: ICSRoom) {
     : `${room?.text}`;
 }
 
-function getICALTime(ts: number) {
-  const d = dateTSObject(ts).add(1, 'day');
+function getICALTime(ts: number, plusOne?: boolean) {
+  let d = dateTSObject(ts);
+  if (plusOne) d = d.add(1, 'day');
   return new ical.Time({
     isDate: true,
     year: d.year(),