@rytass/secret-adapter-vault-nestjs 0.1.4 → 0.2.0

package/README.md

@@ -23,7 +23,7 @@ class TestService {
 }
 
 @Module({
-  imports: [VaultModule],
+  imports: [VaultModule.forRoot({ path: '/', isGlobal: true })],
   providers: [TestService],
 })
 class TestModule {};

package/constants.d.ts

@@ -0,0 +1 @@
+export declare const VAULT_PATH_TOKEN: symbol;

package/constants.js

@@ -0,0 +1,3 @@
+const VAULT_PATH_TOKEN = Symbol('VAULT_PATH_TOKEN');
+
+export { VAULT_PATH_TOKEN };

package/index.cjs.js

@@ -4,47 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var common = require('@nestjs/common');
 var config = require('@nestjs/config');
-var regeneratorRuntime = require('regenerator-runtime');
 var secretAdapterVault = require('@rytass/secret-adapter-vault');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
+const VAULT_PATH_TOKEN = Symbol('VAULT_PATH_TOKEN');
 
-var regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(regeneratorRuntime);
-
-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 _asyncToGenerator(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 _classCallCheck$1(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
 var __decorate$1 = undefined && undefined.__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);
@@ -54,88 +17,90 @@ var __decorate$1 = undefined && undefined.__decorate || function(decorators, tar
 var __metadata = undefined && undefined.__metadata || function(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-exports.VaultService = /*#__PURE__*/ function() {
-    function VaultService(config) {
-        var _this = this;
-        _classCallCheck$1(this, VaultService);
+var __param = undefined && undefined.__param || function(paramIndex, decorator) {
+    return function(target, key) {
+        decorator(target, key, paramIndex);
+    };
+};
+exports.VaultService = class VaultService {
+    constructor(config, path){
         this.config = config;
         this.onReadyCallbacks = [];
-        var host = config.get("VAULT_HOST");
-        var user = config.get("VAULT_ACCOUNT");
-        var pass = config.get("VAULT_PASSWORD");
-        var path = config.get("VAULT_PATH");
+        this.fallbackToEnvFile = false;
+        const host = config.get('VAULT_HOST');
+        const user = config.get('VAULT_ACCOUNT');
+        const pass = config.get('VAULT_PASSWORD');
         this.manager = new secretAdapterVault.VaultSecret(path, {
-            host: host,
+            host,
             auth: {
                 account: user,
                 password: pass
             },
-            onReady: function() {
-                _this.onReadyCallbacks.forEach(function(done) {
-                    return done();
-                });
+            onError: (err)=>{
+                this.fallbackToEnvFile = true;
+                this.onReadyCallbacks.forEach((done)=>done(config));
+            },
+            onReady: ()=>{
+                this.onReadyCallbacks.forEach((done)=>done());
             }
         });
     }
-    var _proto = VaultService.prototype;
-    _proto.get = function get(key) {
-        var _this = this;
-        return _asyncToGenerator(regeneratorRuntime__default.mark(function _callee() {
-            return regeneratorRuntime__default.wrap(function _callee$(_ctx) {
-                while(1)switch(_ctx.prev = _ctx.next){
-                    case 0:
-                        if (!(_this.manager.state === secretAdapterVault.VaultSecretState.READY)) {
-                            _ctx.next = 2;
-                            break;
-                        }
-                        return _ctx.abrupt("return", _this.manager.get(key));
-                    case 2:
-                        return _ctx.abrupt("return", new Promise(function(resolve) {
-                            _this.onReadyCallbacks.push(function() {
-                                resolve(_this.manager.get(key));
-                            });
-                        }));
-                    case 3:
-                    case "end":
-                        return _ctx.stop();
-                }
-            }, _callee);
-        }))();
-    };
-    return VaultService;
-}();
+    async get(key) {
+        if (this.fallbackToEnvFile) {
+            return Promise.resolve(this.config.get(key) || '');
+        }
+        if (this.manager.state === secretAdapterVault.VaultSecretState.READY) {
+            return this.manager.get(key);
+        }
+        return new Promise((resolve)=>{
+            this.onReadyCallbacks.push((dataSource = this.manager)=>{
+                resolve(dataSource.get(key));
+            });
+        });
+    }
+};
 exports.VaultService = __decorate$1([
     common.Injectable(),
+    __param(1, common.Inject(VAULT_PATH_TOKEN)),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [
-        typeof config.ConfigService === "undefined" ? Object : config.ConfigService
+        typeof config.ConfigService === "undefined" ? Object : config.ConfigService,
+        String
     ])
 ], exports.VaultService);
 
-function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
 var __decorate = undefined && undefined.__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;
 };
-exports.VaultModule = function VaultModule() {
-    _classCallCheck(this, VaultModule);
+exports.VaultModule = class VaultModule1 {
+    static forRoot(options = {
+        path: '/'
+    }) {
+        return {
+            imports: [
+                config.ConfigModule.forRoot({
+                    envFilePath: options.cacheFile
+                }), 
+            ],
+            module: exports.VaultModule,
+            providers: [
+                config.ConfigService,
+                {
+                    provide: VAULT_PATH_TOKEN,
+                    useValue: options.path
+                },
+                exports.VaultService, 
+            ],
+            exports: [
+                exports.VaultService
+            ]
+        };
+    }
 };
 exports.VaultModule = __decorate([
-    common.Module({
-        imports: [
-            config.ConfigModule.forRoot()
-        ],
-        providers: [
-            exports.VaultService
-        ],
-        exports: [
-            exports.VaultService
-        ]
-    })
+    common.Global(),
+    common.Module({})
 ], exports.VaultModule);

package/interfaces.d.ts

@@ -0,0 +1,4 @@
+export interface VaultModuleOptions {
+    path: string;
+    cacheFile?: string;
+}

package/module.d.ts

@@ -1,2 +1,5 @@
+import { DynamicModule } from '@nestjs/common';
+import { VaultModuleOptions } from './interfaces';
 export declare class VaultModule {
+    static forRoot(options?: VaultModuleOptions): DynamicModule;
 }

package/module.js

@@ -1,33 +1,42 @@
-import { Module } from '@nestjs/common';
-import { ConfigModule } from '@nestjs/config';
+import { Global, Module } from '@nestjs/common';
+import { ConfigModule, ConfigService } from '@nestjs/config';
+import { VAULT_PATH_TOKEN } from './constants.js';
 import { VaultService } from './service.js';
 
-function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
 var __decorate = undefined && undefined.__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 VaultModule = function VaultModule() {
-    _classCallCheck(this, VaultModule);
+let VaultModule = class VaultModule1 {
+    static forRoot(options = {
+        path: '/'
+    }) {
+        return {
+            imports: [
+                ConfigModule.forRoot({
+                    envFilePath: options.cacheFile
+                }), 
+            ],
+            module: VaultModule,
+            providers: [
+                ConfigService,
+                {
+                    provide: VAULT_PATH_TOKEN,
+                    useValue: options.path
+                },
+                VaultService, 
+            ],
+            exports: [
+                VaultService
+            ]
+        };
+    }
 };
 VaultModule = __decorate([
-    Module({
-        imports: [
-            ConfigModule.forRoot()
-        ],
-        providers: [
-            VaultService
-        ],
-        exports: [
-            VaultService
-        ]
-    })
+    Global(),
+    Module({})
 ], VaultModule);
 
 export { VaultModule };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rytass/secret-adapter-vault-nestjs",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "description": "Rytass Sceret Vault nestjs adapter",
   "keywords": [
     "rytass",
@@ -24,13 +24,14 @@
     "reflect-metadata": "^0.1.13"
   },
   "dependencies": {
-    "@rytass/secret-adapter-vault": "^0.1.2",
-    "regenerator-runtime": "^0.13.9"
+    "@rytass/secret-adapter-vault": "^0.2.0",
+    "regenerator-runtime": "^0.13.11"
   },
   "devDependencies": {
-    "@nestjs/common": "^9.0.11",
-    "@nestjs/config": "^2.2.0",
-    "axios": "^0.27.2",
+    "@nestjs/common": "^9.4.1",
+    "@nestjs/config": "^2.3.2",
+    "@nestjs/core": "^9.4.1",
+    "axios": "^1.4.0",
     "reflect-metadata": "^0.1.13"
   },
   "main": "./index.cjs.js",

package/service.d.ts

@@ -3,6 +3,7 @@ export declare class VaultService {
     private readonly config;
     private readonly manager;
     private readonly onReadyCallbacks;
-    constructor(config: ConfigService);
+    private fallbackToEnvFile;
+    constructor(config: ConfigService, path: string);
     get<T = string>(key: string): Promise<T>;
 }

package/service.js

@@ -1,42 +1,8 @@
-import regeneratorRuntime from 'regenerator-runtime';
-import { Injectable } from '@nestjs/common';
+import { Injectable, Inject } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { VaultSecretState, VaultSecret } from '@rytass/secret-adapter-vault';
+import { VaultSecret, VaultSecretState } from '@rytass/secret-adapter-vault';
+import { VAULT_PATH_TOKEN } from './constants.js';
 
-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 _asyncToGenerator(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 _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
 var __decorate = undefined && undefined.__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);
@@ -46,61 +12,55 @@ var __decorate = undefined && undefined.__decorate || function(decorators, targe
 var __metadata = undefined && undefined.__metadata || function(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var VaultService = /*#__PURE__*/ function() {
-    function VaultService(config) {
-        var _this = this;
-        _classCallCheck(this, VaultService);
+var __param = undefined && undefined.__param || function(paramIndex, decorator) {
+    return function(target, key) {
+        decorator(target, key, paramIndex);
+    };
+};
+let VaultService = class VaultService {
+    constructor(config, path){
         this.config = config;
         this.onReadyCallbacks = [];
-        var host = config.get("VAULT_HOST");
-        var user = config.get("VAULT_ACCOUNT");
-        var pass = config.get("VAULT_PASSWORD");
-        var path = config.get("VAULT_PATH");
+        this.fallbackToEnvFile = false;
+        const host = config.get('VAULT_HOST');
+        const user = config.get('VAULT_ACCOUNT');
+        const pass = config.get('VAULT_PASSWORD');
         this.manager = new VaultSecret(path, {
-            host: host,
+            host,
             auth: {
                 account: user,
                 password: pass
             },
-            onReady: function() {
-                _this.onReadyCallbacks.forEach(function(done) {
-                    return done();
-                });
+            onError: (err)=>{
+                this.fallbackToEnvFile = true;
+                this.onReadyCallbacks.forEach((done)=>done(config));
+            },
+            onReady: ()=>{
+                this.onReadyCallbacks.forEach((done)=>done());
             }
         });
     }
-    var _proto = VaultService.prototype;
-    _proto.get = function get(key) {
-        var _this = this;
-        return _asyncToGenerator(regeneratorRuntime.mark(function _callee() {
-            return regeneratorRuntime.wrap(function _callee$(_ctx) {
-                while(1)switch(_ctx.prev = _ctx.next){
-                    case 0:
-                        if (!(_this.manager.state === VaultSecretState.READY)) {
-                            _ctx.next = 2;
-                            break;
-                        }
-                        return _ctx.abrupt("return", _this.manager.get(key));
-                    case 2:
-                        return _ctx.abrupt("return", new Promise(function(resolve) {
-                            _this.onReadyCallbacks.push(function() {
-                                resolve(_this.manager.get(key));
-                            });
-                        }));
-                    case 3:
-                    case "end":
-                        return _ctx.stop();
-                }
-            }, _callee);
-        }))();
-    };
-    return VaultService;
-}();
+    async get(key) {
+        if (this.fallbackToEnvFile) {
+            return Promise.resolve(this.config.get(key) || '');
+        }
+        if (this.manager.state === VaultSecretState.READY) {
+            return this.manager.get(key);
+        }
+        return new Promise((resolve)=>{
+            this.onReadyCallbacks.push((dataSource = this.manager)=>{
+                resolve(dataSource.get(key));
+            });
+        });
+    }
+};
 VaultService = __decorate([
     Injectable(),
+    __param(1, Inject(VAULT_PATH_TOKEN)),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [
-        typeof ConfigService === "undefined" ? Object : ConfigService
+        typeof ConfigService === "undefined" ? Object : ConfigService,
+        String
     ])
 ], VaultService);