@cauth/express 0.0.2 → 0.0.4

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import "./express-BgF1jv36.js";
-import * as express0 from "express";
+import { NextFunction, Request, Response } from "express";
 import z$1, { z } from "zod";
 import ms from "ms";
 
@@ -127,7 +127,7 @@ interface DatabaseContract {
 //#region ../core/src/types/config.t.d.ts
 declare const CAuthOptionsSchema: z$1.ZodObject<{
   dbContractor: z$1.ZodCustom<DatabaseContract, DatabaseContract>;
-  routeContractor: z$1.ZodCustom<RoutesContract, RoutesContract>;
+  routeContractor: z$1.ZodCustom<RoutesContract<(...args: any[]) => any>, RoutesContract<(...args: any[]) => any>>;
   roles: z$1.ZodArray<z$1.ZodString>;
   jwtConfig: z$1.ZodObject<{
     refreshTokenSecret: z$1.ZodString;
@@ -176,55 +176,44 @@ declare const ChangePasswordSchema: z.ZodObject<{
 type ChangePasswordSchemaType = z.infer<typeof ChangePasswordSchema>;
 //#endregion
 //#region ../core/src/cauth.d.ts
-declare class _CAuth<T extends string[]> {
+declare class _CAuth<T extends string[], TContractor extends RoutesContract<any> = RoutesContract<any>> {
   #private;
   constructor(config: Omit<CAuthOptions, 'roles'> & {
     roles: T;
+    routeContractor: TContractor;
   });
   get RoleType(): T[number];
   /**
-   * @description Authentication Guard Middleware. Include 'roles' for a custom auth guard.
-   *
-   * If 'roles' is empty it allows all authenticated users, without respecting specific role
-   *
-   * @default undefined
+   * @description Auth guard middleware — roles optional.
+   * Automatically typed as the handler type from the contractor (e.g. Express.RequestHandler).
+   */
+  Guard: (roles?: Array<T[number]>) => (...args: any[]) => any;
+  /**
+   * Route Handlers — typed from the contractor automatically.
    */
-  Guard: (roles?: Array<T[number]>) => any;
   Routes: {
-    Register: () => any;
-    Login: () => any;
-    Logout: () => any;
-    Refresh: () => any;
-    ChangePassword: (userId: string) => any;
+    Register: () => ReturnType<TContractor["Register"]>;
+    Login: () => ReturnType<TContractor["Login"]>;
+    Logout: () => ReturnType<TContractor["Logout"]>;
+    Refresh: () => ReturnType<TContractor["Refresh"]>;
+    ChangePassword: (userId: string) => ReturnType<TContractor["ChangePassword"]>;
   };
   FN: {
-    Login: ({
-      ...args
-    }: LoginSchemaType) => Promise<Result$1<{
+    Login: (args: LoginSchemaType) => Promise<Result$1<{
       account: Account;
       tokens: Tokens;
     }>>;
-    Register: ({
-      ...args
-    }: RegisterSchemaType) => Promise<Result<{
+    Register: (args: RegisterSchemaType) => Promise<Result<{
       account: Account;
       tokens: Tokens;
     }>>;
-    Logout: ({
-      ...args
-    }: LogoutSchemaType) => Promise<Result<any>>;
-    Refresh: ({
-      ...args
-    }: RefreshTokenSchemaType) => Promise<Result$1<{
+    Logout: (args: LogoutSchemaType) => Promise<Result<any>>;
+    Refresh: (args: RefreshTokenSchemaType) => Promise<Result$1<{
       account: Account;
       tokens: Tokens;
     }>>;
-    ChangePassword: ({
-      ...args
-    }: ChangePasswordSchemaType) => Promise<Result<unknown>>;
-    RequestOTPCode: ({
-      ...args
-    }: Omit<LoginSchemaType, "password"> & {
+    ChangePassword: (args: ChangePasswordSchemaType) => Promise<Result<unknown>>;
+    RequestOTPCode: (args: Omit<LoginSchemaType, "password"> & {
       password?: string;
       usePassword?: boolean;
       otpPurpose: OtpPurpose;
@@ -232,17 +221,13 @@ declare class _CAuth<T extends string[]> {
       id: string;
       code: string;
     }>>;
-    LoginWithOTP: ({
-      ...args
-    }: Omit<LoginSchemaType, "password"> & {
+    LoginWithOTP: (args: Omit<LoginSchemaType, "password"> & {
       code: string;
     }) => Promise<Result<{
       account: Account;
       tokens: Tokens;
     }>>;
-    VerifyOTP: ({
-      ...args
-    }: {
+    VerifyOTP: (args: {
       id: string;
       code: string;
       otpPurpose: OtpPurpose;
@@ -257,8 +242,8 @@ declare class _CAuth<T extends string[]> {
       accessToken: string;
       refreshToken: string;
     }>;
-    VerifyRefreshToken: <T_1>(token: any) => Promise<T_1 | null>;
-    VerifyAccessToken: <T_1>(token: any) => Promise<T_1 | null>;
+    VerifyRefreshToken: <R>(token: any) => Promise<R | null>;
+    VerifyAccessToken: <R>(token: any) => Promise<R | null>;
   };
 }
 //#endregion
@@ -272,59 +257,64 @@ type AuthGuardDeps = {
   tokens: _CAuth<any>['Tokens'];
   roles?: Array<string>;
 };
-interface RoutesContract {
+/**
+ * Generic RoutesContract
+ * THandler is generic, defaults to any function
+ */
+interface RoutesContract<THandler extends (...args: any[]) => any = (...args: any[]) => any> {
   Login({
     ...config
-  }: RouteDeps): any;
+  }: RouteDeps): THandler;
   Register({
     ...config
-  }: RouteDeps): any;
+  }: RouteDeps): THandler;
   Logout({
     ...config
-  }: RouteDeps): any;
+  }: RouteDeps): THandler;
   Guard({
     ...config
-  }: AuthGuardDeps): any;
+  }: AuthGuardDeps): THandler;
   Refresh({
     ...config
-  }: AuthGuardDeps): any;
+  }: AuthGuardDeps): THandler;
   ChangePassword({
     ...config
   }: RouteDeps & {
     userId: string;
-  }): any;
+  }): THandler;
 }
 //#endregion
 //#region src/express.contractor.d.ts
-declare class ExpressContractor implements RoutesContract {
+type OptionalNextHandler = (req: Request, res: Response, next?: NextFunction) => any;
+declare class ExpressContractor<THandler extends (...args: any[]) => any = OptionalNextHandler> implements RoutesContract<THandler> {
   Register: ({
     config,
     tokens
-  }: RouteDeps) => (req: express0.Request, res: express0.Response) => Promise<express0.Response<any, Record<string, any>>>;
+  }: RouteDeps) => THandler;
   Login: ({
     config,
     tokens
-  }: RouteDeps) => (req: express0.Request, res: express0.Response) => Promise<express0.Response<any, Record<string, any>>>;
+  }: RouteDeps) => THandler;
   Logout: ({
     config,
     tokens
-  }: RouteDeps) => (req: express0.Request, res: express0.Response) => Promise<express0.Response<any, Record<string, any>>>;
+  }: RouteDeps) => THandler;
   Refresh: ({
     config,
     tokens
-  }: RouteDeps) => (req: express0.Request, res: express0.Response) => Promise<express0.Response<any, Record<string, any>>>;
+  }: RouteDeps) => THandler;
   ChangePassword: ({
     config,
     tokens,
     userId
   }: RouteDeps & {
     userId: string;
-  }) => (req: express0.Request, res: express0.Response) => Promise<express0.Response<any, Record<string, any>>>;
+  }) => THandler;
   Guard: ({
     config,
     tokens,
     roles
-  }: AuthGuardDeps) => (req: express0.Request, res: express0.Response, next: express0.NextFunction) => Promise<void | express0.Response<any, Record<string, any>>>;
+  }: AuthGuardDeps) => THandler;
 }
 //#endregion
 export { ExpressContractor };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cauth/express",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",