diff --git a/src/lib/local-storage.js b/src/lib/local-storage.js index 01b82dfd4..386f081b7 100644 --- a/src/lib/local-storage.js +++ b/src/lib/local-storage.js @@ -50,29 +50,7 @@ class LocalStorage implements IStorage { this.logger = logger.child({sub: 'fs'}); this.config = config; this.localData = this._loadStorage(config, logger); - config.secret = config.checkSecretKey(this.localData.getSecret()); - this.localData.setSecret(this.config.secret); - } - - _loadStorage(config: Config, logger: Logger) { - const Storage = this._loadStorePlugin(); - - if (_.isNil(Storage)) { - return new LocalDatabase(this.config, logger); - } else { - return Storage; - } - } - - _loadStorePlugin() { - const plugin_params = { - config: this.config, - logger: this.logger, - }; - - return _.head(loadPlugin(this.config, this.config.store, plugin_params, function(plugin) { - return plugin.getPackageStorage; - })); + this._setSecret(config); } addPackage(name: string, pkg: Package, callback: Callback) { @@ -857,6 +835,32 @@ class LocalStorage implements IStorage { hash.url = UrlNode.format(tarballUrl); } } + + _setSecret(config: Config) { + this.localData.setSecret(config.checkSecretKey(this.localData.getSecret())); + } + + _loadStorage(config: Config, logger: Logger) { + const Storage = this._loadStorePlugin(); + + if (_.isNil(Storage)) { + return new LocalDatabase(this.config, logger); + } else { + return Storage; + } + } + + _loadStorePlugin() { + const plugin_params = { + config: this.config, + logger: this.logger, + }; + + return _.head(loadPlugin(this.config, this.config.store, plugin_params, function(plugin) { + return plugin.getPackageStorage; + })); + } + } export default LocalStorage;