@lindorm/aegis 0.3.6 → 0.4.1

package/dist/utils/private/token-header.js

@@ -15,8 +15,6 @@ const mapTokenHeader = (options) => {
                 return "enc";
             case "headerType":
                 return "typ";
-            case "hkdfSalt":
-                return "hkdf_salt";
             case "jwk":
                 return "jwk";
             case "jwksUri":
@@ -44,10 +42,9 @@ const mapTokenHeader = (options) => {
             case "x5tS256":
                 return "x5t#S256";
             default:
-                return undefined;
+                return key;
         }
     })
-        .filter(is_1.isString)
         .sort();
     return (0, utils_1.removeUndefined)({
         alg: options.algorithm,
@@ -55,7 +52,6 @@ const mapTokenHeader = (options) => {
         cty: options.contentType,
         enc: (0, is_1.isString)(options.encryption) ? options.encryption : undefined,
         epk: (0, is_1.isObject)(options.publicEncryptionJwk) ? options.publicEncryptionJwk : undefined,
-        hkdf_salt: options.hkdfSalt,
         iv: options.initialisationVector,
         jku: (0, is_1.isUrlLike)(options.jwksUri) ? options.jwksUri : undefined,
         jwk: (0, is_1.isObject)(options.jwk) ? options.jwk : undefined,
@@ -84,8 +80,6 @@ const parseTokenHeader = (decoded) => {
                 return "encryption";
             case "epk":
                 return "publicEncryptionJwk";
-            case "hkdf_salt":
-                return "hkdfSalt";
             case "iv":
                 return "initialisationVector";
             case "jku":
@@ -113,10 +107,9 @@ const parseTokenHeader = (decoded) => {
             case "x5t#S256":
                 return "x5tS256";
             default:
-                return undefined;
+                return key;
         }
     })
-        .filter(is_1.isString)
         .sort() ?? [];
     return (0, utils_1.removeUndefined)({
         algorithm: decoded.alg,
@@ -124,7 +117,6 @@ const parseTokenHeader = (decoded) => {
         critical,
         encryption: decoded.enc,
         headerType: decoded.typ,
-        hkdfSalt: decoded.hkdf_salt,
         initialisationVector: decoded.iv,
         jwk: decoded.jwk,
         jwksUri: decoded.jku,

package/dist/utils/private/token-header.js.map

@@ -1 +1 @@
-{"version":3,"file":"token-header.js","sourceRoot":"","sources":["../../../src/utils/private/token-header.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"token-header.js","sourceRoot":"","sources":["../../../src/utils/private/token-header.ts"],"names":[],"mappings":"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"}

package/dist/utils/private/validate.d.ts

@@ -1,4 +1,3 @@
-import { Dict } from "@lindorm/types";
-import { Operators } from "../../types";
-export declare const validate: <C extends Dict = Dict>(dict: C, operators: Dict<Operators>) => void;
+import { Dict, Predicate } from "@lindorm/types";
+export declare const validate: <C extends Dict = Dict>(dict: C, predicate: Predicate<C>) => void;
 //# sourceMappingURL=validate.d.ts.map

package/dist/utils/private/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/utils/private/validate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,IAAI,GAAG,IAAI,EAC5C,MAAM,CAAC,EACP,WAAW,IAAI,CAAC,SAAS,CAAC,KACzB,IAcF,CAAC"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/utils/private/validate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEjD,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,IAAI,GAAG,IAAI,EAC5C,MAAM,CAAC,EACP,WAAW,SAAS,CAAC,CAAC,CAAC,KACtB,IAWF,CAAC"}

package/dist/utils/private/validate.js

@@ -2,18 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validate = void 0;
 const errors_1 = require("@lindorm/errors");
-const validate_value_1 = require("./validate-value");
-const validate = (dict, operators) => {
+const utils_1 = require("@lindorm/utils");
+const validate = (dict, predicate) => {
+    if (utils_1.Predicated.match(dict, predicate))
+        return;
     const invalid = [];
-    for (const [key, ops] of Object.entries(operators)) {
-        const value = dict[key];
-        if ((0, validate_value_1.validateValue)(value, ops))
-            continue;
-        invalid.push({ key, value, ops });
-    }
-    if (invalid.length) {
-        throw new errors_1.LindormError("Invalid token", { data: { invalid } });
+    for (const [key, ops] of Object.entries(predicate)) {
+        if (!utils_1.Predicated.match({ [key]: dict[key] }, { [key]: ops })) {
+            invalid.push({ key, value: dict[key] });
+        }
     }
+    throw new errors_1.LindormError("Invalid token", { data: { invalid } });
 };
 exports.validate = validate;
 //# sourceMappingURL=validate.js.map

package/dist/utils/private/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/utils/private/validate.ts"],"names":[],"mappings":";;;AAAA,4CAA+C;AAG/C,qDAAiD;AAE1C,MAAM,QAAQ,GAAG,CACtB,IAAO,EACP,SAA0B,EACpB,EAAE;IACR,MAAM,OAAO,GAAuD,EAAE,CAAC;IAEvE,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACnD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QAExB,IAAI,IAAA,8BAAa,EAAC,KAAK,EAAE,GAAG,CAAC;YAAE,SAAS;QAExC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,IAAI,qBAAY,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IACjE,CAAC;AACH,CAAC,CAAC;AAjBW,QAAA,QAAQ,YAiBnB"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/utils/private/validate.ts"],"names":[],"mappings":";;;AAAA,4CAA+C;AAC/C,0CAA4C;AAGrC,MAAM,QAAQ,GAAG,CACtB,IAAO,EACP,SAAuB,EACjB,EAAE;IACR,IAAI,kBAAU,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC;QAAE,OAAO;IAE9C,MAAM,OAAO,GAAuC,EAAE,CAAC;IACvD,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACnD,IAAI,CAAC,kBAAU,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAS,CAAC,EAAE,CAAC;YACnE,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,MAAM,IAAI,qBAAY,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;AACjE,CAAC,CAAC;AAdW,QAAA,QAAQ,YAcnB"}

package/jest.config.interop.mjs

@@ -0,0 +1,27 @@
+import base from "../../jest.config.base.mjs";
+import packageJson from "./package.json" with { type: "json" };
+
+export default {
+  ...base,
+  displayName: `${packageJson.name}/interop`,
+  roots: ["<rootDir>/__tests__"],
+  extensionsToTreatAsEsm: [".ts"],
+  moduleNameMapper: {
+    "^(\\.{1,2}/.*)\\.js$": "$1",
+    "^cbor$": "<rootDir>/__tests__/__mocks__/cbor.ts",
+  },
+  transform: {
+    "^.+\\.tsx?$": [
+      "ts-jest",
+      {
+        useESM: true,
+        tsconfig: "tsconfig.interop.json",
+      },
+    ],
+  },
+  transformIgnorePatterns: [
+    "node_modules/(?!(jose|@auth0/cose|cbor-x|@jfromaniello/typedmap|cbor|nofilter)/)",
+  ],
+  collectCoverageFrom: [],
+  coverageThreshold: {},
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lindorm/aegis",
-  "version": "0.3.6",
+  "version": "0.4.1",
   "license": "AGPL-3.0-or-later",
   "author": "Jonn Nilsson",
   "repository": {
@@ -16,38 +16,39 @@
   "scripts": {
     "build": "rimraf dist && tsc -b ./tsconfig.build.json",
     "example": "ts-node example",
-    "integration": "compd --file docker-compose.yml jest --config jest.config.integration.js --watch",
-    "integration:focus": "compd --file docker-compose.yml jest --config jest.config.integration.js --watch $1",
     "prettier": "prettier --write ./src/*",
-    "test": "jest --watch --",
-    "test:ci": "npm run test:unit",
-    "test:integration": "jest --config jest.config.integration.js --",
-    "test:unit": "jest --config jest.config.js --",
-    "typecheck": "tsc --watch",
-    "typecheck:ci": "tsc",
+    "test": "jest --",
+    "test:ci": "jest",
+    "test:interop": "NODE_OPTIONS='--experimental-vm-modules' jest --config jest.config.interop.mjs --no-coverage",
+    "test:watch": "jest --watch --",
+    "typecheck": "tsc",
+    "typecheck:watch": "tsc --watch",
     "update": "ncu -i",
-    "update:auto": "ncu -u"
+    "update:auto": "ncu -u",
+    "verify": "npm run typecheck; npm run build; npm test"
   },
   "dependencies": {
-    "@lindorm/aes": "^0.5.5",
-    "@lindorm/b64": "^0.1.6",
-    "@lindorm/date": "^0.3.3",
-    "@lindorm/ec": "^0.2.5",
-    "@lindorm/errors": "^0.1.12",
-    "@lindorm/is": "^0.1.11",
-    "@lindorm/kryptos": "^0.4.5",
-    "@lindorm/oct": "^0.2.5",
-    "@lindorm/okp": "^0.2.5",
-    "@lindorm/rsa": "^0.2.5",
-    "@lindorm/utils": "^0.5.4",
+    "@lindorm/aes": "^0.6.1",
+    "@lindorm/b64": "^0.1.8",
+    "@lindorm/date": "^0.4.0",
+    "@lindorm/ec": "^0.2.7",
+    "@lindorm/errors": "^0.1.14",
+    "@lindorm/is": "^0.1.13",
+    "@lindorm/kryptos": "^0.5.1",
+    "@lindorm/oct": "^0.2.7",
+    "@lindorm/okp": "^0.2.7",
+    "@lindorm/rsa": "^0.2.7",
+    "@lindorm/utils": "^0.6.0",
     "cbor": "^10.0.3"
   },
   "devDependencies": {
-    "@lindorm/amphora": "^0.2.6",
-    "@lindorm/logger": "^0.3.4",
-    "@lindorm/types": "^0.3.3",
+    "@auth0/cose": "^1.0.2",
+    "@lindorm/amphora": "^0.3.1",
+    "@lindorm/logger": "^0.5.0",
+    "@lindorm/types": "^0.4.0",
     "@types/jsonwebtoken": "^9.0.6",
+    "jose": "^6.1.3",
     "jsonwebtoken": "^9.0.2"
   },
-  "gitHead": "3302fa2c4d75f2832959018d9e089d11af4a35fc"
+  "gitHead": "e9f119d722596c1980328d88e588db4ab49dd04b"
 }

package/tsconfig.interop.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "module": "esnext",
+    "moduleResolution": "node",
+    "rootDir": "."
+  },
+  "include": ["__tests__/**/*", "src/**/*"]
+}

package/dist/types/operators.d.ts

@@ -1,27 +0,0 @@
-type Ops = {
-    $exists?: boolean;
-    $eq?: Date | string | number;
-    $ne?: Date | string | number;
-    $in?: Array<string | number>;
-    $nin?: Array<string | number>;
-    $has?: string;
-    $not?: string;
-    $all?: Array<string>;
-    $any?: Array<string>;
-    $none?: Array<string>;
-    $before?: Date;
-    $beforeOrEq?: Date;
-    $after?: Date;
-    $afterOrEq?: Date;
-    $gt?: number;
-    $gte?: number;
-    $lt?: number;
-    $lte?: number;
-    $regex?: string;
-};
-export type Operators = Ops & {
-    $and?: Array<Operators>;
-    $or?: Array<Operators>;
-};
-export {};
-//# sourceMappingURL=operators.d.ts.map

package/dist/types/operators.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"operators.d.ts","sourceRoot":"","sources":["../../src/types/operators.ts"],"names":[],"mappings":"AAAA,KAAK,GAAG,GAAG;IACT,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;IAC7B,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;IAE7B,GAAG,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IAC7B,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IAI9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAItB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,WAAW,CAAC,EAAE,IAAI,CAAC;IAEnB,MAAM,CAAC,EAAE,IAAI,CAAC;IACd,UAAU,CAAC,EAAE,IAAI,CAAC;IAIlB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IAId,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,GAAG,GAAG;IAC5B,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACxB,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CACxB,CAAC"}

package/dist/types/operators.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"operators.js","sourceRoot":"","sources":["../../src/types/operators.ts"],"names":[],"mappings":""}

package/dist/utils/private/validate-value.d.ts

@@ -1,3 +0,0 @@
-import { Operators } from "../../types";
-export declare const validateValue: (value: any, operators: Operators) => boolean;
-//# sourceMappingURL=validate-value.d.ts.map

package/dist/utils/private/validate-value.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"validate-value.d.ts","sourceRoot":"","sources":["../../../src/utils/private/validate-value.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,eAAO,MAAM,aAAa,GAAI,OAAO,GAAG,EAAE,WAAW,SAAS,KAAG,OA2HhE,CAAC"}

package/dist/utils/private/validate-value.js

@@ -1,91 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateValue = void 0;
-const date_1 = require("@lindorm/date");
-const is_1 = require("@lindorm/is");
-const validateValue = (value, operators) => {
-    if (operators.$exists === true && !value) {
-        return false;
-    }
-    if (operators.$exists === false && value) {
-        return false;
-    }
-    if (operators.$eq) {
-        if ((0, is_1.isDate)(value) && !(0, date_1.isEqual)(value, operators.$eq)) {
-            return false;
-        }
-        else if (value !== operators.$eq) {
-            return false;
-        }
-    }
-    if (operators.$ne) {
-        if ((0, is_1.isDate)(value) && (0, date_1.isEqual)(value, operators.$ne)) {
-            return false;
-        }
-        else if (value === operators.$ne) {
-            return false;
-        }
-    }
-    if (operators.$in && !operators.$in.includes(value)) {
-        return false;
-    }
-    if (operators.$nin && operators.$nin.includes(value)) {
-        return false;
-    }
-    if (operators.$has && (!(0, is_1.isArray)(value) || !value.includes(operators.$has))) {
-        return false;
-    }
-    if (operators.$not && (!(0, is_1.isArray)(value) || value.includes(operators.$not))) {
-        return false;
-    }
-    if (operators.$all &&
-        (!(0, is_1.isArray)(value) || !operators.$all.every((v) => value.includes(v)))) {
-        return false;
-    }
-    if (operators.$any &&
-        (!(0, is_1.isArray)(value) || !operators.$any.some((v) => value.includes(v)))) {
-        return false;
-    }
-    if (operators.$none &&
-        (!(0, is_1.isArray)(value) || operators.$none.some((v) => value.includes(v)))) {
-        return false;
-    }
-    if (operators.$before && (!(0, is_1.isDate)(value) || !(0, date_1.isBefore)(value, operators.$before))) {
-        return false;
-    }
-    if (operators.$beforeOrEq &&
-        (!(0, is_1.isDate)(value) || (0, date_1.isAfter)(value, operators.$beforeOrEq))) {
-        return false;
-    }
-    if (operators.$after && (!(0, is_1.isDate)(value) || !(0, date_1.isAfter)(value, operators.$after))) {
-        return false;
-    }
-    if (operators.$afterOrEq && (!(0, is_1.isDate)(value) || (0, date_1.isBefore)(value, operators.$afterOrEq))) {
-        return false;
-    }
-    if (operators.$gt && (!(0, is_1.isNumber)(value) || operators.$gt >= value)) {
-        return false;
-    }
-    if (operators.$gte && (!(0, is_1.isNumber)(value) || operators.$gte > value)) {
-        return false;
-    }
-    if (operators.$lt && (!(0, is_1.isNumber)(value) || operators.$lt <= value)) {
-        return false;
-    }
-    if (operators.$lte && (!(0, is_1.isNumber)(value) || operators.$lte < value)) {
-        return false;
-    }
-    if (operators.$regex &&
-        (!(0, is_1.isString)(value) || !new RegExp(operators.$regex).test(value))) {
-        return false;
-    }
-    if (operators.$and && !operators.$and.every((op) => (0, exports.validateValue)(value, op))) {
-        return false;
-    }
-    if (operators.$or && !operators.$or.some((op) => (0, exports.validateValue)(value, op))) {
-        return false;
-    }
-    return true;
-};
-exports.validateValue = validateValue;
-//# sourceMappingURL=validate-value.js.map

package/dist/utils/private/validate-value.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"validate-value.js","sourceRoot":"","sources":["../../../src/utils/private/validate-value.ts"],"names":[],"mappings":"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"}