@naturalcycles/nodejs-lib 12.82.1 → 12.84.0

package/dist/jwt/jwt.service.d.ts

@@ -18,6 +18,8 @@ export interface JWTServiceCfg {
     privateKey?: string | Buffer;
     /**
      * Recommended: ES256
+     * Keys (private/public) should be generated using proper settings
+     * that fit the used Algorithm.
      */
     algorithm: Algorithm;
     /**
@@ -38,7 +40,10 @@ export interface JWTServiceCfg {
  * Wraps popular `jsonwebtoken` library.
  * You should create one instance of JWTService for each pair of private/public key.
  *
- * Generate key pair like this:
+ * Generate key pair like this.
+ * Please note that parameters should be different for different algorithms.
+ * For ES256 (default algo in JWTService) key should have `prime256v1` parameter:
+ *
  * openssl ecparam -name prime256v1 -genkey -noout -out key.pem
  * openssl ec -in key.pem -pubout > key.pub.pem
  */
@@ -46,7 +51,7 @@ export declare class JWTService {
     cfg: JWTServiceCfg;
     constructor(cfg: JWTServiceCfg);
     sign<T extends AnyObject>(payload: T, schema?: AnySchemaTyped<T>, opt?: SignOptions): JWTString;
-    verify<T extends AnyObject>(token: JWTString, schema?: AnySchemaTyped<T>, opt?: VerifyOptions): T;
+    verify<T extends AnyObject>(token: JWTString, schema?: AnySchemaTyped<T>, opt?: VerifyOptions, publicKey?: string): T;
     decode<T extends AnyObject>(token: JWTString, schema?: AnySchemaTyped<T>): {
         header: JwtHeader;
         payload: T;

package/dist/jwt/jwt.service.js

@@ -11,7 +11,10 @@ const joi_validation_util_1 = require("../validation/joi/joi.validation.util");
  * Wraps popular `jsonwebtoken` library.
  * You should create one instance of JWTService for each pair of private/public key.
  *
- * Generate key pair like this:
+ * Generate key pair like this.
+ * Please note that parameters should be different for different algorithms.
+ * For ES256 (default algo in JWTService) key should have `prime256v1` parameter:
+ *
  * openssl ecparam -name prime256v1 -genkey -noout -out key.pem
  * openssl ec -in key.pem -pubout > key.pub.pem
  */
@@ -31,10 +34,10 @@ class JWTService {
             ...opt,
         });
     }
-    verify(token, schema, opt = {}) {
+    verify(token, schema, opt = {}, publicKey) {
         (0, js_lib_1._assert)(this.cfg.publicKey, 'JWTService: publicKey is required to be able to verify, but not provided');
         try {
-            const data = jsonwebtoken.verify(token, this.cfg.publicKey, {
+            const data = jsonwebtoken.verify(token, publicKey || this.cfg.publicKey, {
                 algorithms: [this.cfg.algorithm],
                 ...this.cfg.verifyOptions,
                 ...opt,

package/dist/validation/joi/joi.shared.schemas.d.ts

@@ -8,6 +8,7 @@ export declare const integerSchema: import("./number.extensions").ExtendedNumber
 export declare const percentageSchema: import("./number.extensions").ExtendedNumberSchema;
 export declare const dateStringSchema: import("./string.extensions").ExtendedStringSchema;
 export declare const binarySchema: import("joi").BinarySchema;
+export declare const dateObjectSchema: import("joi").ObjectSchema<any>;
 export declare const urlSchema: (scheme?: string | string[]) => StringSchemaTyped;
 export declare function arraySchema<T>(items?: AnySchemaTyped<T, T>): ArraySchemaTyped<T>;
 export declare function objectSchema<IN, OUT = IN>(schema?: {

package/dist/validation/joi/joi.shared.schemas.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.savedDBEntitySchema = exports.baseDBEntitySchema = exports.ipAddressSchema = exports.utcOffsetSchema = exports.userAgentSchema = exports.semVerSchema = exports.SEM_VER_REGEX = exports.emailSchema = exports.verSchema = exports.unixTimestampMillis2000Schema = exports.unixTimestampMillisSchema = exports.unixTimestamp2000Schema = exports.unixTimestampSchema = exports.slugSchema = exports.SLUG_REGEX = exports.idBase64UrlSchema = exports.idBase64Schema = exports.idBase62Schema = exports.idSchema = exports.jwtSchema = exports.JWT_REGEX = exports.base64UrlSchema = exports.base64Schema = exports.base62Schema = exports.BASE64URL_REGEX = exports.BASE64_REGEX = exports.BASE62_REGEX = exports.anyObjectSchema = exports.anySchema = exports.oneOfSchema = exports.objectSchema = exports.arraySchema = exports.urlSchema = exports.binarySchema = exports.dateStringSchema = exports.percentageSchema = exports.integerSchema = exports.numberSchema = exports.stringSchema = exports.booleanDefaultToFalseSchema = exports.booleanSchema = void 0;
+exports.savedDBEntitySchema = exports.baseDBEntitySchema = exports.ipAddressSchema = exports.utcOffsetSchema = exports.userAgentSchema = exports.semVerSchema = exports.SEM_VER_REGEX = exports.emailSchema = exports.verSchema = exports.unixTimestampMillis2000Schema = exports.unixTimestampMillisSchema = exports.unixTimestamp2000Schema = exports.unixTimestampSchema = exports.slugSchema = exports.SLUG_REGEX = exports.idBase64UrlSchema = exports.idBase64Schema = exports.idBase62Schema = exports.idSchema = exports.jwtSchema = exports.JWT_REGEX = exports.base64UrlSchema = exports.base64Schema = exports.base62Schema = exports.BASE64URL_REGEX = exports.BASE64_REGEX = exports.BASE62_REGEX = exports.anyObjectSchema = exports.anySchema = exports.oneOfSchema = exports.objectSchema = exports.arraySchema = exports.urlSchema = exports.dateObjectSchema = exports.binarySchema = exports.dateStringSchema = exports.percentageSchema = exports.integerSchema = exports.numberSchema = exports.stringSchema = exports.booleanDefaultToFalseSchema = exports.booleanSchema = void 0;
 const joi_extensions_1 = require("./joi.extensions");
 exports.booleanSchema = joi_extensions_1.Joi.boolean();
 exports.booleanDefaultToFalseSchema = joi_extensions_1.Joi.boolean().default(false);
@@ -10,6 +10,7 @@ exports.integerSchema = joi_extensions_1.Joi.number().integer();
 exports.percentageSchema = joi_extensions_1.Joi.number().integer().min(0).max(100);
 exports.dateStringSchema = exports.stringSchema.dateString();
 exports.binarySchema = joi_extensions_1.Joi.binary();
+exports.dateObjectSchema = joi_extensions_1.Joi.object().instance(Date);
 const urlSchema = (scheme = 'https') => joi_extensions_1.Joi.string().uri({ scheme });
 exports.urlSchema = urlSchema;
 function arraySchema(items) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.82.1",
+  "version": "12.84.0",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",

package/src/jwt/jwt.service.ts

@@ -28,6 +28,8 @@ export interface JWTServiceCfg {
 
   /**
    * Recommended: ES256
+   * Keys (private/public) should be generated using proper settings
+   * that fit the used Algorithm.
    */
   algorithm: Algorithm
 
@@ -54,7 +56,10 @@ export interface JWTServiceCfg {
  * Wraps popular `jsonwebtoken` library.
  * You should create one instance of JWTService for each pair of private/public key.
  *
- * Generate key pair like this:
+ * Generate key pair like this.
+ * Please note that parameters should be different for different algorithms.
+ * For ES256 (default algo in JWTService) key should have `prime256v1` parameter:
+ *
  * openssl ecparam -name prime256v1 -genkey -noout -out key.pem
  * openssl ec -in key.pem -pubout > key.pub.pem
  */
@@ -87,6 +92,7 @@ export class JWTService {
     token: JWTString,
     schema?: AnySchemaTyped<T>,
     opt: VerifyOptions = {},
+    publicKey?: string, // allows to override public key
   ): T {
     _assert(
       this.cfg.publicKey,
@@ -94,7 +100,7 @@ export class JWTService {
     )
 
     try {
-      const data = jsonwebtoken.verify(token, this.cfg.publicKey, {
+      const data = jsonwebtoken.verify(token, publicKey || this.cfg.publicKey, {
         algorithms: [this.cfg.algorithm],
         ...this.cfg.verifyOptions,
         ...opt,

package/src/validation/joi/joi.shared.schemas.ts

@@ -17,6 +17,7 @@ export const integerSchema = Joi.number().integer()
 export const percentageSchema = Joi.number().integer().min(0).max(100)
 export const dateStringSchema = stringSchema.dateString()
 export const binarySchema = Joi.binary()
+export const dateObjectSchema = Joi.object().instance(Date)
 
 export const urlSchema = (scheme: string | string[] = 'https'): StringSchemaTyped =>
   Joi.string().uri({ scheme })