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

Fix for sso access key reading (#1469)

Browse Source
This commit is contained in:
ShahanaFarooqui 2024-11-18 13:28:37 -08:00 committed by GitHub
parent 006b013cf8
commit faf27881f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/controllers/shared/RTLConf.js
View File

@ -8,7 +8,7 @@ import { Database } from '../../utils/database.js';
import { Logger } from '../../utils/logger.js'; import { Logger } from '../../utils/logger.js';
import { Common } from '../../utils/common.js'; import { Common } from '../../utils/common.js';
import { WSServer } from '../../utils/webSocketServer.js'; import { WSServer } from '../../utils/webSocketServer.js';
import { Authentication, SSO } from '../../models/config.model.js'; import { Authentication } from '../../models/config.model.js';
const options = { url: '' }; const options = { url: '' };
const logger = Logger; const logger = Logger;
const common = Common; const common = Common;
@ -114,7 +114,9 @@ export const getApplicationSettings = (req, res, next) => {
if (err) { if (err) {
// Delete unnecessary data for initial response (without security token) // Delete unnecessary data for initial response (without security token)
const selNodeIdx = appConfData.nodes.findIndex((node) => node.index === appConfData.selectedNodeIndex) || 0; const selNodeIdx = appConfData.nodes.findIndex((node) => node.index === appConfData.selectedNodeIndex) || 0;
appConfData.SSO = new SSO(); delete appConfData.SSO.rtlCookiePath;
delete appConfData.SSO.cookieValue;
delete appConfData.SSO.logoutRedirectLink;
appConfData.secret2FA = ''; appConfData.secret2FA = '';
appConfData.dbDirectoryPath = ''; appConfData.dbDirectoryPath = '';
appConfData.nodes[selNodeIdx].authentication = new Authentication(); appConfData.nodes[selNodeIdx].authentication = new Authentication();

2
frontend/index.html
View File

File diff suppressed because one or more lines are too long

1
frontend/main.89468e89473d89c7.js Normal file
View File

File diff suppressed because one or more lines are too long

1
frontend/main.ca6488a35864127e.js
View File

File diff suppressed because one or more lines are too long

6
server/controllers/shared/RTLConf.ts
View File

@ -8,7 +8,7 @@ import { Database, DatabaseService } from '../../utils/database.js';
import { Logger, LoggerService } from '../../utils/logger.js'; import { Logger, LoggerService } from '../../utils/logger.js';
import { Common, CommonService } from '../../utils/common.js'; import { Common, CommonService } from '../../utils/common.js';
import { WSServer } from '../../utils/webSocketServer.js'; import { WSServer } from '../../utils/webSocketServer.js';
import { Authentication, SSO } from '../../models/config.model.js'; import { Authentication } from '../../models/config.model.js';
const options = { url: '' }; const options = { url: '' };
const logger: LoggerService = Logger; const logger: LoggerService = Logger;
@ -116,7 +116,9 @@ export const getApplicationSettings = (req, res, next) => {
if (err) { if (err) {
// Delete unnecessary data for initial response (without security token) // Delete unnecessary data for initial response (without security token)
const selNodeIdx = appConfData.nodes.findIndex((node) => node.index === appConfData.selectedNodeIndex) || 0; const selNodeIdx = appConfData.nodes.findIndex((node) => node.index === appConfData.selectedNodeIndex) || 0;
appConfData.SSO = new SSO(); delete appConfData.SSO.rtlCookiePath;
delete appConfData.SSO.cookieValue;
delete appConfData.SSO.logoutRedirectLink;
appConfData.secret2FA = ''; appConfData.secret2FA = '';
appConfData.dbDirectoryPath = ''; appConfData.dbDirectoryPath = '';
appConfData.nodes[selNodeIdx].authentication = new Authentication(); appConfData.nodes[selNodeIdx].authentication = new Authentication();

2
src/app/app.component.ts
View File

@ -98,7 +98,7 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
} }
this.actions.pipe( this.actions.pipe(
takeUntil(this.unSubs[4]), takeUntil(this.unSubs[4]),
filter((action) => action.type === RTLActions.FETCH_APPLICATION_SETTINGS || action.type === RTLActions.LOGIN || action.type === RTLActions.LOGOUT)). filter((action) => action.type === RTLActions.SET_APPLICATION_SETTINGS || action.type === RTLActions.LOGIN || action.type === RTLActions.LOGOUT)).
subscribe((action: (any)) => { subscribe((action: (any)) => {
if (action.type === RTLActions.SET_APPLICATION_SETTINGS) { if (action.type === RTLActions.SET_APPLICATION_SETTINGS) {
if (!this.sessionService.getItem('token')) { if (!this.sessionService.getItem('token')) {