@webda/core 2.0.0-beta.2 → 2.0.0-beta.3

package/lib/services/cryptoservice.js

@@ -0,0 +1,346 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CryptoService = exports.CryptoServiceParameters = void 0;
+const crypto_1 = require("crypto");
+const jwt = require("jsonwebtoken");
+const pem_jwk_1 = require("pem-jwk");
+const serializers_1 = require("../utils/serializers");
+const service_1 = require("./service");
+class CryptoServiceParameters extends service_1.ServiceParameters {
+    constructor(params) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _p, _q, _r, _s, _t, _u, _v, _w;
+        super(params);
+        (_a = this.symetricKeyLength) !== null && _a !== void 0 ? _a : (this.symetricKeyLength = 256);
+        (_b = this.symetricCipher) !== null && _b !== void 0 ? _b : (this.symetricCipher = "aes-256-ctr");
+        (_c = this.asymetricType) !== null && _c !== void 0 ? _c : (this.asymetricType = "rsa");
+        (_d = this.asymetricOptions) !== null && _d !== void 0 ? _d : (this.asymetricOptions = {});
+        (_e = (_p = this.asymetricOptions).modulusLength) !== null && _e !== void 0 ? _e : (_p.modulusLength = 2048);
+        (_f = (_q = this.asymetricOptions).privateKeyEncoding) !== null && _f !== void 0 ? _f : (_q.privateKeyEncoding = {});
+        (_g = (_r = this.asymetricOptions.privateKeyEncoding).format) !== null && _g !== void 0 ? _g : (_r.format = "pem");
+        (_h = (_s = this.asymetricOptions.privateKeyEncoding).type) !== null && _h !== void 0 ? _h : (_s.type = "pkcs8");
+        (_j = (_t = this.asymetricOptions).publicKeyEncoding) !== null && _j !== void 0 ? _j : (_t.publicKeyEncoding = {});
+        (_k = (_u = this.asymetricOptions.publicKeyEncoding).format) !== null && _k !== void 0 ? _k : (_u.format = "pem");
+        (_l = (_v = this.asymetricOptions.publicKeyEncoding).type) !== null && _l !== void 0 ? _l : (_v.type = "spki");
+        (_m = this.jwt) !== null && _m !== void 0 ? _m : (this.jwt = {});
+        (_o = (_w = this.jwt).algorithm) !== null && _o !== void 0 ? _o : (_w.algorithm = "HS256");
+    }
+}
+exports.CryptoServiceParameters = CryptoServiceParameters;
+/**
+ * @WebdaModda
+ */
+class CryptoService extends service_1.Service {
+    constructor() {
+        super(...arguments);
+        /**
+         * JWKS cache
+         */
+        this.jwks = {};
+    }
+    /**
+     * @override
+     */
+    loadParameters(params) {
+        return new CryptoServiceParameters(params);
+    }
+    /**
+     * @override
+     */
+    init() {
+        const _super = Object.create(null, {
+            init: { get: () => super.init }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield _super.init.call(this);
+            // Load keys
+            if (!(yield this.load()) && this.parameters.autoRotate) {
+                yield this.rotate();
+            }
+            if (this.parameters.expose) {
+                this.addRoute(this.parameters.expose, ["GET"], this.serveJWKS);
+            }
+            return this;
+        });
+    }
+    /**
+     *
+     */
+    serveJWKS(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            context.write({
+                keys: Object.keys(this.keys).map(k => {
+                    if (!this.jwks[k]) {
+                        /*
+                          when Node >= 16
+                          this.jwks[k] = createPublicKey(this.keys[k].publicKey).export({ format: "jwk" });
+                          and remove pem-jwk
+                          */
+                        this.jwks[k] = (0, pem_jwk_1.pem2jwk)(this.keys[k].publicKey);
+                    }
+                    return {
+                        kty: "RSA",
+                        kid: k,
+                        n: this.jwks[k].n,
+                        e: this.jwks[k].e
+                    };
+                })
+            });
+        });
+    }
+    /**
+     * Load keys from registry
+     */
+    load() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let load = yield this.registry.get("keys");
+            if (!load) {
+                return false;
+            }
+            this.keys = {};
+            Object.keys(load)
+                .filter(k => k.startsWith("key_"))
+                .forEach(k => {
+                this.keys[k.substring(4)] = load[k];
+            });
+            this.current = load.current.startsWith("init-") ? undefined : load.current;
+            this.age = parseInt(this.current, 36);
+            return true;
+        });
+    }
+    /**
+     * Generate asymetric key
+     * @returns
+     */
+    generateAsymetricKeys() {
+        const { publicKey, privateKey } = (0, crypto_1.generateKeyPairSync)(
+        // @ts-ignore
+        this.parameters.asymetricType, this.parameters.asymetricOptions);
+        return { publicKey, privateKey };
+    }
+    /**
+     * Generate symetric key
+     * @returns
+     */
+    generateSymetricKey() {
+        return (0, crypto_1.randomBytes)(this.parameters.symetricKeyLength / 8).toString("base64");
+    }
+    /**
+     * Return current key set
+     */
+    getCurrentKeys() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.keys || !this.current || !this.keys[this.current]) {
+                throw new Error("CryptoService not initialized");
+            }
+            return { keys: this.keys[this.current], id: this.current };
+        });
+    }
+    /**
+     * Retrieve a HMAC for a string
+     * @param data
+     * @param keyId to use
+     * @returns
+     */
+    hmac(data, keyId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (typeof data !== "string") {
+                data = serializers_1.JSONUtils.stringify(data);
+            }
+            let key = keyId ? { id: keyId, keys: this.keys[keyId] } : yield this.getCurrentKeys();
+            return key.id + "." + (0, crypto_1.createHmac)("sha256", key.keys.symetric).update(data).digest("hex");
+        });
+    }
+    /**
+     * Verify a HMAC for a string
+     * @param data
+     * @returns
+     */
+    hmacVerify(data, hmac) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (typeof data !== "string") {
+                data = serializers_1.JSONUtils.stringify(data);
+            }
+            let [keyId, mac] = hmac.split(".");
+            if (!(yield this.checkKey(keyId))) {
+                return false;
+            }
+            return (0, crypto_1.createHmac)("sha256", this.keys[keyId].symetric).update(data).digest("hex") === mac;
+        });
+    }
+    /**
+     * JWT token generation
+     */
+    jwtSign(data, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let res = Object.assign(Object.assign({}, this.parameters.jwt), options);
+            let key = res.secretOrPublicKey;
+            // Default to our current private key
+            if (!res.secretOrPublicKey) {
+                let keyInfo = yield this.getCurrentKeys();
+                // Depending on the algo fallback to the right key
+                if (res.algorithm.startsWith("HS")) {
+                    key = keyInfo.keys.symetric;
+                    res.keyid = "S" + keyInfo.id;
+                }
+                else {
+                    key = keyInfo.keys.privateKey;
+                    res.keyid = "A" + keyInfo.id;
+                }
+            }
+            delete res.secretOrPublicKey;
+            return jwt.sign(data, key, res);
+        });
+    }
+    /**
+     *
+     * @param keyId
+     * @returns
+     */
+    checkKey(keyId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.keys[keyId]) {
+                // Key is more recent than current one so try to reload
+                if (parseInt(keyId, 36) > this.age) {
+                    yield this.load();
+                }
+                // Key is still not found
+                if (!this.keys[keyId]) {
+                    return false;
+                }
+            }
+            return true;
+        });
+    }
+    /**
+     * Get JWT key based on kid
+     */
+    getJWTKey(header, callback) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!header.kid) {
+                callback(new Error("Unknown key"));
+                return;
+            }
+            let keyId = header.kid.substring(1);
+            if (!(yield this.checkKey(keyId))) {
+                callback(new Error("Unknown key"));
+                return;
+            }
+            // Check first letter that define Symetric or Asymetric
+            if (header.kid.startsWith("S")) {
+                callback(null, this.keys[keyId].symetric);
+            }
+            else if (header.kid.startsWith("A")) {
+                callback(null, this.keys[keyId].publicKey);
+            }
+            else {
+                callback(new Error("Unknown key"));
+            }
+        });
+    }
+    /**
+     * JWT token verification
+     */
+    jwtVerify(token, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                jwt.verify(token, (options === null || options === void 0 ? void 0 : options.secretOrPublicKey) || this.getJWTKey.bind(this), Object.assign(Object.assign({}, options), { secretOrPublicKey: undefined }), (err, result) => {
+                    if (err) {
+                        reject(err);
+                    }
+                    else {
+                        resolve(result);
+                    }
+                });
+            });
+        });
+    }
+    /**
+     * Encrypt data
+     */
+    encrypt(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let key = yield this.getCurrentKeys();
+            // Initialization Vector
+            let iv = (0, crypto_1.randomBytes)(16);
+            let cipher = (0, crypto_1.createCipheriv)(this.parameters.symetricCipher, Buffer.from(key.keys.symetric, "base64"), iv);
+            let encrypted = Buffer.concat([iv, cipher.update(Buffer.from(JSON.stringify(data))), cipher.final()]).toString("base64");
+            return this.jwtSign(encrypted, { keyid: `S${key.id}`, secretOrPublicKey: key.keys.symetric });
+        });
+    }
+    /**
+     * Parse the JWT header section
+     */
+    getJWTHeader(token) {
+        return JSON.parse(Buffer.from(token.split(".")[0], "base64").toString());
+    }
+    /**
+     * Decrypt data
+     */
+    decrypt(token) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let input = Buffer.from(yield this.jwtVerify(token), "base64");
+            let header = this.getJWTHeader(token);
+            let iv = input.slice(0, 16);
+            let decipher = (0, crypto_1.createDecipheriv)(this.parameters.symetricCipher, Buffer.from(this.keys[header.kid.substring(1)].symetric, "base64"), iv);
+            return JSON.parse(decipher.update(input.slice(16)).toString() + decipher.final().toString());
+        });
+    }
+    /**
+     * Get next id
+     */
+    getNextId() {
+        // Should be good for years as 8char
+        let age = Math.floor(Date.now() / 1000);
+        return { age, id: age.toString(36) };
+    }
+    /**
+     * Rotate keys
+     */
+    rotate() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const { age, id } = this.getNextId();
+            let next = {
+                current: id,
+                rotationInstance: this.getWebda().getInstanceId()
+            };
+            next[`key_${id}`] = Object.assign(Object.assign({}, this.generateAsymetricKeys()), { symetric: this.generateSymetricKey() });
+            if (!(yield this.registry.exists("keys"))) {
+                this.current = `init-${this.getWebda().getInstanceId()}`;
+                yield this.registry.put("keys", { current: this.current });
+            }
+            if (yield this.registry.conditionalPatch("keys", next, "current", this.current)) {
+                (_a = this.keys) !== null && _a !== void 0 ? _a : (this.keys = {});
+                this.keys[id] = next[`key_${id}`];
+                this.current = id;
+                this.age = age;
+            }
+            else {
+                // Reload as something else has modified
+                yield this.load();
+            }
+        });
+    }
+}
+__decorate([
+    (0, service_1.Inject)("Registry")
+], CryptoService.prototype, "registry", void 0);
+exports.default = CryptoService;
+exports.CryptoService = CryptoService;
+//# sourceMappingURL=cryptoservice.js.map

package/lib/services/cryptoservice.js.map

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

package/lib/services/cryptoservice.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/services/cryptoservice.spec.js

@@ -0,0 +1,164 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const mocha_1 = require("@testdeck/mocha");
+const assert = require("assert");
+const jwt = require("jsonwebtoken");
+const sinon = require("sinon");
+const test_1 = require("../test");
+const serializers_1 = require("../utils/serializers");
+/**
+ *
+ */
+let CryptoServiceTest = class CryptoServiceTest extends test_1.WebdaTest {
+    hmac() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let hmac = yield this.webda.getCrypto().hmac({ test: "plop" });
+            let hmacString = yield this.webda.getCrypto().hmac(serializers_1.JSONUtils.stringify({ test: "plop" }));
+            assert.strictEqual(hmac, hmacString);
+            yield this.webda.getCrypto().hmacVerify({ test: "plop" }, hmac);
+            yield this.webda.getCrypto().hmacVerify(serializers_1.JSONUtils.stringify({ test: "plop" }), hmac);
+        });
+    }
+    encryption() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let encrypted = yield this.webda.getCrypto().encrypt({ test: "plop" });
+            let decrypted = yield this.webda.getCrypto().decrypt(encrypted);
+            assert.strictEqual(decrypted.test, "plop");
+        });
+    }
+    rotate() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const crypto = this.webda.getCrypto();
+            let encrypted = yield crypto.encrypt({ test: "plop" });
+            let oldKey = crypto.current;
+            let hmac = yield crypto.hmac({ test: "plop" });
+            sinon.stub(crypto, "getNextId").callsFake(this.nextIdStub(crypto));
+            yield crypto.rotate();
+            let decrypted = yield crypto.decrypt(encrypted);
+            assert.strictEqual(decrypted.test, "plop");
+            yield crypto.hmacVerify({ test: "plop" }, hmac);
+            assert.strictEqual(yield crypto.hmac({ test: "plop" }, oldKey), hmac);
+        });
+    }
+    failedRotation() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Check failed rotate
+            yield this.webda.getRegistry().patch({ uuid: "keys", current: "123" });
+            yield this.webda.getCrypto().rotate();
+        });
+    }
+    /**
+     * Increment by one every time
+     */
+    nextIdStub(crypto) {
+        return () => {
+            let age = parseInt(crypto.current, 36) + 10;
+            return {
+                id: age.toString(36),
+                age
+            };
+        };
+    }
+    jwks() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const crypto = this.webda.getCrypto();
+            crypto.getParameters().expose = "/jwk";
+            yield crypto.init();
+            let ctx = yield this.newContext();
+            yield this.execute(ctx, "test.webda.io", "GET", "/jwk");
+            let body = JSON.parse(ctx.getResponseBody());
+            sinon.stub(crypto, "getNextId").callsFake(this.nextIdStub(crypto));
+            assert.strictEqual(body.keys.length, 1);
+            yield crypto.rotate();
+            yield this.execute(ctx, "test.webda.io", "GET", "/jwk");
+            body = JSON.parse(ctx.getResponseBody());
+            assert.strictEqual(body.keys.length, 2);
+        });
+    }
+    unknownKeys() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const crypto = this.webda.getCrypto();
+            // Custom made JWT
+            let jwtToken = jwt.sign("TEST", "test");
+            yield assert.rejects(() => crypto.jwtVerify(jwtToken), /Unknown key/);
+            jwtToken = jwt.sign("TEST", "test", { keyid: "B" + crypto.current });
+            yield assert.rejects(() => crypto.jwtVerify(jwtToken), /Unknown key/);
+            assert.ok(!(yield crypto.hmacVerify("mydata", "md.ss")));
+            let oldKey = crypto.current;
+            sinon.stub(crypto, "getNextId").callsFake(this.nextIdStub(crypto));
+            yield crypto.rotate();
+            let encrypted = yield this.webda.getCrypto().encrypt({ test: "plop" });
+            delete crypto.keys[crypto.current];
+            crypto.current = oldKey;
+            crypto.age = parseInt(oldKey, 36); // It should be reloaded
+            assert.strictEqual((yield this.webda.getCrypto().decrypt(encrypted)).test, "plop");
+            // Remove again but remove it from the registry now
+            yield this.webda.getRegistry().removeAttribute("keys", `key_${crypto.current}`);
+            delete crypto.keys[crypto.current];
+            crypto.current = oldKey;
+            crypto.age = parseInt(oldKey, 36);
+            yield assert.rejects(() => this.webda.getCrypto().decrypt(encrypted), /err/);
+        });
+    }
+    jwt() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Test asymetric JWT
+            const crypto = this.webda.getCrypto();
+            let token = yield crypto.jwtSign("plop", { algorithm: "PS256" });
+            assert.strictEqual(yield crypto.jwtVerify(token), "plop");
+            token = yield crypto.jwtSign("plop");
+            assert.strictEqual(yield crypto.jwtVerify(token), "plop");
+            token = yield crypto.jwtSign("plop", { algorithm: "HS256" });
+            assert.strictEqual(yield crypto.jwtVerify(token), "plop");
+        });
+    }
+    cov() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.webda.getCrypto().keys = undefined;
+            yield assert.rejects(() => this.webda.getCrypto().getCurrentKeys(), /not initialized/);
+        });
+    }
+};
+__decorate([
+    mocha_1.test
+], CryptoServiceTest.prototype, "hmac", null);
+__decorate([
+    mocha_1.test
+], CryptoServiceTest.prototype, "encryption", null);
+__decorate([
+    mocha_1.test
+], CryptoServiceTest.prototype, "rotate", null);
+__decorate([
+    mocha_1.test
+], CryptoServiceTest.prototype, "failedRotation", null);
+__decorate([
+    mocha_1.test
+], CryptoServiceTest.prototype, "jwks", null);
+__decorate([
+    mocha_1.test
+], CryptoServiceTest.prototype, "unknownKeys", null);
+__decorate([
+    mocha_1.test
+], CryptoServiceTest.prototype, "jwt", null);
+__decorate([
+    mocha_1.test
+], CryptoServiceTest.prototype, "cov", null);
+CryptoServiceTest = __decorate([
+    mocha_1.suite
+], CryptoServiceTest);
+//# sourceMappingURL=cryptoservice.spec.js.map

package/lib/services/cryptoservice.spec.js.map

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

package/lib/services/filebinary.d.ts

@@ -3,6 +3,7 @@ import { Readable } from "stream";
 import { CloudBinary, CloudBinaryParameters, CoreModel } from "..";
 import { Context } from "../utils/context";
 import { Binary, BinaryFile, BinaryMap } from "./binary";
+import CryptoService from "./cryptoservice";
 import { ServiceParameters } from "./service";
 export declare class FileBinaryParameters extends CloudBinaryParameters {
     /**
@@ -32,6 +33,10 @@ export declare class FileBinaryParameters extends CloudBinaryParameters {
  * @WebdaModda
  */
 export declare class FileBinary<T extends FileBinaryParameters = FileBinaryParameters> extends CloudBinary<T> {
+    /**
+     * Used for hmac
+     */
+    cryptoService: CryptoService;
     /**
      * Load parameters
      *
@@ -69,7 +74,7 @@ export declare class FileBinary<T extends FileBinaryParameters = FileBinaryParam
      * @param ctx
      * @param expiresIn
      */
-    getToken(hash: string, method: "PUT" | "GET", expiresIn?: number): any;
+    getToken(hash: string, method: "PUT" | "GET", expiresIn?: number): Promise<string>;
     /**
      * Get put URL
      * @param ctx

package/lib/services/filebinary.js

@@ -1,4 +1,10 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -11,10 +17,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileBinary = exports.FileBinaryParameters = void 0;
 const fs = require("fs");
-const jwt = require("jsonwebtoken");
 const path_1 = require("path");
 const __1 = require("..");
 const binary_1 = require("./binary");
+const service_1 = require("./service");
 class FileBinaryParameters extends __1.CloudBinaryParameters {
     constructor(params, service) {
         var _a;
@@ -114,7 +120,7 @@ class FileBinary extends __1.CloudBinary {
             const { hash } = ctx.getPathParameters();
             // Verify token
             try {
-                let dt = jwt.verify(ctx.parameter("token"), this.getWebda().getSecret());
+                let dt = yield this.cryptoService.jwtVerify(ctx.parameter("token"));
                 if (dt.hash !== hash) {
                     throw 403;
                 }
@@ -153,7 +159,7 @@ class FileBinary extends __1.CloudBinary {
         return __awaiter(this, void 0, void 0, function* () {
             return `${context
                 .getHttpContext()
-                .getAbsoluteUrl(this.parameters.expose.url + "/download/data/" + map.hash)}?token=${this.getToken(map.hash, "GET", expires)}&content-type=${map.mimetype}&content-disposition=attachment`;
+                .getAbsoluteUrl(this.parameters.expose.url + "/download/data/" + map.hash)}?token=${yield this.getToken(map.hash, "GET", expires)}&content-type=${map.mimetype}&content-disposition=attachment`;
         });
     }
     /**
@@ -184,8 +190,10 @@ class FileBinary extends __1.CloudBinary {
      * @param expiresIn
      */
     getToken(hash, method, expiresIn = 60) {
-        return jwt.sign({ hash, method }, this.getWebda().getSecret(), {
-            expiresIn
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.cryptoService.jwtSign({ hash, method }, {
+                expiresIn
+            });
         });
     }
     /**
@@ -198,7 +206,7 @@ class FileBinary extends __1.CloudBinary {
             let body = yield ctx.getRequestBody();
             // Get a full URL, this method should be in a Route Object
             // Add a JWT token for 60s
-            let token = this.getToken(body.hash, "PUT");
+            let token = yield this.getToken(body.hash, "PUT");
             return ctx
                 .getHttpContext()
                 .getAbsoluteUrl(this.parameters.expose.url + "/upload/data/" + body.hash + `?token=${token}`);
@@ -262,7 +270,7 @@ class FileBinary extends __1.CloudBinary {
             }
             // Verify token
             try {
-                let dt = jwt.verify(ctx.parameter("token"), this.getWebda().getSecret());
+                let dt = yield this.cryptoService.jwtVerify(ctx.parameter("token"));
                 if (dt.hash !== result.hash) {
                     this.log("WARN", "JWT hash differ", ctx.parameter("hash"), "!==", result.hash);
                     throw 403;
@@ -395,5 +403,8 @@ class FileBinary extends __1.CloudBinary {
         });
     }
 }
+__decorate([
+    (0, service_1.Inject)("CryptoService")
+], FileBinary.prototype, "cryptoService", void 0);
 exports.FileBinary = FileBinary;
 //# sourceMappingURL=filebinary.js.map