@naturalcycles/nodejs-lib 15.116.0 → 15.116.1

package/dist/jwt/jwt.service2.d.ts

@@ -156,6 +156,13 @@ export declare class JWTService2<T extends AnyObject = AnyObject> {
     sign<TT extends T = T>(payload: TT, opt: JWTSignOptions<TT>): Promise<JWTString>;
     verify<TT extends T = T>(token: JWTString, opt?: JWTVerifyOptions<TT>): Promise<TT>;
     decode<TT extends T = T>(token: JWTString, opt?: JWTDecodeOptions<TT>): JWTDecoded<TT>;
+    /**
+     * Schema-validation errors on Verify/Decode are extended with cfg.errorData:
+     * a token with a non-conforming payload is as unauthorized as an invalid one.
+     * (On Sign the payload comes from own code, not from user input, so a validation
+     * error there indicates a programming error and is thrown as-is.)
+     */
+    private validate;
     /**
      * jose errors are normalized into JWTError (extended with cfg.errorData).
      * Non-jose errors (e.g TypeError from passing a key that doesn't fit the algorithm)

package/dist/jwt/jwt.service2.js

@@ -1,6 +1,6 @@
 import { createPrivateKey, createPublicKey } from 'node:crypto';
 import { _assert } from '@naturalcycles/js-lib/error/assert.js';
-import { AppError } from '@naturalcycles/js-lib/error/error.util.js';
+import { _errorDataAppend, AppError } from '@naturalcycles/js-lib/error/error.util.js';
 import { decodeJwt, decodeProtectedHeader, errors, jwtVerify, SignJWT } from 'jose';
 /**
  * Wraps the `jose` library, exposing an implementation-agnostic API:
@@ -79,8 +79,7 @@ export class JWTService2 {
         catch (err) {
             throw this.normalizeError(err);
         }
-        ;
-        (schema || this.cfg.schema)?.validate(data);
+        this.validate(data, schema);
         return data;
     }
     decode(token, opt = {}) {
@@ -96,14 +95,31 @@ export class JWTService2 {
                 code: 'JWT_INVALID',
             }, { cause: err });
         }
-        ;
-        (opt.schema || this.cfg.schema)?.validate(payload);
+        this.validate(payload, opt.schema);
         return {
             header,
             payload,
             signature: token.split('.')[2],
         };
     }
+    /**
+     * Schema-validation errors on Verify/Decode are extended with cfg.errorData:
+     * a token with a non-conforming payload is as unauthorized as an invalid one.
+     * (On Sign the payload comes from own code, not from user input, so a validation
+     * error there indicates a programming error and is thrown as-is.)
+     */
+    validate(payload, schema) {
+        try {
+            ;
+            (schema || this.cfg.schema)?.validate(payload);
+        }
+        catch (err) {
+            if (this.cfg.errorData) {
+                _errorDataAppend(err, this.cfg.errorData);
+            }
+            throw err;
+        }
+    }
     /**
      * jose errors are normalized into JWTError (extended with cfg.errorData).
      * Non-jose errors (e.g TypeError from passing a key that doesn't fit the algorithm)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.116.0",
+  "version": "15.116.1",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",

package/src/jwt/jwt.service2.ts

@@ -2,7 +2,7 @@ import { createPrivateKey, createPublicKey } from 'node:crypto'
 import type { KeyObject } from 'node:crypto'
 import type { ErrorData } from '@naturalcycles/js-lib/error'
 import { _assert } from '@naturalcycles/js-lib/error/assert.js'
-import { AppError } from '@naturalcycles/js-lib/error/error.util.js'
+import { _errorDataAppend, AppError } from '@naturalcycles/js-lib/error/error.util.js'
 import type {
   AnyObject,
   JWTString,
@@ -243,7 +243,7 @@ export class JWTService2<T extends AnyObject = AnyObject> {
       throw this.normalizeError(err)
     }
 
-    ;(schema || this.cfg.schema)?.validate(data)
+    this.validate(data, schema)
 
     return data
   }
@@ -266,7 +266,7 @@ export class JWTService2<T extends AnyObject = AnyObject> {
       )
     }
 
-    ;(opt.schema || this.cfg.schema)?.validate(payload)
+    this.validate(payload, opt.schema)
 
     return {
       header,
@@ -275,6 +275,23 @@ export class JWTService2<T extends AnyObject = AnyObject> {
     }
   }
 
+  /**
+   * Schema-validation errors on Verify/Decode are extended with cfg.errorData:
+   * a token with a non-conforming payload is as unauthorized as an invalid one.
+   * (On Sign the payload comes from own code, not from user input, so a validation
+   * error there indicates a programming error and is thrown as-is.)
+   */
+  private validate<TT extends T>(payload: TT, schema?: JSchema<TT, any> | AjvSchema<TT>): void {
+    try {
+      ;(schema || this.cfg.schema)?.validate(payload)
+    } catch (err) {
+      if (this.cfg.errorData) {
+        _errorDataAppend(err, this.cfg.errorData)
+      }
+      throw err
+    }
+  }
+
   /**
    * jose errors are normalized into JWTError (extended with cfg.errorData).
    * Non-jose errors (e.g TypeError from passing a key that doesn't fit the algorithm)