Simplify the user management

Simplify the user management and fix a bug in the server, crashing when no user are logged and an operation is requested, and also previous user still stored in the securitycontext when admin is logged (due to static variable)

Issue-ID: CLAMP-651

Change-Id: I57523bc2c3afaf5ca5a3acf5c59823df06fd4cd9
Signed-off-by: sebdet <sebastien.determe@intl.att.com>

1 files changed, 5 insertions, 13 deletions

diff --git a/ui-react/src/components/dialogs/UserInfoModal.test.js b/ui-react/src/components/dialogs/UserInfoModal.test.js
index b5a2b272..f5ed0ae1 100644
--- a/ui-react/src/components/dialogs/UserInfoModal.test.js
+++ b/ui-react/src/components/dialogs/UserInfoModal.test.js
@@ -46,12 +46,7 @@ describe('Verify UserInfoModal', () => {
 		component.setState({ userInfo: {
 			"userName": "test",
 			"cldsVersion": "1.0.0",
-			"permissionReadCl": true,
-			"permissionReadTemplate" : true,
-			"permissionReadTosca" : true,
-			"permissionUpdateTemplate" : true,
-			"permissionUpdateCl" : true,
-			"permissionUpdateTosca": true
+			"allPermissions": ["permission1","permission2"]
 		}});
 		expect(component).toMatchSnapshot();
 	});
@@ -69,18 +64,15 @@ describe('Verify UserInfoModal', () => {
 		component.setState({ userInfo: {
 			"userName": "test",
 			"cldsVersion": "1.0.0",
-			"permissionReadCl": true,
-			"permissionReadTemplate" : true,
-			"permissionReadTosca" : true
+			"allPermissions": ["permission1","permission2"]
 		}});
 
-		expect(component.find('FormControl').length).toEqual(5);
+		expect(component.find('FormControl').length).toEqual(4);
 
 		const forms = component.find('FormControl');
 		expect(forms.get(0).props.defaultValue).toEqual("test");
 		expect(forms.get(1).props.defaultValue).toEqual("1.0.0");
-		expect(forms.get(2).props.defaultValue).toEqual("Read Template");
-		expect(forms.get(3).props.defaultValue).toEqual("Read Model");
-		expect(forms.get(4).props.defaultValue).toEqual("Read Tosca");
+		expect(forms.get(2).props.defaultValue).toEqual("permission1");
+		expect(forms.get(3).props.defaultValue).toEqual("permission2");
 	});
 });