fix: fix issue with totp on 2FAS

Longridge-High-School · Oct 21, 2024 · df68abf · df68abf
1 parent 5ef0442
commit df68abf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/app/routes/app.user.totp.tsx b/app/routes/app.user.totp.tsx
@@ -38,8 +38,9 @@ export const loader = async ({request}: LoaderFunctionArgs) => {
   const genTotp = await generateTOTP()
   const otpUri = getTOTPAuthUri({
     ...genTotp,
+    algorithm: 'SHA1',
     accountName: totp.email,
-    issuer: 'Net Doc'
+    issuer: 'Net-Doc'
   })
   const dataURL = await toDataURL(otpUri)
 

diff --git a/app/routes/app_.login.tsx b/app/routes/app_.login.tsx
@@ -81,14 +81,15 @@ export const action = async ({request}: ActionFunctionArgs) => {
   }
 
   if (user.totpSecret !== '' && otp !== null) {
-    const result =
-      (await verifyTOTP({
-        otp,
-        secret: user.totpSecret,
-        algorithm: user.totpAlgorithm === 'SHA1' ? 'SHA-1' : user.totpAlgorithm,
-        digits: user.totpDigits,
-        period: user.totpPeriod
-      })) !== null
+    const opts = {
+      otp,
+      secret: user.totpSecret,
+      algorithm: user.totpAlgorithm === 'SHA1' ? 'SHA-1' : user.totpAlgorithm,
+      digits: user.totpDigits,
+      period: user.totpPeriod
+    }
+
+    const result = (await verifyTOTP(opts)) !== null
 
     if (!result) {
       return json(