Multiple login fix for DEFAULT authtype

5 years ago · e023448656
parent a881d85328
commit e023448656
6 changed files with 13 additions and 11 deletions
--- a/angular/index.html
+++ b/angular/index.html
@ -9,5 +9,5 @@
 <link rel="stylesheet" href="styles.41a6644c686ce68dce93.css"></head>
 <body>
  <rtl-app></rtl-app>
-<script src="runtime.c588f78aaf36ce63d59d.js"></script><script src="polyfills-es5.763f4f23e8aee5ec234d.js" nomodule></script><script src="polyfills.e59b6f9dc696bd89cf7f.js"></script><script src="main.23f7c8bc7bb9dd44ff2c.js"></script></body>
+<script src="runtime.c588f78aaf36ce63d59d.js"></script><script src="polyfills-es5.763f4f23e8aee5ec234d.js" nomodule></script><script src="polyfills.e59b6f9dc696bd89cf7f.js"></script><script src="main.a3cb129dcb290bbeab73.js"></script></body>
 </html>
--- a/angular/main.a3cb129dcb290bbeab73.js
+++ b/angular/main.a3cb129dcb290bbeab73.js
--- a/controllers/authenticate.js
+++ b/controllers/authenticate.js
@ -7,6 +7,7 @@ var upperCase = require('upper-case');
 var crypto = require('crypto');
 var hash = crypto.createHash('sha256');
 var logger = require('./logger');
+var rpcPass = '';

 exports.authenticateUser = (req, res, next) => {
  if(+common.rtl_sso) {
@ -72,13 +73,14 @@ exports.authenticateUser = (req, res, next) => {
            });
          } else {
            const jsonLNDConfig = ini.parse(data);
-            var rpcPass = '';
-            if (undefined !== jsonLNDConfig.Bitcoind && undefined !== jsonLNDConfig.Bitcoind['bitcoind.rpcpass']) {
-              rpcPass = jsonLNDConfig.Bitcoind['bitcoind.rpcpass'];
-            } else if (undefined !== jsonLNDConfig['bitcoind.rpcpass']) {
-              rpcPass = jsonLNDConfig['bitcoind.rpcpass'];
+            if (rpcPass === '') {
+              if (undefined !== jsonLNDConfig.Bitcoind && undefined !== jsonLNDConfig.Bitcoind['bitcoind.rpcpass']) {
+                rpcPass = jsonLNDConfig.Bitcoind['bitcoind.rpcpass'];
+              } else if (undefined !== jsonLNDConfig['bitcoind.rpcpass']) {
+                rpcPass = jsonLNDConfig['bitcoind.rpcpass'];
+              }
+              rpcPass = hash.update(rpcPass).digest('hex');
            }
-            rpcPass = hash.update(rpcPass).digest('hex');
            if (rpcPass === password) {
              var rpcUser = (undefined !== jsonLNDConfig.Bitcoind && undefined !== jsonLNDConfig.Bitcoind['bitcoind.rpcuser']) ? jsonLNDConfig.Bitcoind['bitcoind.rpcuser'] : '';
              rpcUser = (rpcUser === '' && undefined !== jsonLNDConfig['bitcoind.rpcuser']) ? jsonLNDConfig['bitcoind.rpcuser'] : '';
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "rtl",
-  "version": "0.5.2-beta",
+  "version": "0.5.3-beta",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "rtl",
-  "version": "0.5.2-beta",
+  "version": "0.5.3-beta",
  "license": "MIT",
  "scripts": {
    "ng": "ng",
--- a/src/environments/version.ts
+++ b/src/environments/version.ts
@ -1 +1 @@
-export const VERSION = '0.5.2-beta';
+export const VERSION = '0.5.3-beta';