Remove logout

Remove the logout option from UI.

Issue-ID: CLAMP-860
Change-Id: I711b8a7eaf523195f0534044efd3dd74c3f1e0be
Signed-off-by: xuegao <xg353y@intl.att.com>

6 files changed, 1 insertions, 66 deletions

diff --git a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java b/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
index d20a7370c..cfd5f990f 100644
--- a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
+++ b/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
@@ -74,9 +74,7 @@ public class DefaultUserConfiguration extends WebSecurityConfigurerAdapter {
     protected void configure(HttpSecurity http) {
         try {
             http.csrf().disable().httpBasic().and().authorizeRequests().antMatchers("/restservices/clds/v1/user/**")
-                    .authenticated().anyRequest().permitAll().and().logout()
-                    .logoutUrl("/restservices/clds/v1/user/logout").logoutSuccessUrl("/index.html")
-                    .invalidateHttpSession(true).deleteCookies("JSESSIONID").and().sessionManagement()
+                    .authenticated().anyRequest().permitAll().and().sessionManagement()
                     .maximumSessions(1);
 
         } catch (Exception e) {
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 107992137..8624726be 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -114,7 +114,6 @@ export default class LoopUI extends React.Component {
 	constructor() {
 		super();
 		this.getUser = this.getUser.bind(this);
-		this.logout = this.logout.bind(this);
 		this.updateLoopCache = this.updateLoopCache.bind(this);
 		this.loadLoop = this.loadLoop.bind(this);
 		this.closeLoop = this.closeLoop.bind(this);
@@ -132,14 +131,6 @@ export default class LoopUI extends React.Component {
 			this.setState({ userName: user })
 		});
 	}
-	
-	logout() {
-		UserService.logout().then(user => {
-			this.setState({ userName: user });
-			window.location.reload();
-		});
-		
-	}
 
 	renderMenuNavBar() {
 		return (
@@ -152,7 +143,6 @@ export default class LoopUI extends React.Component {
 			<Navbar.Text>
 			<StyledLoginInfo>Signed in as: </StyledLoginInfo>
 				<StyledRouterLink to="/userInfo">{this.state.userName}</StyledRouterLink>
-				<StyledRouterLink to="/logout/"> (logout)</StyledRouterLink>
 			</Navbar.Text>
 		);
 	}
@@ -281,7 +271,6 @@ export default class LoopUI extends React.Component {
 				<Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps} loopAction="undeploy" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
 				<Route path="/deploy" render={(routeProps) => (<DeployLoopModal {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
 				<Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
-				<Route path="/logout" render={this.logout} />
 				<GlobalClampStyle />
 					{this.renderAlertBar()}
 					{this.renderNavBar()}
diff --git a/ui-react/src/LoopUI.test.js b/ui-react/src/LoopUI.test.js
index 6885e7932..bfd6376e3 100644
--- a/ui-react/src/LoopUI.test.js
+++ b/ui-react/src/LoopUI.test.js
@@ -83,15 +83,6 @@ describe('Verify LoopUI', () => {
 		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
 	})
 
-	test('Test logout method', async () => {
-		const flushPromises = () => new Promise(setImmediate);
-		const component = shallow(<LoopUI />)
-		const instance = component.instance();
-		instance.logout();
-		await flushPromises();
-		expect(component.state('userName')).toEqual("testUser");
-	})
-
 	test('Test loadLoop method refresh suc', async () => {
 		const historyMock = { push: jest.fn() };
 		LoopService.getLoop = jest.fn().mockImplementation(() => {
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index 958e77a99..2dfa48091 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -76,10 +76,6 @@ exports[`Verify LoopUI Test the render method 1`] = `
     path="/refreshStatus"
     render={[Function]}
   />
-  <Route
-    path="/logout"
-    render={[Function]}
-  />
   <GlobalStyleComponent />
   <div>
     <Alert
@@ -157,11 +153,6 @@ exports[`Verify LoopUI Test the render method 1`] = `
       >
         testUser
       </Styled(Link)>
-      <Styled(Link)
-        to="/logout/"
-      >
-         (logout)
-      </Styled(Link)>
     </NavbarText>
   </Navbar>
   <styled.div>
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index a06f1edfa..56d022fc6 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -103,10 +103,6 @@ exports[`Verify OnapClamp Test the render method 1`] = `
       path="/refreshStatus"
       render={[Function]}
     />
-    <Route
-      path="/logout"
-      render={[Function]}
-    />
     <GlobalStyleComponent />
     <div>
       <Alert
@@ -182,11 +178,6 @@ exports[`Verify OnapClamp Test the render method 1`] = `
         <Styled(Link)
           to="/userInfo"
         />
-        <Styled(Link)
-          to="/logout/"
-        >
-           (logout)
-        </Styled(Link)>
       </NavbarText>
     </Navbar>
     <styled.div>
diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js
index 5703fdcc7..477ca4269 100644
--- a/ui-react/src/api/UserService.js
+++ b/ui-react/src/api/UserService.js
@@ -47,31 +47,6 @@ export default class UserService {
 			return UserService.notLoggedUserName;
 		});
 	}
-	
-	static logout() {
-		return fetch('/restservices/clds/v1/user/logout', {
-			method: 'POST',
-			credentials: 'same-origin'
-		})
-		.then(function (response) {
-			console.debug("logout response received, status code:", response.status);
-			if (response.ok) {
-				return response.text();
-			} else {
-				console.error("logout response is nok");
-				return UserService.notLoggedUserName;
-			}
-		})
-		.then(function (data) {
-			console.info ("User disconnected:",data)
-			return data;
-		})
-		.catch(function(error) {
-			console.warn("logout error received, user set to: ",UserService.notLoggedUserName);
-			console.error("logout error:",error);
-			return UserService.notLoggedUserName;
-		});
-	}
 
 	static getUserInfo() {
 		return fetch('/restservices/clds/v2/clampInformation', {