Differentiate b/w RTL login and LND Unlock

6 years ago · 59f3be564a
parent 7e408890fc
commit 59f3be564a
6 changed files with 10 additions and 10 deletions
--- a/angular/index.html
+++ b/angular/index.html
@ -8,5 +8,5 @@
 <link rel="stylesheet" href="styles.6acb6bfec10bb1e126bd.css"></head>
 <body>
  <rtl-app></rtl-app>
-<script type="text/javascript" src="runtime.ec2944dd8b20ec099bf3.js"></script><script type="text/javascript" src="polyfills.418928a701f2040ada02.js"></script><script type="text/javascript" src="main.5b06fe887187e8de44b2.js"></script></body>
+<script type="text/javascript" src="runtime.ec2944dd8b20ec099bf3.js"></script><script type="text/javascript" src="polyfills.418928a701f2040ada02.js"></script><script type="text/javascript" src="main.6638a0b001fe98e8f64b.js"></script></body>
 </html>
--- a/angular/main.5b06fe887187e8de44b2.js
+++ b/angular/main.5b06fe887187e8de44b2.js
--- a/angular/main.6638a0b001fe98e8f64b.js
+++ b/angular/main.6638a0b001fe98e8f64b.js
--- a/app.js
+++ b/app.js
@ -51,7 +51,7 @@ app.use("/api/newaddress", newAddressRoutes);
 app.use("/api/transactions", transactionsRoutes);
 app.use("/api/payreq", payReqRoutes);
 app.use("/api/payments", paymentsRoutes);
-app.use("/api/rtlconf", RTLConfRoutes);
+app.use("/api/conf", RTLConfRoutes);
 app.use("/api/invoices", invoiceRoutes);

 // sending angular application when route doesn't match
--- a/controllers/RTLConf.js
+++ b/controllers/RTLConf.js
@ -4,18 +4,18 @@ var fs = require('fs');
 var file_path = path.normalize(__dirname + '/..') + '/RTL.conf';  
 var logger = require('./logger');

-exports.getUISettings = (req, res, next) => {
-  logger.info('\r\nConf: 7: ' + JSON.stringify(Date.now()) + ': INFO: Getting UI Settings');
+exports.getRTLConfig = (req, res, next) => {
+  logger.info('\r\nConf: 7: ' + JSON.stringify(Date.now()) + ': INFO: Getting RTL Config');
  fs.readFile(file_path, 'utf8', function(err, data) {
    if (err) {
-      logger.error('\r\nConf: 10: ' + JSON.stringify(Date.now()) + ': ERROR: Getting UI Settings Failed!');
+      logger.error('\r\nConf: 10: ' + JSON.stringify(Date.now()) + ': ERROR: Getting RTL Config Failed!');
      res.status(500).json({
-        message: "Reading UI Settings Failed!",
+        message: "Reading RTL Config Failed!",
        error: err
      });
    } else {
      const jsonConfig = ini.parse(data);
-      res.status(200).json({settings: jsonConfig.Settings});
+      res.status(200).json({settings: jsonConfig.Settings, nodeAuthType: (jsonConfig.Authentication.nodeAuthType) ? jsonConfig.Authentication.nodeAuthType : 'DEFAULT'});
    }
  });
 };
--- a/routes/RTLConf.js
+++ b/routes/RTLConf.js
@ -3,8 +3,8 @@ const express = require("express");
 const router = express.Router();
 const authCheck = require("./authCheck");

-router.get("/lndconfig", authCheck, RTLConfController.getLNDConfig);
-router.get("/uisettings", RTLConfController.getUISettings);
+router.get("/rtlconf", RTLConfController.getRTLConfig);
 router.post("/", authCheck, RTLConfController.updateUISettings);
+router.get("/lndconfig", authCheck, RTLConfController.getLNDConfig);

 module.exports = router;