mirrors/Ride-The-Lightning-RTL
1
0
Fork 0
mirror of https://github.com/Ride-The-Lightning/RTL.git synced 2024-11-19 09:50:36 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into UX

Browse Source
This commit is contained in:
Shahana Farooqui 2019-10-16 12:59:43 -04:00
commit 2e94a27877
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
angular/index.html
View File

@ -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>

6
connect.js
View File

@ -220,7 +220,7 @@ connect.validateSingleNodeConfig = (config) => {
}
if (undefined !== process.env.RTL_PASS) {
common.rtl_pass = process.env.RTL_PASS;
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) {
@ -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
View File

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

2
package.json
View File

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

2
src/environments/version.ts
View File

@ -1 +1 @@
export const VERSION = '0.5.3-beta';
export const VERSION = '0.5.4-beta';