@wener/common 2.0.2 → 2.0.5

package/lib/password/Password.js

@@ -1,200 +1,8 @@
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-    try {
-        var info = gen[key](arg);
-        var value = info.value;
-    }
-    catch (error) {
-        reject(error);
-        return;
-    }
-    if (info.done) {
-        resolve(value);
-    }
-    else {
-        Promise.resolve(value).then(_next, _throw);
-    }
-}
-function _async_to_generator(fn) {
-    return function () {
-        var self = this, args = arguments;
-        return new Promise(function (resolve, reject) {
-            var gen = fn.apply(self, args);
-            function _next(value) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-            }
-            function _throw(err) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-            }
-            _next(undefined);
-        });
-    };
-}
-function _define_property(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    }
-    else {
-        obj[key] = value;
-    }
-    return obj;
-}
-function _object_spread(target) {
-    for (var i = 1; i < arguments.length; i++) {
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
-        }
-        ownKeys.forEach(function (key) {
-            _define_property(target, key, source[key]);
-        });
-    }
-    return target;
-}
-function _object_without_properties(source, excluded) {
-    if (source == null)
-        return {};
-    var target = _object_without_properties_loose(source, excluded);
-    var key, i;
-    if (Object.getOwnPropertySymbols) {
-        var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-        for (i = 0; i < sourceSymbolKeys.length; i++) {
-            key = sourceSymbolKeys[i];
-            if (excluded.indexOf(key) >= 0)
-                continue;
-            if (!Object.prototype.propertyIsEnumerable.call(source, key))
-                continue;
-            target[key] = source[key];
-        }
-    }
-    return target;
-}
-function _object_without_properties_loose(source, excluded) {
-    if (source == null)
-        return {};
-    var target = {};
-    var sourceKeys = Object.keys(source);
-    var key, i;
-    for (i = 0; i < sourceKeys.length; i++) {
-        key = sourceKeys[i];
-        if (excluded.indexOf(key) >= 0)
-            continue;
-        target[key] = source[key];
-    }
-    return target;
-}
-function _ts_generator(thisArg, body) {
-    var f, y, t, _ = {
-        label: 0,
-        sent: function () {
-            if (t[0] & 1)
-                throw t[1];
-            return t[1];
-        },
-        trys: [],
-        ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-        return this;
-    }), g;
-    function verb(n) {
-        return function (v) {
-            return step([
-                n,
-                v
-            ]);
-        };
-    }
-    function step(op) {
-        if (f)
-            throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _)
-            try {
-                if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
-                    return t;
-                if (y = 0, t)
-                    op = [
-                        op[0] & 2,
-                        t.value
-                    ];
-                switch (op[0]) {
-                    case 0:
-                    case 1:
-                        t = op;
-                        break;
-                    case 4:
-                        _.label++;
-                        return {
-                            value: op[1],
-                            done: false
-                        };
-                    case 5:
-                        _.label++;
-                        y = op[1];
-                        op = [
-                            0
-                        ];
-                        continue;
-                    case 7:
-                        op = _.ops.pop();
-                        _.trys.pop();
-                        continue;
-                    default:
-                        if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-                            _ = 0;
-                            continue;
-                        }
-                        if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-                            _.label = op[1];
-                            break;
-                        }
-                        if (op[0] === 6 && _.label < t[1]) {
-                            _.label = t[1];
-                            t = op;
-                            break;
-                        }
-                        if (t && _.label < t[2]) {
-                            _.label = t[2];
-                            _.ops.push(op);
-                            break;
-                        }
-                        if (t[2])
-                            _.ops.pop();
-                        _.trys.pop();
-                        continue;
-                }
-                op = body.call(thisArg, _);
-            }
-            catch (e) {
-                op = [
-                    6,
-                    e
-                ];
-                y = 0;
-            }
-            finally {
-                f = t = 0;
-            }
-        if (op[0] & 5)
-            throw op[1];
-        return {
-            value: op[0] ? op[1] : void 0,
-            done: true
-        };
-    }
-}
 import { Errors } from "@wener/utils";
 import { createPBKDF2PasswordAlgorithm } from "./createPBKDF2PasswordAlgorithm.js";
 import { PHC } from "./PHC.js";
 (function (Password) {
-    var Algorithms = {
+    const Algorithms = {
         1: "md5",
         "2a": "bcrypt",
         "2b": "bcrypt",
@@ -204,9 +12,9 @@ import { PHC } from "./PHC.js";
         6: "sha512",
         7: "scrypt"
     };
-    var DefaultAlgorithm = "6";
+    let DefaultAlgorithm = "6";
     function setDefaultAlgorithm(algorithm) {
-        Errors.BadRequest.check(Algorithms[algorithm], "Unknown algorithm ".concat(algorithm));
+        Errors.BadRequest.check(Algorithms[algorithm], `Unknown algorithm ${algorithm}`);
         DefaultAlgorithm = algorithm;
     }
     Password.setDefaultAlgorithm = setDefaultAlgorithm;
@@ -217,28 +25,8 @@ import { PHC } from "./PHC.js";
     function addAlgorithm(algorithm) {
         Algorithms[algorithm.name] = algorithm;
         if (algorithm.ids) {
-            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-            try {
-                for (var _iterator = algorithm.ids[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-                    var id = _step.value;
-                    Algorithms[id] = algorithm;
-                }
-            }
-            catch (err) {
-                _didIteratorError = true;
-                _iteratorError = err;
-            }
-            finally {
-                try {
-                    if (!_iteratorNormalCompletion && _iterator.return != null) {
-                        _iterator.return();
-                    }
-                }
-                finally {
-                    if (_didIteratorError) {
-                        throw _iteratorError;
-                    }
-                }
+            for (const id of algorithm.ids) {
+                Algorithms[id] = algorithm;
             }
         }
     }
@@ -251,98 +39,45 @@ import { PHC } from "./PHC.js";
         id: "sha512",
         digest: "SHA-512"
     }));
-    function parse(hash) {
-        return _async_to_generator(function () {
-            return _ts_generator(this, function (_state) {
-                return [
-                    2,
-                    PHC.deserialize(hash)
-                ];
-            });
-        })();
+    async function parse(hash) {
+        return PHC.deserialize(hash);
     }
     Password.parse = parse;
     function resolveAlgorithm(id) {
-        var f = id;
+        let f = id;
         while (typeof f === "string") {
             f = Algorithms[f];
         }
         if (!f) {
-            throw new Error("Unknown algorithm ".concat(id));
+            throw new Error(`Unknown algorithm ${id}`);
         }
         return f;
     }
-    function validate(password, hash) {
-        return _async_to_generator(function () {
-            var res, f, _tmp;
-            return _ts_generator(this, function (_state) {
-                switch (_state.label) {
-                    case 0:
-                        return [
-                            4,
-                            parse(hash)
-                        ];
-                    case 1:
-                        res = _state.sent();
-                        f = resolveAlgorithm(res.id);
-                        _tmp = {};
-                        return [
-                            4,
-                            f.verify(password, hash, res)
-                        ];
-                    case 2:
-                        return [
-                            2,
-                            (_tmp.result = _state.sent(), _tmp.parsed = res, _tmp)
-                        ];
-                }
-            });
-        })();
+    async function validate(password, hash) {
+        let res = await parse(hash);
+        let f = resolveAlgorithm(res.id);
+        return {
+            result: await f.verify(password, hash, res),
+            parsed: res
+        };
     }
     Password.validate = validate;
-    function verify(password, hash) {
-        return _async_to_generator(function () {
-            var res, f;
-            return _ts_generator(this, function (_state) {
-                switch (_state.label) {
-                    case 0:
-                        return [
-                            4,
-                            parse(hash)
-                        ];
-                    case 1:
-                        res = _state.sent();
-                        f = resolveAlgorithm(res.id);
-                        return [
-                            2,
-                            f.verify(password, hash, res)
-                        ];
-                }
-            });
-        })();
+    async function verify(password, hash) {
+        let res = await parse(hash);
+        let f = resolveAlgorithm(res.id);
+        return f.verify(password, hash, res);
     }
     Password.verify = verify;
-    function hash(_0) {
-        return _async_to_generator(function (password) {
-            var _param, algorithm, opts, f, id;
-            var _arguments = arguments;
-            return _ts_generator(this, function (_state) {
-                _param = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : {};
-                algorithm = _param.algorithm, opts = _object_without_properties(_param, [
-                    "algorithm"
-                ]);
-                f = resolveAlgorithm(algorithm !== null && algorithm !== void 0 ? algorithm : DefaultAlgorithm);
-                id = algorithm !== null && algorithm !== void 0 ? algorithm : DefaultAlgorithm;
-                typeof id !== "string" && (id = f.name);
-                return [
-                    2,
-                    f.hash(password, _object_spread({
-                        id: id
-                    }, opts))
-                ];
-            });
-        }).apply(this, arguments);
+    async function hash(password, { algorithm, ...opts } = {}) {
+        let f = resolveAlgorithm(algorithm ?? DefaultAlgorithm);
+        let id = algorithm ?? DefaultAlgorithm;
+        typeof id !== "string" && (id = f.name);
+        return f.hash(password, {
+            id,
+            ...opts
+        });
     }
     Password.hash = hash;
 })(Password || (Password = {}));
 export var Password;
+//# sourceMappingURL=Password.js.map

package/lib/password/Password.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/password/Password.ts"],"sourcesContent":["import { Errors } from '@wener/utils';\nimport { createPBKDF2PasswordAlgorithm } from './createPBKDF2PasswordAlgorithm';\nimport { PHC } from './PHC';\n\nexport namespace Password {\n\texport interface ParsedPassword {\n\t\tid: string;\n\t\tversion?: number;\n\t\tparams?: Record<string, string | number>;\n\t\tsalt?: Uint8Array;\n\t\thash?: Uint8Array;\n\t}\n\n\ttype PasswordAlgorithmHashOptions = { rounds?: number; salt?: Uint8Array; id?: string };\n\ttype PasswordAlgorithmVerifyOptions = ParsedPassword;\n\texport type PasswordAlgorithm = {\n\t\treadonly name: string;\n\t\treadonly ids?: string[];\n\t\thash(password: string, opts?: PasswordAlgorithmHashOptions): Promise<string>;\n\t\tverify(password: string, hash: string, opts: PasswordAlgorithmVerifyOptions): Promise<boolean>;\n\t};\n\n\tconst Algorithms: Record<string, string | PasswordAlgorithm> = {\n\t\t1: 'md5',\n\t\t'2a': 'bcrypt', // original\n\t\t'2b': 'bcrypt', // February 2014\n\t\t'2x': 'bcrypt', // June 2011\n\t\t'2y': 'bcrypt', // June 2011\n\t\t5: 'sha256',\n\t\t6: 'sha512',\n\t\t7: 'scrypt',\n\t};\n\tlet DefaultAlgorithm: string = '6';\n\n\texport function setDefaultAlgorithm(algorithm: string) {\n\t\tErrors.BadRequest.check(Algorithms[algorithm], `Unknown algorithm ${algorithm}`);\n\t\tDefaultAlgorithm = algorithm;\n\t}\n\n\texport function getDefaultAlgorithm() {\n\t\treturn DefaultAlgorithm;\n\t}\n\n\texport function addAlgorithm(algorithm: PasswordAlgorithm) {\n\t\tAlgorithms[algorithm.name] = algorithm;\n\t\tif (algorithm.ids) {\n\t\t\tfor (const id of algorithm.ids) {\n\t\t\t\tAlgorithms[id] = algorithm;\n\t\t\t}\n\t\t}\n\t}\n\n\taddAlgorithm(createPBKDF2PasswordAlgorithm({ id: 'sha256', digest: 'SHA-256' }));\n\taddAlgorithm(createPBKDF2PasswordAlgorithm({ id: 'sha512', digest: 'SHA-512' }));\n\n\texport async function parse(hash: string) {\n\t\treturn PHC.deserialize(hash);\n\t}\n\n\tfunction resolveAlgorithm(id: string | PasswordAlgorithm): PasswordAlgorithm {\n\t\tlet f = id;\n\t\twhile (typeof f === 'string') {\n\t\t\tf = Algorithms[f];\n\t\t}\n\t\tif (!f) {\n\t\t\tthrow new Error(`Unknown algorithm ${id}`);\n\t\t}\n\t\treturn f;\n\t}\n\n\texport async function validate(password: string, hash: string) {\n\t\tlet res = await parse(hash);\n\t\tlet f = resolveAlgorithm(res.id);\n\t\treturn { result: await f.verify(password, hash, res), parsed: res };\n\t}\n\n\texport async function verify(password: string, hash: string) {\n\t\tlet res = await parse(hash);\n\t\tlet f = resolveAlgorithm(res.id);\n\t\treturn f.verify(password, hash, res);\n\t}\n\n\texport type PasswordHashOptions = PasswordAlgorithmHashOptions & { algorithm?: string | PasswordAlgorithm };\n\n\texport async function hash(password: string, { algorithm, ...opts }: PasswordHashOptions = {}) {\n\t\tlet f = resolveAlgorithm(algorithm ?? DefaultAlgorithm);\n\t\tlet id = algorithm ?? DefaultAlgorithm;\n\t\ttypeof id !== 'string' && (id = f.name);\n\t\treturn f.hash(password, { id, ...opts });\n\t}\n}\n"],"names":["Errors","createPBKDF2PasswordAlgorithm","PHC","Password","Algorithms","DefaultAlgorithm","setDefaultAlgorithm","algorithm","BadRequest","check","getDefaultAlgorithm","addAlgorithm","name","ids","id","digest","parse","hash","deserialize","resolveAlgorithm","f","Error","validate","password","res","result","verify","parsed","opts"],"mappings":"AAAA,SAASA,MAAM,QAAQ,eAAe;AACtC,SAASC,6BAA6B,QAAQ,kCAAkC;AAChF,SAASC,GAAG,QAAQ,QAAQ;UAEXC;IAkBhB,MAAMC,aAAyD;QAC9D,GAAG;QACH,MAAM;QACN,MAAM;QACN,MAAM;QACN,MAAM;QACN,GAAG;QACH,GAAG;QACH,GAAG;IACJ;IACA,IAAIC,mBAA2B;IAExB,SAASC,oBAAoBC,SAAiB;QACpDP,OAAOQ,UAAU,CAACC,KAAK,CAACL,UAAU,CAACG,UAAU,EAAE,CAAC,kBAAkB,EAAEA,WAAW;QAC/EF,mBAAmBE;IACpB;aAHgBD,sBAAAA;IAKT,SAASI;QACf,OAAOL;IACR;aAFgBK,sBAAAA;IAIT,SAASC,aAAaJ,SAA4B;QACxDH,UAAU,CAACG,UAAUK,IAAI,CAAC,GAAGL;QAC7B,IAAIA,UAAUM,GAAG,EAAE;YAClB,KAAK,MAAMC,MAAMP,UAAUM,GAAG,CAAE;gBAC/BT,UAAU,CAACU,GAAG,GAAGP;YAClB;QACD;IACD;aAPgBI,eAAAA;IAShBA,aAAaV,8BAA8B;QAAEa,IAAI;QAAUC,QAAQ;IAAU;IAC7EJ,aAAaV,8BAA8B;QAAEa,IAAI;QAAUC,QAAQ;IAAU;IAEtE,eAAeC,MAAMC,IAAY;QACvC,OAAOf,IAAIgB,WAAW,CAACD;IACxB;aAFsBD,QAAAA;IAItB,SAASG,iBAAiBL,EAA8B;QACvD,IAAIM,IAAIN;QACR,MAAO,OAAOM,MAAM,SAAU;YAC7BA,IAAIhB,UAAU,CAACgB,EAAE;QAClB;QACA,IAAI,CAACA,GAAG;YACP,MAAM,IAAIC,MAAM,CAAC,kBAAkB,EAAEP,IAAI;QAC1C;QACA,OAAOM;IACR;IAEO,eAAeE,SAASC,QAAgB,EAAEN,IAAY;QAC5D,IAAIO,MAAM,MAAMR,MAAMC;QACtB,IAAIG,IAAID,iBAAiBK,IAAIV,EAAE;QAC/B,OAAO;YAAEW,QAAQ,MAAML,EAAEM,MAAM,CAACH,UAAUN,MAAMO;YAAMG,QAAQH;QAAI;IACnE;aAJsBF,WAAAA;IAMf,eAAeI,OAAOH,QAAgB,EAAEN,IAAY;QAC1D,IAAIO,MAAM,MAAMR,MAAMC;QACtB,IAAIG,IAAID,iBAAiBK,IAAIV,EAAE;QAC/B,OAAOM,EAAEM,MAAM,CAACH,UAAUN,MAAMO;IACjC;aAJsBE,SAAAA;IAQf,eAAeT,KAAKM,QAAgB,EAAE,EAAEhB,SAAS,EAAE,GAAGqB,MAA2B,GAAG,CAAC,CAAC;QAC5F,IAAIR,IAAID,iBAAiBZ,aAAaF;QACtC,IAAIS,KAAKP,aAAaF;QACtB,OAAOS,OAAO,YAAaA,CAAAA,KAAKM,EAAER,IAAI,AAAD;QACrC,OAAOQ,EAAEH,IAAI,CAACM,UAAU;YAAET;YAAI,GAAGc,IAAI;QAAC;IACvC;aALsBX,OAAAA;AAMvB,GAtFiBd,aAAAA"}

package/lib/password/Password.test.js

@@ -32,12 +32,24 @@ function _async_to_generator(fn) {
 function _object_without_properties(source, excluded) {
     if (source == null)
         return {};
-    var target = _object_without_properties_loose(source, excluded);
-    var key, i;
+    var target = {}, sourceKeys, key, i;
+    if (typeof Reflect !== "undefined" && Reflect.ownKeys) {
+        sourceKeys = Reflect.ownKeys(source);
+        for (i = 0; i < sourceKeys.length; i++) {
+            key = sourceKeys[i];
+            if (excluded.indexOf(key) >= 0)
+                continue;
+            if (!Object.prototype.propertyIsEnumerable.call(source, key))
+                continue;
+            target[key] = source[key];
+        }
+        return target;
+    }
+    target = _object_without_properties_loose(source, excluded);
     if (Object.getOwnPropertySymbols) {
-        var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-        for (i = 0; i < sourceSymbolKeys.length; i++) {
-            key = sourceSymbolKeys[i];
+        sourceKeys = Object.getOwnPropertySymbols(source);
+        for (i = 0; i < sourceKeys.length; i++) {
+            key = sourceKeys[i];
             if (excluded.indexOf(key) >= 0)
                 continue;
             if (!Object.prototype.propertyIsEnumerable.call(source, key))
@@ -50,13 +62,13 @@ function _object_without_properties(source, excluded) {
 function _object_without_properties_loose(source, excluded) {
     if (source == null)
         return {};
-    var target = {};
-    var sourceKeys = Object.keys(source);
-    var key, i;
+    var target = {}, sourceKeys = Object.getOwnPropertyNames(source), key, i;
     for (i = 0; i < sourceKeys.length; i++) {
         key = sourceKeys[i];
         if (excluded.indexOf(key) >= 0)
             continue;
+        if (!Object.prototype.propertyIsEnumerable.call(source, key))
+            continue;
         target[key] = source[key];
     }
     return target;
@@ -71,9 +83,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function () {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function (v) {
@@ -167,13 +187,13 @@ import { createBase64PasswordAlgorithm } from "./createBase64PasswordAlgorithm.j
 import { createBcryptPasswordAlgorithm } from "./createBcryptPasswordAlgorithm.js";
 import { Password } from "./Password.js";
 describe("Password", function () {
-    var check = function (_param) {
+    var check = function (_0) {
         return _async_to_generator(function () {
-            var _param_password, password, rest, out, result;
+            var _0_password, password, rest, out, result;
             return _ts_generator(this, function (_state) {
                 switch (_state.label) {
                     case 0:
-                        _param_password = _param.password, password = _param_password === void 0 ? "1" : _param_password, rest = _object_without_properties(_param, [
+                        _0_password = _0.password, password = _0_password === void 0 ? "1" : _0_password, rest = _object_without_properties(_0, [
                             "password"
                         ]);
                         return [
@@ -255,20 +275,13 @@ describe("Password", function () {
                             })
                         ];
                     case 6:
-                        _state.sent();
-                        return [
-                            4,
-                            check({
-                                algorithm: "7"
-                            })
-                        ];
-                    case 7:
                         _state.sent();
                         return [
                             2
                         ];
                 }
             });
+            // await check({ algorithm: '7' });
         })();
     });
     test("should verify manual created hash", function () {