@factiii/auth 0.4.0 → 0.5.1

package/dist/index.d.mts

@@ -6,8 +6,8 @@ import { PrismaClient } from '@prisma/client';
 import * as _trpc_server from '@trpc/server';
 import * as zod from 'zod';
 import { CreateHTTPContextOptions } from '@trpc/server/adapters/standalone';
-import { S as SchemaExtensions, A as AuthHooks } from './hooks-BXNxNK4S.mjs';
-export { C as ChangePasswordInput, L as LoginInput, O as OAuthLoginInput, R as ResetPasswordInput, a as SignupInput, T as TwoFaVerifyInput, V as VerifyEmailInput, b as biometricVerifySchema, c as changePasswordSchema, e as endAllSessionsSchema, l as loginSchema, o as oAuthLoginSchema, r as requestPasswordResetSchema, d as resetPasswordSchema, s as signupSchema, t as twoFaResetSchema, f as twoFaVerifySchema, v as verifyEmailSchema } from './hooks-BXNxNK4S.mjs';
+import { S as SchemaExtensions, A as AuthHooks } from './hooks-yHGJ7C6_.mjs';
+export { C as ChangePasswordInput, L as LoginInput, O as OAuthLoginInput, R as ResetPasswordInput, a as SignupInput, T as TwoFaVerifyInput, V as VerifyEmailInput, b as biometricVerifySchema, c as changePasswordSchema, e as endAllSessionsSchema, l as loginSchema, o as oAuthLoginSchema, r as requestPasswordResetSchema, d as resetPasswordSchema, s as signupSchema, t as twoFaResetSchema, f as twoFaVerifySchema, v as verifyEmailSchema } from './hooks-yHGJ7C6_.mjs';
 
 //# sourceMappingURL=TRPCError.d.ts.map
 //#endregion
@@ -659,12 +659,12 @@ declare function createAuthRouter<TExtensions extends SchemaExtensions = {}>(con
                     email: zod.ZodString;
                     password: zod.ZodEffects<zod.ZodString, string, string>;
                 }, "strip", zod.ZodTypeAny, {
-                    email: string;
                     username: string;
+                    email: string;
                     password: string;
                 }, {
-                    email: string;
                     username: string;
+                    email: string;
                     password: string;
                 }>>["in"] extends infer T_7 ? T_7 extends inferParser<[TExtensions["signup"]] extends [zod.AnyZodObject] ? zod.ZodObject<{
                     username: zod.ZodString;
@@ -683,12 +683,12 @@ declare function createAuthRouter<TExtensions extends SchemaExtensions = {}>(con
                     email: zod.ZodString;
                     password: zod.ZodEffects<zod.ZodString, string, string>;
                 }, "strip", zod.ZodTypeAny, {
-                    email: string;
                     username: string;
+                    email: string;
                     password: string;
                 }, {
-                    email: string;
                     username: string;
+                    email: string;
                     password: string;
                 }>>["in"] ? T_7 extends _trpc_server.TRPCUnsetMarker ? void : T_7 : never : never;
                 output: {
@@ -752,12 +752,17 @@ declare function createAuthRouter<TExtensions extends SchemaExtensions = {}>(con
                     code?: string | undefined;
                 }>>["in"] ? T_12 extends _trpc_server.TRPCUnsetMarker ? void : T_12 : never : never;
                 output: {
+                    success: boolean;
+                    requires2FA: boolean;
+                    user?: undefined;
+                } | {
                     success: boolean;
                     user: {
                         id: number;
                         email: string;
                         username: string;
                     };
+                    requires2FA?: undefined;
                 };
                 meta: Meta;
             }>;

package/dist/index.d.ts

@@ -6,8 +6,8 @@ import { PrismaClient } from '@prisma/client';
 import * as _trpc_server from '@trpc/server';
 import * as zod from 'zod';
 import { CreateHTTPContextOptions } from '@trpc/server/adapters/standalone';
-import { S as SchemaExtensions, A as AuthHooks } from './hooks-BXNxNK4S.js';
-export { C as ChangePasswordInput, L as LoginInput, O as OAuthLoginInput, R as ResetPasswordInput, a as SignupInput, T as TwoFaVerifyInput, V as VerifyEmailInput, b as biometricVerifySchema, c as changePasswordSchema, e as endAllSessionsSchema, l as loginSchema, o as oAuthLoginSchema, r as requestPasswordResetSchema, d as resetPasswordSchema, s as signupSchema, t as twoFaResetSchema, f as twoFaVerifySchema, v as verifyEmailSchema } from './hooks-BXNxNK4S.js';
+import { S as SchemaExtensions, A as AuthHooks } from './hooks-yHGJ7C6_.js';
+export { C as ChangePasswordInput, L as LoginInput, O as OAuthLoginInput, R as ResetPasswordInput, a as SignupInput, T as TwoFaVerifyInput, V as VerifyEmailInput, b as biometricVerifySchema, c as changePasswordSchema, e as endAllSessionsSchema, l as loginSchema, o as oAuthLoginSchema, r as requestPasswordResetSchema, d as resetPasswordSchema, s as signupSchema, t as twoFaResetSchema, f as twoFaVerifySchema, v as verifyEmailSchema } from './hooks-yHGJ7C6_.js';
 
 //# sourceMappingURL=TRPCError.d.ts.map
 //#endregion
@@ -659,12 +659,12 @@ declare function createAuthRouter<TExtensions extends SchemaExtensions = {}>(con
                     email: zod.ZodString;
                     password: zod.ZodEffects<zod.ZodString, string, string>;
                 }, "strip", zod.ZodTypeAny, {
-                    email: string;
                     username: string;
+                    email: string;
                     password: string;
                 }, {
-                    email: string;
                     username: string;
+                    email: string;
                     password: string;
                 }>>["in"] extends infer T_7 ? T_7 extends inferParser<[TExtensions["signup"]] extends [zod.AnyZodObject] ? zod.ZodObject<{
                     username: zod.ZodString;
@@ -683,12 +683,12 @@ declare function createAuthRouter<TExtensions extends SchemaExtensions = {}>(con
                     email: zod.ZodString;
                     password: zod.ZodEffects<zod.ZodString, string, string>;
                 }, "strip", zod.ZodTypeAny, {
-                    email: string;
                     username: string;
+                    email: string;
                     password: string;
                 }, {
-                    email: string;
                     username: string;
+                    email: string;
                     password: string;
                 }>>["in"] ? T_7 extends _trpc_server.TRPCUnsetMarker ? void : T_7 : never : never;
                 output: {
@@ -752,12 +752,17 @@ declare function createAuthRouter<TExtensions extends SchemaExtensions = {}>(con
                     code?: string | undefined;
                 }>>["in"] ? T_12 extends _trpc_server.TRPCUnsetMarker ? void : T_12 : never : never;
                 output: {
+                    success: boolean;
+                    requires2FA: boolean;
+                    user?: undefined;
+                } | {
                     success: boolean;
                     user: {
                         id: number;
                         email: string;
                         username: string;
                     };
+                    requires2FA?: undefined;
                 };
                 meta: Meta;
             }>;

package/dist/index.js

@@ -888,10 +888,10 @@ var BaseProcedureFactory = class {
       }
       if (user.twoFaEnabled && this.config.features?.twoFa) {
         if (!code) {
-          throw new import_server2.TRPCError({
-            code: "FORBIDDEN",
-            message: "2FA code required."
-          });
+          return {
+            success: false,
+            requires2FA: true
+          };
         }
         let validCode = false;
         const secrets = await this.config.prisma.session.findMany({
@@ -905,13 +905,13 @@ var BaseProcedureFactory = class {
           }
         }
         if (!validCode) {
-          const checkOTP = await this.config.prisma.oTP.findUnique({
-            where: { userId: user.id }
+          const checkOTP = await this.config.prisma.oTP.findFirst({
+            where: { userId: user.id, code: Number(code), expiresAt: { gte: /* @__PURE__ */ new Date() } }
           });
-          if (checkOTP && checkOTP.code === Number(code) && checkOTP.expiredAt >= /* @__PURE__ */ new Date()) {
+          if (checkOTP) {
             validCode = true;
             await this.config.prisma.oTP.delete({
-              where: { userId: user.id }
+              where: { id: checkOTP.id }
             });
           }
         }
@@ -1169,10 +1169,22 @@ var BaseProcedureFactory = class {
         data: { password: hashedPassword }
       });
       await this.config.prisma.passwordReset.delete({ where: { id: token } });
-      await this.config.prisma.session.updateMany({
+      const sessionsToDelete = await this.config.prisma.session.findMany({
         where: { userId: passwordReset.userId },
-        data: { revokedAt: /* @__PURE__ */ new Date() }
+        select: { id: true, socketId: true, userId: true }
+      });
+      await this.config.prisma.session.deleteMany({
+        where: { userId: passwordReset.userId }
       });
+      for (const session of sessionsToDelete) {
+        if (this.config.hooks?.onSessionRevoked) {
+          await this.config.hooks.onSessionRevoked(
+            session.id,
+            session.socketId,
+            "Password reset"
+          );
+        }
+      }
       return { message: "Password updated. Please log in with your new password." };
     });
   }
@@ -1670,11 +1682,9 @@ var TwoFaProcedureFactory = class {
         throw new import_server6.TRPCError({ code: "FORBIDDEN", message: "Invalid credentials." });
       }
       const otp = generateOtp();
-      const expiredAt = new Date(Date.now() + this.config.tokenSettings.otpValidityMs);
-      await this.config.prisma.oTP.upsert({
-        where: { userId: user.id },
-        update: { code: otp, expiredAt },
-        create: { userId: user.id, code: otp, expiredAt }
+      const expiresAt = new Date(Date.now() + this.config.tokenSettings.otpValidityMs);
+      await this.config.prisma.oTP.create({
+        data: { userId: user.id, code: otp, expiresAt }
       });
       if (this.config.emailService) {
         await this.config.emailService.sendOTPEmail(user.email, otp);
@@ -1693,14 +1703,14 @@ var TwoFaProcedureFactory = class {
       if (!user) {
         throw new import_server6.TRPCError({ code: "NOT_FOUND", message: "User not found" });
       }
-      const otp = await this.config.prisma.oTP.findUnique({
-        where: { userId: user.id }
+      const otp = await this.config.prisma.oTP.findFirst({
+        where: { userId: user.id, code, expiresAt: { gte: /* @__PURE__ */ new Date() } }
       });
-      if (!otp || otp.code !== code || otp.expiredAt < /* @__PURE__ */ new Date()) {
+      if (!otp) {
         throw new import_server6.TRPCError({ code: "FORBIDDEN", message: "Invalid or expired OTP" });
       }
       await this.config.prisma.oTP.delete({
-        where: { userId: user.id }
+        where: { id: otp.id }
       });
       await this.config.prisma.user.update({
         where: { id: user.id },

package/dist/index.mjs

@@ -754,10 +754,10 @@ var BaseProcedureFactory = class {
       }
       if (user.twoFaEnabled && this.config.features?.twoFa) {
         if (!code) {
-          throw new TRPCError2({
-            code: "FORBIDDEN",
-            message: "2FA code required."
-          });
+          return {
+            success: false,
+            requires2FA: true
+          };
         }
         let validCode = false;
         const secrets = await this.config.prisma.session.findMany({
@@ -771,13 +771,13 @@ var BaseProcedureFactory = class {
           }
         }
         if (!validCode) {
-          const checkOTP = await this.config.prisma.oTP.findUnique({
-            where: { userId: user.id }
+          const checkOTP = await this.config.prisma.oTP.findFirst({
+            where: { userId: user.id, code: Number(code), expiresAt: { gte: /* @__PURE__ */ new Date() } }
           });
-          if (checkOTP && checkOTP.code === Number(code) && checkOTP.expiredAt >= /* @__PURE__ */ new Date()) {
+          if (checkOTP) {
             validCode = true;
             await this.config.prisma.oTP.delete({
-              where: { userId: user.id }
+              where: { id: checkOTP.id }
             });
           }
         }
@@ -1035,10 +1035,22 @@ var BaseProcedureFactory = class {
         data: { password: hashedPassword }
       });
       await this.config.prisma.passwordReset.delete({ where: { id: token } });
-      await this.config.prisma.session.updateMany({
+      const sessionsToDelete = await this.config.prisma.session.findMany({
         where: { userId: passwordReset.userId },
-        data: { revokedAt: /* @__PURE__ */ new Date() }
+        select: { id: true, socketId: true, userId: true }
+      });
+      await this.config.prisma.session.deleteMany({
+        where: { userId: passwordReset.userId }
       });
+      for (const session of sessionsToDelete) {
+        if (this.config.hooks?.onSessionRevoked) {
+          await this.config.hooks.onSessionRevoked(
+            session.id,
+            session.socketId,
+            "Password reset"
+          );
+        }
+      }
       return { message: "Password updated. Please log in with your new password." };
     });
   }
@@ -1536,11 +1548,9 @@ var TwoFaProcedureFactory = class {
         throw new TRPCError6({ code: "FORBIDDEN", message: "Invalid credentials." });
       }
       const otp = generateOtp();
-      const expiredAt = new Date(Date.now() + this.config.tokenSettings.otpValidityMs);
-      await this.config.prisma.oTP.upsert({
-        where: { userId: user.id },
-        update: { code: otp, expiredAt },
-        create: { userId: user.id, code: otp, expiredAt }
+      const expiresAt = new Date(Date.now() + this.config.tokenSettings.otpValidityMs);
+      await this.config.prisma.oTP.create({
+        data: { userId: user.id, code: otp, expiresAt }
       });
       if (this.config.emailService) {
         await this.config.emailService.sendOTPEmail(user.email, otp);
@@ -1559,14 +1569,14 @@ var TwoFaProcedureFactory = class {
       if (!user) {
         throw new TRPCError6({ code: "NOT_FOUND", message: "User not found" });
       }
-      const otp = await this.config.prisma.oTP.findUnique({
-        where: { userId: user.id }
+      const otp = await this.config.prisma.oTP.findFirst({
+        where: { userId: user.id, code, expiresAt: { gte: /* @__PURE__ */ new Date() } }
       });
-      if (!otp || otp.code !== code || otp.expiredAt < /* @__PURE__ */ new Date()) {
+      if (!otp) {
         throw new TRPCError6({ code: "FORBIDDEN", message: "Invalid or expired OTP" });
       }
       await this.config.prisma.oTP.delete({
-        where: { userId: user.id }
+        where: { id: otp.id }
       });
       await this.config.prisma.user.update({
         where: { id: user.id },

package/dist/validators.d.mts

@@ -1,2 +1,2 @@
 import 'zod';
-export { g as AuthSchemas, C as ChangePasswordInput, h as CreatedSchemas, L as LoginInput, i as LoginSchemaInput, O as OAuthLoginInput, j as OAuthSchemaInput, R as ResetPasswordInput, a as SignupInput, k as SignupSchemaInput, T as TwoFaVerifyInput, V as VerifyEmailInput, b as biometricVerifySchema, c as changePasswordSchema, m as checkPasswordResetSchema, n as createSchemas, p as deregisterPushTokenSchema, q as disableTwofaSchema, e as endAllSessionsSchema, u as getTwofaSecretSchema, l as loginSchema, o as oAuthLoginSchema, w as registerPushTokenSchema, r as requestPasswordResetSchema, d as resetPasswordSchema, s as signupSchema, t as twoFaResetSchema, x as twoFaResetVerifySchema, f as twoFaVerifySchema, v as verifyEmailSchema } from './hooks-BXNxNK4S.mjs';
+export { g as AuthSchemas, C as ChangePasswordInput, h as CreatedSchemas, L as LoginInput, i as LoginSchemaInput, O as OAuthLoginInput, j as OAuthSchemaInput, R as ResetPasswordInput, a as SignupInput, k as SignupSchemaInput, T as TwoFaVerifyInput, V as VerifyEmailInput, b as biometricVerifySchema, c as changePasswordSchema, m as checkPasswordResetSchema, n as createSchemas, p as deregisterPushTokenSchema, q as disableTwofaSchema, e as endAllSessionsSchema, u as getTwofaSecretSchema, l as loginSchema, o as oAuthLoginSchema, w as registerPushTokenSchema, r as requestPasswordResetSchema, d as resetPasswordSchema, s as signupSchema, t as twoFaResetSchema, x as twoFaResetVerifySchema, f as twoFaVerifySchema, v as verifyEmailSchema } from './hooks-yHGJ7C6_.mjs';

package/dist/validators.d.ts

@@ -1,2 +1,2 @@
 import 'zod';
-export { g as AuthSchemas, C as ChangePasswordInput, h as CreatedSchemas, L as LoginInput, i as LoginSchemaInput, O as OAuthLoginInput, j as OAuthSchemaInput, R as ResetPasswordInput, a as SignupInput, k as SignupSchemaInput, T as TwoFaVerifyInput, V as VerifyEmailInput, b as biometricVerifySchema, c as changePasswordSchema, m as checkPasswordResetSchema, n as createSchemas, p as deregisterPushTokenSchema, q as disableTwofaSchema, e as endAllSessionsSchema, u as getTwofaSecretSchema, l as loginSchema, o as oAuthLoginSchema, w as registerPushTokenSchema, r as requestPasswordResetSchema, d as resetPasswordSchema, s as signupSchema, t as twoFaResetSchema, x as twoFaResetVerifySchema, f as twoFaVerifySchema, v as verifyEmailSchema } from './hooks-BXNxNK4S.js';
+export { g as AuthSchemas, C as ChangePasswordInput, h as CreatedSchemas, L as LoginInput, i as LoginSchemaInput, O as OAuthLoginInput, j as OAuthSchemaInput, R as ResetPasswordInput, a as SignupInput, k as SignupSchemaInput, T as TwoFaVerifyInput, V as VerifyEmailInput, b as biometricVerifySchema, c as changePasswordSchema, m as checkPasswordResetSchema, n as createSchemas, p as deregisterPushTokenSchema, q as disableTwofaSchema, e as endAllSessionsSchema, u as getTwofaSecretSchema, l as loginSchema, o as oAuthLoginSchema, w as registerPushTokenSchema, r as requestPasswordResetSchema, d as resetPasswordSchema, s as signupSchema, t as twoFaResetSchema, x as twoFaResetVerifySchema, f as twoFaVerifySchema, v as verifyEmailSchema } from './hooks-yHGJ7C6_.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@factiii/auth",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "publishConfig": {
     "access": "public"
   },

package/prisma/schema.prisma

@@ -116,11 +116,13 @@ model PasswordReset {
 // ==============================================================================
 
 model OTP {
+  id        Int      @id @default(autoincrement())
   code      Int
-  expiredAt DateTime
-  userId    Int      @unique
+  expiresAt DateTime
+  userId    Int
   user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
 
+  @@index([userId])
 }
 
 // ==============================================================================

package/dist/{hooks-BXNxNK4S.d.mts → hooks-yHGJ7C6_.d.mts}

@@ -8,12 +8,12 @@ declare const signupSchema: z.ZodObject<{
     email: z.ZodString;
     password: z.ZodEffects<z.ZodString, string, string>;
 }, "strip", z.ZodTypeAny, {
-    email: string;
     username: string;
+    email: string;
     password: string;
 }, {
-    email: string;
     username: string;
+    email: string;
     password: string;
 }>;
 /**

package/dist/{hooks-BXNxNK4S.d.ts → hooks-yHGJ7C6_.d.ts}

@@ -8,12 +8,12 @@ declare const signupSchema: z.ZodObject<{
     email: z.ZodString;
     password: z.ZodEffects<z.ZodString, string, string>;
 }, "strip", z.ZodTypeAny, {
-    email: string;
     username: string;
+    email: string;
     password: string;
 }, {
-    email: string;
     username: string;
+    email: string;
     password: string;
 }>;
 /**