Merge branch 'master' into UX

pull/260/head
Shahana Farooqui 5 years ago
commit 2e94a27877

@ -12,5 +12,5 @@
<link rel="stylesheet" href="styles.95003aa69b0293737712.css"></head>
<body>
<rtl-app></rtl-app>
<script src="runtime.8bb61cfc30f236326128.js"></script><script src="polyfills-es5.763f4f23e8aee5ec234d.js" nomodule></script><script src="polyfills.e59b6f9dc696bd89cf7f.js"></script><script src="main.2170653d42cbe9943b45.js"></script></body>
<script src="runtime.8bb61cfc30f236326128.js"></script><script src="polyfills-es5.763f4f23e8aee5ec234d.js" nomodule></script><script src="polyfills.e59b6f9dc696bd89cf7f.js"></script><script src="main.94daeaea77dc4507a36a.js"></script></body>
</html>

@ -220,8 +220,8 @@ connect.validateSingleNodeConfig = (config) => {
}
if (undefined !== process.env.RTL_PASS) {
common.rtl_pass = process.env.RTL_PASS;
} else if (config.Authentication.rtlPassHashed !== '' && undefined !== config.Authentication.rtlPassHashed) {
common.rtl_pass = hash.update(process.env.RTL_PASS).digest('hex');
} else if (config.Authentication.rtlPassHashed !== '' && undefined !== config.Authentication.rtlPassHashed) {
common.rtl_pass = config.Authentication.rtlPassHashed;
} else if (config.Authentication.rtlPass !== '' && undefined !== config.Authentication.rtlPass) {
common.rtl_pass = connect.convertCustomToHash('SINGLE');
@ -271,7 +271,9 @@ connect.validateSingleNodeConfig = (config) => {
connect.validateMultiNodeConfig = (config) => {
common.node_auth_type = 'CUSTOM';
if (config.multiPassHashed !== '' && undefined !== config.multiPassHashed) {
if (undefined !== process.env.RTL_PASS) {
common.rtl_pass = hash.update(process.env.RTL_PASS).digest('hex');
} else if (config.multiPassHashed !== '' && undefined !== config.multiPassHashed) {
common.rtl_pass = config.multiPassHashed;
} else if (config.multiPass !== '' && undefined !== config.multiPass) {
common.rtl_pass = connect.convertCustomToHash('MULTI');

2
package-lock.json generated

@ -1,6 +1,6 @@
{
"name": "rtl",
"version": "0.5.3-beta",
"version": "0.5.4-beta",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

@ -1,6 +1,6 @@
{
"name": "rtl",
"version": "0.5.3-beta",
"version": "0.5.4-beta",
"license": "MIT",
"scripts": {
"ng": "ng",

@ -1 +1 @@
export const VERSION = '0.5.3-beta';
export const VERSION = '0.5.4-beta';
Loading…
Cancel
Save