Fixed issue 57, 64, 65 and other ui enhancements

This commit is contained in:
ShahanaFarooqui 2019-02-25 21:16:55 -05:00
parent 3323ab1507
commit 36bae3d96d
9 changed files with 22 additions and 21 deletions

View file

@ -5,8 +5,8 @@
<title>RTL</title>
<base href="/rtl/"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="assets/images/favicon.ico">
<link rel="stylesheet" href="styles.7e944f30e4357f41ed14.css"></head>
<link rel="stylesheet" href="styles.b70b44fe050fa03ed5cb.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.3af948a517a730560e85.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.32639a908676bc859a6d.js"></script></body>
</html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -165,22 +165,21 @@ const setSSOParams = (config) => {
common.rtl_sso = config.SSO.rtlSSO;
}
if (undefined !== process.env.LOGOUT_REDIRECT_LINK) {
common.logout_redirect_link = process.env.LOGOUT_REDIRECT_LINK;
} else if (undefined !== config.SSO && undefined !== config.SSO.logoutRedirectLink) {
common.logout_redirect_link = config.SSO.logoutRedirectLink;
}
if (undefined !== process.env.RTL_COOKIE_PATH) {
common.rtl_cookie_path = process.env.RTL_COOKIE_PATH;
} else if (undefined !== config.SSO && undefined !== config.SSO.rtlCookiePath) {
common.rtl_cookie_path = config.SSO.rtlCookiePath;
} else {
common.rtl_cookie_path = common.rtl_conf_file_path + '/cookies/auth.cookie';
}
if (+common.rtl_sso) {
if (undefined !== process.env.LOGOUT_REDIRECT_LINK) {
common.logout_redirect_link = process.env.LOGOUT_REDIRECT_LINK;
} else if (undefined !== config.SSO && undefined !== config.SSO.logoutRedirectLink) {
common.logout_redirect_link = config.SSO.logoutRedirectLink;
}
if (undefined !== process.env.RTL_COOKIE_PATH) {
common.rtl_cookie_path = process.env.RTL_COOKIE_PATH;
} else if (undefined !== config.SSO && undefined !== config.SSO.rtlCookiePath) {
common.rtl_cookie_path = config.SSO.rtlCookiePath;
} else {
common.rtl_cookie_path = common.rtl_conf_file_path + '/cookies/auth.cookie';
}
readCookie(common.rtl_cookie_path);
}
};

View file

@ -29,6 +29,8 @@ exports.authenticateUser = (req, res, next) => {
if(+common.rtl_sso) {
const access_key = req.cookies['access-key'];
res.clearCookie("access-key");
// Replace access_key value from req.cookies['access-key'] to req.body.password to test SSO on http
// const access_key = atob(req.body.password);
if (common.cookie === access_key) {
const token = jwt.sign(
{ user: 'Custom_User', lndConfigPath: common.lnd_config_path, macaroonPath: common.macaroon_path },

2
package-lock.json generated
View file

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

View file

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