Fix for sso access key reading (#1469)

Ride-The-Lightning · Nov 18, 2024 · faf2788 · faf2788
1 parent 006b013
commit faf2788
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/backend/controllers/shared/RTLConf.js b/backend/controllers/shared/RTLConf.js
@@ -8,7 +8,7 @@ import { Database } from '../../utils/database.js';
 import { Logger } from '../../utils/logger.js';
 import { Common } from '../../utils/common.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 logger = Logger;
 const common = Common;
@@ -114,7 +114,9 @@ export const getApplicationSettings = (req, res, next) => {
                 if (err) {
                     // Delete unnecessary data for initial response (without security token)
                     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.dbDirectoryPath = '';
                     appConfData.nodes[selNodeIdx].authentication = new Authentication();

diff --git a/frontend/index.html b/frontend/index.html
diff --git a/frontend/main.89468e89473d89c7.js b/frontend/main.89468e89473d89c7.js
diff --git a/frontend/main.ca6488a35864127e.js b/frontend/main.ca6488a35864127e.js
diff --git a/server/controllers/shared/RTLConf.ts b/server/controllers/shared/RTLConf.ts
@@ -8,7 +8,7 @@ import { Database, DatabaseService } from '../../utils/database.js';
 import { Logger, LoggerService } from '../../utils/logger.js';
 import { Common, CommonService } from '../../utils/common.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 logger: LoggerService = Logger;
@@ -116,7 +116,9 @@ export const getApplicationSettings = (req, res, next) => {
         if (err) {
           // Delete unnecessary data for initial response (without security token)
           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.dbDirectoryPath = '';
           appConfData.nodes[selNodeIdx].authentication = new Authentication();

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -98,7 +98,7 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
     }
     this.actions.pipe(
       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)) => {
         if (action.type === RTLActions.SET_APPLICATION_SETTINGS) {
           if (!this.sessionService.getItem('token')) {