Merge pull request #296 from rsnyman/clear-projects-dashboards-when-logging-out

Clear projects and dashboards when logging out. Fixes #295

Author: rsnyman

frontend/src/app.js

@@ -47,7 +47,7 @@ import { FileUpload, View } from './components';
 import { ALERT_TIMEOUT, MONITOR_UPLOAD_TIMEOUT, VERSION_CHECK_TIMEOUT } from './constants';
 import { AuthService } from './services/auth';
 import { HttpClient } from './services/http';
-import { getActiveProject } from './utilities';
+import { getActiveProject, clearActiveProject, clearActiveDashboard } from './utilities';
 import { version } from '../package.json'
 import './app.css';
 
@@ -249,6 +249,8 @@ export class App extends React.Component {
   };
 
   logout = () => {
+    clearActiveProject();
+    clearActiveDashboard();
     AuthService.logout();
     window.location = "/";
   }

frontend/src/login.js

@@ -23,6 +23,7 @@ import { HttpClient } from './services/http';
 import { AuthService } from './services/auth';
 import { KeycloakService } from './services/keycloak';
 import { Settings } from './settings';
+import { clearActiveDashboard, clearActiveProject } from './utilities';
 
 function getLocationFrom(location) {
   let { from } = location.state || {from: {pathname: '/'}};
@@ -116,6 +117,8 @@ export class Login extends React.Component {
       AuthService.login(this.state.emailValue, this.state.passwordValue)
         .then(isLoggedIn => {
           if (isLoggedIn) {
+            clearActiveDashboard();
+            clearActiveProject();
             window.location = this.state.from.pathname;
           }
           else {
@@ -149,6 +152,9 @@ export class Login extends React.Component {
   }
 
   onOAuth2Success = (response) => {
+    // Make sure there are no active projects or dashboards selected
+    clearActiveDashboard();
+    clearActiveProject();
     AuthService.setUser(response);
     window.location = this.state.from.pathname;
   }
@@ -158,6 +164,9 @@ export class Login extends React.Component {
     HttpClient.get([redirect_uri], {"code": response["tokenId"]})
       .then(response => response.json())
       .then(user => {
+        // Make sure there are no active projects or dashboards selected
+        clearActiveDashboard();
+        clearActiveProject();
         AuthService.setUser(user);
         window.location = this.state.from.pathname;
       });
@@ -166,6 +175,9 @@ export class Login extends React.Component {
   onKeycloakLogin = () => {
     const { server_url, realm, client_id } = this.state.externalLogins.keycloak;
     this.setState({isLoggingIn: true}, () => {
+      // Make sure there are no active projects or dashboards selected
+      clearActiveDashboard();
+      clearActiveProject();
       KeycloakService.login(server_url, realm, client_id);
     });
   }

frontend/src/utilities.js

@@ -351,6 +351,10 @@ export function getActiveProject() {
   return project;
 }
 
+export function clearActiveProject() {
+  localStorage.removeItem('project');
+}
+
 export function getActiveDashboard() {
   let dashboard = localStorage.getItem('dashboard');
   if (dashboard) {
@@ -359,6 +363,10 @@ export function getActiveDashboard() {
   return dashboard;
 }
 
+export function clearActiveDashboard() {
+  localStorage.removeItem('dashboard');
+}
+
 export function processPyTestPath(path) {
   if (path && path.indexOf('/') === 0) {
     path = path.substring(1);

scripts/ibutsu-pod.sh

@@ -65,8 +65,7 @@ podman run -dit \
        -w /mnt \
        -v./frontend:/mnt/:Z \
        node:latest \
-       /bin/bash -c 'export NODE_OPTIONS=--openssl-legacy-provider &&
-       		     yarn install &&
+       /bin/bash -c 'yarn install &&
                      yarn run devserver' > /dev/null
 echo "done."
 echo -n "Waiting for frontend to respond..."