From b65f8c0105b28860ef8428df562710742cc96b8a Mon Sep 17 00:00:00 2001
From: joeuhren <46763106+joeuhren@users.noreply.github.com>
Date: Mon, 23 Nov 2020 21:01:18 -0700
Subject: [PATCH] Settings.wallet: convert old `user` & `pass` strings

---
 lib/settings.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/settings.js b/lib/settings.js
index f75a48a..c7e2a33 100644
--- a/lib/settings.js
+++ b/lib/settings.js
@@ -208,6 +208,18 @@ exports.reloadSettings = function reloadSettings() {
     //we know this setting, so we overwrite it
     if(exports[i] !== undefined)
     {
+      // This check uses old .user and .pass config strings if they exist, and .username, .password don't.
+      if (i == 'wallet')
+      {
+        if (!settings.wallet.hasOwnProperty('username') && settings.wallet.hasOwnProperty('user'))
+        {
+          settings.wallet.username = settings.wallet.user;
+        }
+        if (!settings.wallet.hasOwnProperty('password') && settings.wallet.hasOwnProperty('pass'))
+        {
+          settings.wallet.password = settings.wallet.pass;
+        }
+      }
       exports[i] = settings[i];
     }
     //this setting is unkown, output a warning and throw it away