@factiii/auth 0.5.1 → 0.5.3

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-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';
+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';
 
 //# 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, {
-                    username: string;
                     email: string;
+                    username: string;
                     password: string;
                 }, {
-                    username: string;
                     email: string;
+                    username: 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, {
-                    username: string;
                     email: string;
+                    username: string;
                     password: string;
                 }, {
-                    username: string;
                     email: string;
+                    username: string;
                     password: string;
                 }>>["in"] ? T_7 extends _trpc_server.TRPCUnsetMarker ? void : T_7 : never : never;
                 output: {
@@ -754,6 +754,7 @@ declare function createAuthRouter<TExtensions extends SchemaExtensions = {}>(con
                 output: {
                     success: boolean;
                     requires2FA: boolean;
+                    userId: number;
                     user?: undefined;
                 } | {
                     success: boolean;
@@ -763,6 +764,7 @@ declare function createAuthRouter<TExtensions extends SchemaExtensions = {}>(con
                         username: string;
                     };
                     requires2FA?: undefined;
+                    userId?: 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-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';
+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';
 
 //# 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, {
-                    username: string;
                     email: string;
+                    username: string;
                     password: string;
                 }, {
-                    username: string;
                     email: string;
+                    username: 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, {
-                    username: string;
                     email: string;
+                    username: string;
                     password: string;
                 }, {
-                    username: string;
                     email: string;
+                    username: string;
                     password: string;
                 }>>["in"] ? T_7 extends _trpc_server.TRPCUnsetMarker ? void : T_7 : never : never;
                 output: {
@@ -754,6 +754,7 @@ declare function createAuthRouter<TExtensions extends SchemaExtensions = {}>(con
                 output: {
                     success: boolean;
                     requires2FA: boolean;
+                    userId: number;
                     user?: undefined;
                 } | {
                     success: boolean;
@@ -763,6 +764,7 @@ declare function createAuthRouter<TExtensions extends SchemaExtensions = {}>(con
                         username: string;
                     };
                     requires2FA?: undefined;
+                    userId?: undefined;
                 };
                 meta: Meta;
             }>;

package/dist/index.js

@@ -890,7 +890,8 @@ var BaseProcedureFactory = class {
         if (!code) {
           return {
             success: false,
-            requires2FA: true
+            requires2FA: true,
+            userId: user.id
           };
         }
         let validCode = false;
@@ -1169,14 +1170,15 @@ var BaseProcedureFactory = class {
         data: { password: hashedPassword }
       });
       await this.config.prisma.passwordReset.delete({ where: { id: token } });
-      const sessionsToDelete = await this.config.prisma.session.findMany({
-        where: { userId: passwordReset.userId },
+      const sessionsToRevoke = await this.config.prisma.session.findMany({
+        where: { userId: passwordReset.userId, revokedAt: null },
         select: { id: true, socketId: true, userId: true }
       });
-      await this.config.prisma.session.deleteMany({
-        where: { userId: passwordReset.userId }
+      await this.config.prisma.session.updateMany({
+        where: { userId: passwordReset.userId, revokedAt: null },
+        data: { revokedAt: /* @__PURE__ */ new Date() }
       });
-      for (const session of sessionsToDelete) {
+      for (const session of sessionsToRevoke) {
         if (this.config.hooks?.onSessionRevoked) {
           await this.config.hooks.onSessionRevoked(
             session.id,

package/dist/index.mjs

@@ -756,7 +756,8 @@ var BaseProcedureFactory = class {
         if (!code) {
           return {
             success: false,
-            requires2FA: true
+            requires2FA: true,
+            userId: user.id
           };
         }
         let validCode = false;
@@ -1035,14 +1036,15 @@ var BaseProcedureFactory = class {
         data: { password: hashedPassword }
       });
       await this.config.prisma.passwordReset.delete({ where: { id: token } });
-      const sessionsToDelete = await this.config.prisma.session.findMany({
-        where: { userId: passwordReset.userId },
+      const sessionsToRevoke = await this.config.prisma.session.findMany({
+        where: { userId: passwordReset.userId, revokedAt: null },
         select: { id: true, socketId: true, userId: true }
       });
-      await this.config.prisma.session.deleteMany({
-        where: { userId: passwordReset.userId }
+      await this.config.prisma.session.updateMany({
+        where: { userId: passwordReset.userId, revokedAt: null },
+        data: { revokedAt: /* @__PURE__ */ new Date() }
       });
-      for (const session of sessionsToDelete) {
+      for (const session of sessionsToRevoke) {
         if (this.config.hooks?.onSessionRevoked) {
           await this.config.hooks.onSessionRevoked(
             session.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-yHGJ7C6_.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-BXNxNK4S.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-yHGJ7C6_.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-BXNxNK4S.js';

package/package.json

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

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

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

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

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