tsledge 0.1.15 → 0.1.17

package/dist/index.js

@@ -200,10 +200,10 @@ var AuthTokenBlocklistModel = mongoose3.model(
 var FORBIDDEN = 403;
 var UNAUTHORIZED = 401;
 async function jwtRequired(req, res, next) {
-  return validateJwt(req, res, next, JwtSecret);
+  await validateJwt(req, res, next, JwtSecret);
 }
 async function jwtRefreshRequired(req, res, next) {
-  return validateJwt(req, res, next, JwtRefreshSecret);
+  await validateJwt(req, res, next, JwtRefreshSecret);
 }
 async function verifyToken(token, jwtSecret) {
   try {
@@ -341,12 +341,14 @@ async function generateCredentials(auth) {
 async function authRegister(req, res, next) {
   let { identifier = void 0, secret = void 0 } = req.body || {};
   if (!identifier || !secret) {
-    return res.sendStatus(FORBIDDEN2);
+    res.sendStatus(FORBIDDEN2);
+    return;
   }
   identifier = identifier.toLowerCase();
   let user = await AuthUserModel.findOne({ identifier });
   if (user) {
-    return res.sendStatus(BAD_REQUEST);
+    res.sendStatus(BAD_REQUEST);
+    return;
   }
   res.locals.authUser = new AuthUserModel({
     identifier,
@@ -357,23 +359,28 @@ async function authRegister(req, res, next) {
 async function authLogin(req, res, next) {
   let { identifier = void 0, secret = void 0 } = req.body || {};
   if (!identifier || !secret) {
-    return res.sendStatus(FORBIDDEN2);
+    res.sendStatus(FORBIDDEN2);
+    return;
   }
   identifier = identifier.toLowerCase();
   let user = await AuthUserModel.findOne({ identifier }).select("+secretHash");
   if (!user || !user.secretHash) {
-    return res.sendStatus(BAD_REQUEST);
+    res.sendStatus(BAD_REQUEST);
+    return;
   }
   if (user.blockedSince) {
-    return res.sendStatus(FORBIDDEN2);
+    res.sendStatus(FORBIDDEN2);
+    return;
   }
   let isMatch = await bcrypt.compare(secret, user.secretHash);
   if (!isMatch) {
-    return res.sendStatus(BAD_REQUEST);
+    res.sendStatus(BAD_REQUEST);
+    return;
   }
   let credentials = await generateCredentials(user);
   if (!credentials) {
-    return res.sendStatus(BAD_REQUEST);
+    res.sendStatus(BAD_REQUEST);
+    return;
   }
   res.locals.credentials = credentials;
   next();
@@ -382,7 +389,8 @@ async function authLogout(req, res, next) {
   await jwtRefreshRequired(req, res, async () => {
     const refreshToken = res.locals.token;
     if (!refreshToken) {
-      return res.sendStatus(BAD_REQUEST);
+      res.sendStatus(BAD_REQUEST);
+      return;
     }
     const decoded = jwt2.decode(refreshToken);
     const jti = decoded?.jti;
@@ -411,7 +419,8 @@ async function authRefresh(req, res, next) {
   });
   const refreshToken = res.locals.token;
   if (!refreshToken) {
-    return res.sendStatus(BAD_REQUEST);
+    res.sendStatus(BAD_REQUEST);
+    return;
   }
   try {
     const decoded = jwt2.decode(refreshToken);
@@ -438,13 +447,15 @@ async function authRefresh(req, res, next) {
     const payload = jwt2.verify(refreshToken, JwtRefreshSecret);
     let credentials = await generateCredentials(payload);
     if (!credentials) {
-      return res.sendStatus(BAD_REQUEST);
+      res.sendStatus(BAD_REQUEST);
+      return;
     }
     res.locals.credentials = credentials;
     next();
   } catch (err) {
     console.log("[WARN] refreshing JWT:", err);
-    return res.sendStatus(BAD_REQUEST);
+    res.sendStatus(BAD_REQUEST);
+    return;
   }
 }
 

package/dist/middleware/authentication/session.d.ts

@@ -1,4 +1,4 @@
-import express, { Request, Response } from 'express';
+import { Request, Response } from 'express';
 import { JWTCredentials, AuthUserPayload } from './types';
 import { AuthUserDocument } from '../../models';
 declare const router: import("express-serve-static-core").Router;
@@ -14,11 +14,7 @@ export declare function authRegister(req: Request, res: Response & {
     locals: {
         authUser: AuthUserDocument;
     };
-}, next: any): Promise<(express.Response<any, Record<string, any>> & {
-    locals: {
-        authUser: AuthUserDocument;
-    };
-}) | undefined>;
+}, next: any): Promise<void>;
 /**
  * Handles user login by validating credentials and generating JWT tokens.
  * Passes data in ``res.locals.credentials`` for the next middleware to use.
@@ -31,11 +27,7 @@ export declare function authLogin(req: Request, res: Response & {
     locals: {
         credentials: JWTCredentials;
     };
-}, next: any): Promise<(express.Response<any, Record<string, any>> & {
-    locals: {
-        credentials: JWTCredentials;
-    };
-}) | undefined>;
+}, next: any): Promise<void>;
 /**
  * Handles user logout by invalidating the provided refresh token and optionally the access token.
  * JWTRefresh Token is required
@@ -63,12 +55,6 @@ export declare function authRefresh(req: Request, res: Response & {
         token: string;
         credentials: JWTCredentials;
     };
-}, next: any): Promise<(express.Response<any, Record<string, any>> & {
-    locals: {
-        user: AuthUserPayload;
-        token: string;
-        credentials: JWTCredentials;
-    };
-}) | undefined>;
+}, next: any): Promise<void>;
 export default router;
 //# sourceMappingURL=session.d.ts.map

package/dist/middleware/authentication/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/middleware/authentication/session.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI1D,OAAO,EAAE,gBAAgB,EAA0C,MAAM,cAAc,CAAC;AAExF,QAAA,MAAM,MAAM,4CAAmB,CAAC;AA2ChC;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GAAG;IAAE,MAAM,EAAE;QAAE,QAAQ,EAAE,gBAAgB,CAAA;KAAE,CAAA;CAAE,EAC1D,IAAI,EAAE,GAAG;YADiB;QAAE,QAAQ,EAAE,gBAAgB,CAAA;KAAE;gBAkBzD;AAED;;;;;;;GAOG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG;IAAE,MAAM,EAAE;QAAE,WAAW,EAAE,cAAc,CAAA;KAAE,CAAA;CAAE,EAAE,IAAI,EAAE,GAAG;YAA5C;QAAE,WAAW,EAAE,cAAc,CAAA;KAAE;gBAuBtG;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GAAG;IAAE,MAAM,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EACpE,IAAI,EAAE,GAAG,iBA4BV;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GAAG;IAAE,MAAM,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,cAAc,CAAA;KAAE,CAAA;CAAE,EACjG,IAAI,EAAE,GAAG;YADiB;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,cAAc,CAAA;KAAE;gBAyChG;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/middleware/authentication/session.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI1D,OAAO,EAAE,gBAAgB,EAA0C,MAAM,cAAc,CAAC;AAExF,QAAA,MAAM,MAAM,4CAAmB,CAAC;AA2ChC;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GAAG;IAAE,MAAM,EAAE;QAAE,QAAQ,EAAE,gBAAgB,CAAA;KAAE,CAAA;CAAE,EAC1D,IAAI,EAAE,GAAG,GACR,OAAO,CAAC,IAAI,CAAC,CAkBf;AAED;;;;;;;GAOG;AACH,wBAAsB,SAAS,CAC7B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GAAG;IAAE,MAAM,EAAE;QAAE,WAAW,EAAE,cAAc,CAAA;KAAE,CAAA;CAAE,EAC3D,IAAI,EAAE,GAAG,GACR,OAAO,CAAC,IAAI,CAAC,CA4Bf;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GAAG;IAAE,MAAM,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EACpE,IAAI,EAAE,GAAG,GACR,OAAO,CAAC,IAAI,CAAC,CA4Bf;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GAAG;IAAE,MAAM,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,cAAc,CAAA;KAAE,CAAA;CAAE,EACjG,IAAI,EAAE,GAAG,GACR,OAAO,CAAC,IAAI,CAAC,CA0Cf;AAED,eAAe,MAAM,CAAC"}

package/dist/middleware/authentication/validation.d.ts

@@ -1,9 +1,21 @@
 import { Request, Response } from 'express';
 import { AuthUserPayload } from './types';
 export interface TokenVerificationResult {
+    /**
+     * Indicates if the token is valid (signature is correct, not blocked, and user is not blocked).
+     */
     isTokenValid: boolean;
+    /**
+     * Indicates if the token is expired.
+     */
     isTokenExpired: boolean;
+    /**
+     * Indicates if the user associated with the token is blocked.
+     */
     isUserBlocked: boolean;
+    /**
+     * The decoded payload from the JWT token, which should contain user information.
+     */
     payload: AuthUserPayload | any;
 }
 /**
@@ -19,12 +31,7 @@ export declare function jwtRequired(req: Request, res: Response & {
         user: AuthUserPayload;
         token: string;
     };
-}, next: any): Promise<(Response<any, Record<string, any>> & {
-    locals: {
-        user: AuthUserPayload;
-        token: string;
-    };
-}) | undefined>;
+}, next: any): Promise<void>;
 /**
  * Express middleware to require a valid refresh JWT token for access. Checks the token against the blocklist and user status.
  * Adding user and access token to ``res.locals.user`` and ``res.locals.token``
@@ -38,12 +45,7 @@ export declare function jwtRefreshRequired(req: Request, res: Response & {
         user: AuthUserPayload;
         token: string;
     };
-}, next: any): Promise<(Response<any, Record<string, any>> & {
-    locals: {
-        user: AuthUserPayload;
-        token: string;
-    };
-}) | undefined>;
+}, next: any): Promise<void>;
 /**
  * Verifies a JWT token and checks for blocklist and user status.
  * @param token

package/dist/middleware/authentication/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/middleware/authentication/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI1C,MAAM,WAAW,uBAAuB;IACtC,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,eAAe,GAAG,GAAG,CAAC;CAChC;AAKD;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GAAG;IAAE,MAAM,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EACpE,IAAI,EAAE,GAAG;YAuFwD;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;gBApF1G;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GAAG;IAAE,MAAM,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EACpE,IAAI,EAAE,GAAG;YAuEwD;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;gBApE1G;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAgDpG;AAwCD,wBAAsB,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAqBzD"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/middleware/authentication/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI1C,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,YAAY,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,cAAc,EAAE,OAAO,CAAC;IACxB;;OAEG;IACH,aAAa,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,OAAO,EAAE,eAAe,GAAG,GAAG,CAAC;CAChC;AAKD;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GAAG;IAAE,MAAM,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EACpE,IAAI,EAAE,GAAG,GACR,OAAO,CAAC,IAAI,CAAC,CAEf;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GAAG;IAAE,MAAM,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,EACpE,IAAI,EAAE,GAAG,GACR,OAAO,CAAC,IAAI,CAAC,CAEf;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,uBAAuB,CAAC,CAgDlC;AAqDD,wBAAsB,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAsBzD"}