Fixed long time bug on settings ecryption using old option "password"…

… instead of "key".
igoramadas · Sep 30, 2016 · e65ed8a · e65ed8a
1 parent 5ffd62a
commit e65ed8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/lib/settings.coffee b/lib/settings.coffee
@@ -106,11 +106,6 @@ class Settings
         options = {} if not options?
         options = lodash.defaults options, {cipher: "aes256", key: env["EXPRESSER_SETTINGS_CRYPTOKEY"]}
         options.key = "ExpresserSettings" if not options.key? or options.key is ""
-
-        # Option 'password' is deprecated, now replaced by 'key'.
-        if options.password? and not options.key?
-            console.warn "Settings.cryptoHelper", "Option 'password'' is deprecated, please use 'key' to set the encryption key."
-
         settingsJson = @loadFromJson filename, false
 
         # Settings file not found or invalid? Stop here.
@@ -147,7 +142,7 @@ class Settings
                                 newValue = "string:"
 
                             # Create cipher amd encrypt data.
-                            c = crypto.createCipher options.cipher, options.password
+                            c = crypto.createCipher options.cipher, options.key
                             newValue += c.update currentValue.toString(), @general.encoding, "hex"
                             newValue += c.final "hex"
 
@@ -158,7 +153,7 @@ class Settings
                             newValue = ""
 
                             # Create cipher and decrypt.
-                            c = crypto.createDecipher options.cipher, options.password
+                            c = crypto.createDecipher options.cipher, options.key
                             newValue += c.update arrValue[1], "hex", @general.encoding
                             newValue += c.final @general.encoding
 

diff --git a/test/settings.js b/test/settings.js
@@ -86,7 +86,7 @@ describe("Settings Tests", function() {
         if (!encrypted.encrypted) {
             return callback("Property 'encrypted' was not properly set.")
         } else if (encrypted.app.title == "Expresser Settings Encryption") {
-            return callback("Encryption failed, settings.general.appTitle is still set as 'Expresser'.")
+            return callback("Encryption failed, settings.app.title is still set as 'Expresser'.")
         }
 
         settings.decrypt(filename);