Update jwt otp deta

handlers.js

@@ -1,8 +1,7 @@
-const jwt = require('jsonwebtoken')
-const { totp } = require('otplib')
-const { v4: uuidv4 } = require('uuid')
+import jwt from '@tsndr/cloudflare-worker-jwt'
+const { generateOTP, verifyOTP } = require('./modules/otp.js');
 
-totp.options = { step: 60 * 5 } // 5 minutes for the OTPs
+const { v4: uuidv4 } = require('uuid')
 
 const { HTTPError, respondError, respondJSON } = require('./modules/utils')
 const {
@@ -490,6 +489,7 @@ module.exports.addUserToAdmin = async ({
     }
 
     await addUserToAdmin({ team, user: kvUser })
+
 
     return respondJSON({ payload: { key: kvUser.key } })
   } catch (err) {
@@ -572,85 +572,92 @@ module.exports.getEnv = async ({ user, query }) => {
   }
 }
 
-// Auth handlers
 module.exports.getOTP = async ({ query, url, headers, cf = {} }) => {
-  const { user, origin } = query // user is email
-  if (!user || !EMAIL_REGEXP.test(user)) {
-    return respondError(new HTTPError('User email not supplied', 400))
-  }
-  let u = await fetchUser(user)
-  if (!u) {
-    u = await createUser(user)
-  } else if (!u.otp_secret) {
-    // legacy user without otp_secret
-    u.otp_secret = uuidv4()
-    if (u.otp_secret === u.jwt_uuid) {
-      // Note: this shouldn't happen anyway
-      throw new Error('OTP secret and JWT UUID are the same')
-    }
-    u.updated = new Date()
-    await updateUser(u)
+  try {
+    const { user, origin } = query
+    if (!user || !EMAIL_REGEXP.test(user)) {
+      throw new HTTPError('User email not supplied', 400)
+    }
+    let u = await fetchUser(user)
+    if (!u) {
+      u = await createUser(user)
+    } else if (!u.otp_secret) {
+      u.otp_secret = uuidv4()
+      if (u.otp_secret === u.jwt_uuid) {
+        throw new Error('OTP secret and JWT UUID are the same')
+      }
+      u.updated = new Date()
+      await updateUser(u)
+    }
+    let otp;
+    otp = await generateOTP(u.otp_secret);
+    const timeRemaining = 30 - (Math.floor(Date.now() / 1000) % 30);
+    const expiresAt = new Date(Date.now() + timeRemaining * 1000);
+    const { origin: _origin } = new URL(url)
+    const defaultOrigin = `${_origin}/login`
+    const locale = (headers.get('Accept-Language') || '').split(',')[0] || 'en'
+    const timeZone = cf.timezone || 'UTC'
+    const plainEmail = [
+      `OTP: ${otp}`,
+      `Magic-Link: ${origin || defaultOrigin}?user=${user}&otp=${otp}`,
+      `Expires at: ${expiresAt.toLocaleString(locale, {
+        timeZone,
+        timeZoneName: 'long',
+      })}`,
+    ].join('\n')
+    await fetch('https://api.sendgrid.com/v3/mail/send', {
+      method: 'POST',
+      headers: {
+        authorization: `Bearer ${MAIL_PASS}`,
+        'content-type': 'application/json',
+      },
+      body: JSON.stringify({
+        personalizations: [{ to: [{ email: u.email }] }],
+        from: { email: 'dev@mindswire.com' },
+        subject: 'Portunus Login OTP/Magic-Link',
+        content: [
+          {
+            type: 'text/plain',
+            value: plainEmail,
+          },
+        ],
+      }),
+    })
+    return respondJSON({ payload: { message: `OTP/Magic-Link sent to ${user}` } })
+  } catch (error) {
+    console.error("Error in getOTP: ", error);
+    throw error;
   }
-  // Use time-based OTP to avoid storing them in deta/KV
-  const otp = totp.generate(u.otp_secret)
-  const expiresAt = new Date(Date.now() + totp.timeRemaining() * 1000)
-  // TODO: tricky for local dev as the origin is mapped to remote cloudflare worker
-  const { origin: _origin } = new URL(url)
-  const defaultOrigin = `${_origin}/login`
-  // obtain locale and timezone from request for email `expiresAt` formatting
-  const locale = (headers.get('Accept-Language') || '').split(',')[0] || 'en'
-  const timeZone = cf.timezone || 'UTC'
-  // send email with OTP
-  // TODO: need to manually remove sendgrid tracking https://app.sendgrid.com/settings/tracking
-  // TODO: need to programmatically turn it off always https://stackoverflow.com/a/63360103/158111
-  // TODO: setup own SMTP server (mailu) or AWS SES for much cheaper delivery
-  const plainEmail = [
-    `OTP: ${otp}`,
-    `Magic-Link: ${origin || defaultOrigin}?user=${user}&otp=${otp}`,
-    `Expires at: ${expiresAt.toLocaleString(locale, {
-      timeZone,
-      timeZoneName: 'long',
-    })}`,
-  ].join('\n')
-  await fetch('https://api.sendgrid.com/v3/mail/send', {
-    method: 'POST',
-    headers: {
-      authorization: `Bearer ${MAIL_PASS}`,
-      'content-type': 'application/json',
-    },
-    body: JSON.stringify({
-      personalizations: [{ to: [{ email: u.email }] }],
-      from: { email: 'dev@mindswire.com' },
-      subject: 'Portunus Login OTP/Magic-Link',
-      content: [
-        {
-          type: 'text/plain',
-          value: plainEmail,
-        },
-      ],
-    }),
-  })
-  return respondJSON({ payload: { message: `OTP/Magic-Link sent to ${user}` } })
 }
 
 module.exports.login = async ({ query }) => {
-  const { user, otp } = query
-  if (!user || !otp) {
-    return respondError(new HTTPError('User or OTP not supplied', 400))
-  }
-  const { email, jwt_uuid, otp_secret } = (await fetchUser(user)) || {
-    teams: [],
-  }
-  if (!email || !otp_secret) {
-    return respondError(new HTTPError(`${user} not found`, 404))
-  }
-  const isValid = totp.verify({ secret: otp_secret, token: otp })
-  if (!isValid) {
-    return respondError(new HTTPError('Invalid OTP', 403))
+  try {
+    const { user, otp } = query;
+    if (!user || !otp) {
+      return respondError(new HTTPError('User or OTP not supplied', 400));
+    }
+    const { email, jwt_uuid, otp_secret } = (await fetchUser(user)) || {
+      teams: [],
+    };
+    if (!email || !otp_secret) {
+      return respondError(new HTTPError(`${user} not found`, 404));
+    }
+
+    const isValid = await VERIFYOTP(otp, otp_secret);
+    if (!isValid) {
+      return respondError(new HTTPError('Invalid OTP', 403));
+    }
+
+    try {
+      const token = await jwt.sign({ email, jwt_uuid }, TOKEN_SECRET);
+      return respondJSON({ payload: { jwt: token } });
+    } catch (err) {
+      return respondError(new HTTPError('JWT token generation failed', 500));
+    }
+  } catch (err) {
+    return respondError(new HTTPError('Internal server error', 500));
   }
-  const token = jwt.sign({ email, jwt_uuid }, TOKEN_SECRET)
-  return respondJSON({ payload: { jwt: token } })
-}
+};
 
 // legacy direct JWT through email
 module.exports.getToken = async ({ query }) => {
@@ -663,7 +670,22 @@ module.exports.getToken = async ({ query }) => {
   //   return respondError(new HTTPError(`${user} not found`, 404))
   // }
 
-  const token = jwt.sign({ email, jwt_uuid }, TOKEN_SECRET)
+  // const token = jwt.sign({ email, jwt_uuid }, TOKEN_SECRET)
+  // const token = await new jose.SignJWT({ email, jwt_uuid }).sign(TOKEN_SECRET)
+  const token = await jwt.sign({ email, jwt_uuid }, TOKEN_SECRET)
+
+  // const sharedSecret = Uint8Array.from(TOKEN_SECRET, c => c.charCodeAt(0))
+  // // Import your TOKEN_SECRET as a key
+  // const key = await importKey(
+  //   sharedSecret,
+  //   { name: 'HMAC', hash: 'SHA-256' },
+  //   'raw',
+  //   ['sign', 'verify']
+  // )
+  // // Create a new SignJWT object
+  // const jwt = new SignJWT({ email, jwt_uuid })
+  // // Sign the JWT with your key
+  // const token = await jwt.sign(key)
 
   try {
     await fetch('https://api.sendgrid.com/v3/mail/send', {

modules/auth.js

@@ -1,30 +1,40 @@
-const jwt = require('jsonwebtoken')
+import jwt from '@tsndr/cloudflare-worker-jwt'
 
 const { HTTPError, respondError } = require('./utils')
 const { getKVUser } = require('./users')
 
-// process.env is not avail in workers, direct access like KV namespaces and secrets
-
-const verifyJWT = (headers) => {
+const verifyJWT = async (headers) => {
   const token = headers.get('portunus-jwt')
   if (!token) {
+    console.error("Error: No portunus-jwt found in headers.")
     throw new HTTPError('Auth requires portunus-jwt', 403)
   }
   let access = {}
   try {
-    access = jwt.verify(token, TOKEN_SECRET)
-  } catch (_) {
+    await jwt.verify(token, TOKEN_SECRET)
+
+    // Decoding token
+    const { payload } = jwt.decode(token)
+    access = payload
+  } catch (error) {
+    console.error("Error: Invalid portunus-jwt.", error)
     throw new HTTPError('Invalid portunus-jwt', 403)
   }
   if (!access.email) {
+    console.error("Error: No email in portunus-jwt.")
     throw new HTTPError('Invalid portunus-jwt: no email', 403)
   }
   return access
 }
 
 const verifyUser = async (access) => {
   const user = await getKVUser(access.email)
+  if (!user) {
+    console.error("Error: No user found with this email.")
+    throw new HTTPError('No user found with this email', 404)
+  }
   if (user.jwt_uuid !== access.jwt_uuid) {
+    console.error("Error: UUID mismatch in portunus-jwt.")
     throw new HTTPError('Invalid portunus-jwt: UUID mismatch', 403)
   }
 
@@ -34,9 +44,10 @@ const verifyUser = async (access) => {
 module.exports.withRequireUser = async (req) => {
   const { headers } = req
   try {
-    const access = verifyJWT(headers)
+    const access = await verifyJWT(headers)
     req.user = await verifyUser(access)
   } catch (err) {
-    return respondError(err)
+    console.error("Error: Failed to verify user.", err)
+    return respondError(req)
   }
 }

modules/db.js

@@ -1,3 +1,3 @@
-const { Deta } = require('deta-worker')
+const { Deta } = require('./deta-worker/index.js')
 
 module.exports = Deta(DETA_KEY)