From 3d53d96d8021f7a1a5325436d187122ba4826164 Mon Sep 17 00:00:00 2001
From: "Juan Picado @jotadeveloper" <juanpicado19@gmail.com>
Date: Sat, 21 Oct 2017 23:02:31 +0200
Subject: [PATCH] refactor: remove inner references for local storage

---
 package.json       |  4 ++--
 src/lib/config.js  |  2 +-
 src/lib/search.js  |  2 +-
 src/lib/storage.js |  7 ++-----
 yarn.lock          | 13 ++++++++++---
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 72774ac7f..61f66941e 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,8 @@
     "verdaccio": "./bin/verdaccio"
   },
   "dependencies": {
-    "@verdaccio/file-locking": "^0.0.3",
-    "@verdaccio/local-storage": "0.0.6",
+    "@verdaccio/file-locking": "0.0.5",
+    "@verdaccio/local-storage": "0.0.8",
     "@verdaccio/streams": "^0.0.2",
     "@verdaccio/types": "0.0.4",
     "JSONStream": "^1.1.1",
diff --git a/src/lib/config.js b/src/lib/config.js
index 1afe54593..dc607483f 100644
--- a/src/lib/config.js
+++ b/src/lib/config.js
@@ -211,7 +211,7 @@ class Config {
    * @return {String}
    */
   checkSecretKey(secret) {
-    if (_.isNil(secret) === false) {
+    if (_.isNil(secret) === false && secret !== '') {
       this.secret = secret;
       return secret;
     }
diff --git a/src/lib/search.js b/src/lib/search.js
index 8247064e6..671655982 100644
--- a/src/lib/search.js
+++ b/src/lib/search.js
@@ -61,7 +61,7 @@ class Search {
    */
   reindex() {
     let self = this;
-    this.storage.get_local(function(err, packages) {
+    this.storage.getLocalDatabase(function(err, packages) {
       if (err) throw err; // that function shouldn't produce any
       let i = packages.length;
       while (i--) {
diff --git a/src/lib/storage.js b/src/lib/storage.js
index 5f87eb0f0..f3f5d2edf 100644
--- a/src/lib/storage.js
+++ b/src/lib/storage.js
@@ -37,9 +37,6 @@ class Storage {
     this.config = config;
     this._setupUpLinks(this.config);
     this.localStorage = new LocalStorage(config, Logger.logger, Utils);
-    this.localStorage.localList.data.secret = this.config.checkSecretKey(this.localStorage.localList.data.secret);
-    this.localStorage.localList.sync();
-    // an instance for local storage
     this.logger = Logger.logger.child();
   }
 
@@ -461,9 +458,9 @@ class Storage {
    * Retrieve only private local packages
    * @param {*} callback
    */
-  get_local(callback) {
+  getLocalDatabase(callback) {
     let self = this;
-    let locals = this.localStorage.localList.get();
+    let locals = this.localStorage.localData.get();
     let packages = [];
 
     const getPackage = function(i) {
diff --git a/yarn.lock b/yarn.lock
index 38b582ff8..625e42e55 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@verdaccio/file-locking@0.0.5":
+  version "0.0.5"
+  resolved "https://registry.npmjs.org/@verdaccio/file-locking/-/file-locking-0.0.5.tgz#6172dfa2f7094a1da8e4c14906bfa33836b5713d"
+  dependencies:
+    lockfile "1.0.3"
+    lodash "4.17.4"
+
 "@verdaccio/file-locking@^0.0.3":
   version "0.0.3"
   resolved "https://registry.npmjs.org/@verdaccio/file-locking/-/file-locking-0.0.3.tgz#32d3702ff5184d1d3893f0f1d47629ad33d1c113"
@@ -10,9 +17,9 @@
     lockfile "1.0.3"
     lodash "4.17.4"
 
-"@verdaccio/local-storage@0.0.6":
-  version "0.0.6"
-  resolved "https://registry.npmjs.org/@verdaccio/local-storage/-/local-storage-0.0.6.tgz#fae664f81fd71fd15c9d0c804a545b170fb9eaa0"
+"@verdaccio/local-storage@0.0.7":
+  version "0.0.7"
+  resolved "https://registry.npmjs.org/@verdaccio/local-storage/-/local-storage-0.0.7.tgz#3d1679b894028d598562e220809d1b1651ae3746"
   dependencies:
     "@verdaccio/file-locking" "^0.0.3"
     "@verdaccio/streams" "^0.0.2"