return element upon logout

WebGde/WebContent/config.js

@@ -53,3 +53,7 @@ var CURRENT_NODE = "Web GDE"
 var ENCODING_PASS = "PASS1"
 var NEXT_NODE = "Complete"
 var EXCEPTION_NODE = "Exception"
+
+//KEYCLOAK CONFIG
+const REDIRECT_URL = 'http://auth-server/auth/realms/GFS/protocol/openid-connect/logout?redirect_uri=encodedRedirectUri';
+

WebGde/WebContent/keycloak-login.js

@@ -33,15 +33,11 @@ var appID;
 var app;
 
 // #NODES
-const REDIRECT_URL = 'http://auth-server/auth/realms/GFS/protocol/openid-connect/logout?redirect_uri=encodedRedirectUri';
 const kc = Keycloak();
 var updateProfile = function () {
 	console.log(kc.token);
 	login_userData.access_token = kc.tokenParsed;
 	login_userData.id_token = kc.idTokenParsed;
-	setUser();
-	setRoles();
-	setApps();
 }
 
 kc.onAuthRefreshSuccess = function () {
@@ -94,9 +90,7 @@ kc.init(initOptions).then(function (authenticated) {
 	if (!authenticated) {
 		console.warn('Not authenticated');
 	} else {
-		// updateProfile();
-		// refreshImage();
-		//set email	
+
 	}
 }).catch(function () {
 	console.info('Init Error');
@@ -160,175 +154,5 @@ function getkcToken() {
 }
 
 
-function setUser() {
-	console.log('setting up user');
-	login_userData.username = kc.tokenParsed['preferred_username'];
-	login_userData.fname = kc.tokenParsed['given_name'];
-	login_userData.name = kc.tokenParsed['name'];
-	login_userData.wid = kc.tokenParsed['wid'];
-	login_userData.jti = kc.tokenParsed['jti']
-
-}
-
-function setRoles() {
-	console.log('setting up roles');
-	var myobj = kc.tokenParsed['resource_access'];
-	console.log(myobj);
-
-	$.each(myobj, function (index, object) {
-		console.log('i: ' + index);
-		if (appID.length > 0 && appID == index) {
-			console.log(appID);
-			for (var property in object) {
-				if (property == "roles") {
-					var approles = object[property];
-					for (var item in approles) {
-						var roleId = approles[item];
-						var role = {
-							'roleId': roleId,
-							'roleName': roleId
-						}
-						login_userData.roles.push(role);
-					}
-				}
-			}
-		}
-	});
-
-}
-
-function setApps() {
-	var clientAttributes = [];
-	var myobj = kc.tokenParsed['resource_access'];
-	var realmObj = kc.tokenParsed['realm_access'];
-	var realmRoles = realmObj['roles'];
-
-	//get the apps
-	$.each(myobj, function (index, object) {
-		console.log('app: ' + index);
-		var appIcon = '';
-		var appUrl = '';
-
-		//filter out application 'account' as this is a keycloak application
-		if (index !== "account") {
-			//we use keycloak realm roles to store the url and icons of the apps in the apprdrawer
-			//as keycloak doesnt have attributes for clients/applications to hold these two
-			$.each(realmRoles, function (i, o) {
-				if (o.includes(index) && o.includes("url")) {
-					appUrl = o.split("url-")[1];
-
-				}
-				if (o.includes(index) && o.includes("icon")) {
-					appIcon = o.split("icon-")[1];
-				}
-			})
-
-			app = {
-				'id': index,
-				'name': index,
-				'icon': appIcon,
-				'url': appUrl
-			}
-
-			if (appUrl.length > 0) {
-				login_userData.apps.push(app);
-			}
-		}
-	});
-}
-
-function setUserRoleAndApps(appid) {
-	appID = appid;
-	setRoles();
-	setApps();
-}
-
-function createjwt(role) {
-	const header = {
-		"alg": ALG
-	}
-
-	var stringifiedHeader = CryptoJS.enc.Utf8.parse(JSON.stringify(header));
-	var encodedHeader = base64url(stringifiedHeader);
-	const data = {
-		"jti": login_userData.jti,
-		"iss": "sso",
-		"sub": "authorized",
-		"usr": login_userData.username.toUpperCase(),
-		"wid": login_userData.wid,
-		"rol": [
-			role
-		],
-		"app": [
-			app.id
-		],
-		"iat": timestampIssued(getDate()),
-		"exp": timestampExpired(getDate(), TIMEOUT)
-	}
-
-	var stringifiedData = CryptoJS.enc.Utf8.parse(JSON.stringify(data));
-	var encodedData = base64url(stringifiedData);
-
-
-	var token = encodedHeader + "." + encodedData;
-
-	var secret = CryptoJS.enc.Base64.parse(SECRET)
-
-	var signature = CryptoJS.HmacSHA256(token, secret);
-
-	var base64sign = base64url(signature);
-
-	var signedToken = token + "." + base64sign;
-
-	return signedToken;
-}
-
-
-function base64url(source) {
-	// Encode in classical base64
-	encodedSource = CryptoJS.enc.Base64.stringify(source);
-
-	// Remove padding equal characters
-	encodedSource = encodedSource.replace(/=+$/, '');
-
-	// Replace characters according to base64url specifications
-	encodedSource = encodedSource.replace(/\+/g, '-');
-	encodedSource = encodedSource.replace(/\//g, '_');
-
-	return encodedSource;
-}
-
-
-function setCookie(token) {
-	var cookie = 'access_token=' + token + ';' + 'Path=/;Secure;HttpOnly';
-	document.cookie = cookie;
-}
-
-function encryptedjson(role) {
-	var jwt = createjwt(role);
-
-	return jwt;
-}
-
-function getDate() {
-	const date = new Date();
-
-
-	return date;
-}
-
-function timestampIssued(dt) {
-	const unix = Math.round(+dt / 1000);
-
-	return unix;
-}
-
-function timestampExpired(dt, seconds) {
-	dt.setSeconds(dt.getSeconds() + seconds);
-	const unix = Math.round(+dt / 1000);
-
-	return unix;
-}
-
 
 

WebGde/WebContent/src/BPO/bpoService.js

@@ -6,6 +6,7 @@ let urlCompleteToNextNode = BPO_URL + `req/workers/{{USER_ID}}/nodes/${CURRENT_N
 let urlGetWorkersCurrentNode = BPO_URL + `req/nodes/${CURRENT_NODE}/workers`
 let urlRejectElement = BPO_URL +  `req/nodes/${CURRENT_NODE}/elements/{{elementId}}?newNodeId={{newNodeId}}`;
 
+
 function getUrlReturnElement(element_id) {
     let url = urlReturnElement.replace("{{USER_ID}}", sessionStorage.getItem("user_id"));
     url = url.replace("{{ELEMENT_ID}}", element_id);

WebGde/WebContent/src/BPO/getElement.js

@@ -12,6 +12,8 @@ async function initGetElement() {
                 if (xml.isExisting) {
                     const xmlString = await [...xml.data].join('').replace('\t','');
                     const lastImage = getXmlLastImage(xmlString);
+                    
+                    console.log('xmlString:' + xmlString);
                     sessionStorage.setItem('section', getXmlSection(xmlString));
                     sessionStorage.setItem('doctype', getXmlDocType(xmlString));
 

WebGde/WebContent/src/BPO/returnElement.js

@@ -4,10 +4,25 @@ async function returnElementBPO(elementId) {
     if (response.status == 200) {               
         await loadWaitingElement();        
         init();
-        alert("Element Returned");        
+        console.log('Element Returned');     
     }else{
         alert(`Error ${response.status}: Returning element`);
     }
+    
+    return response.status;
+}
+
+async function returnElementLogout(elementId) {
+    let response = await fetch(getUrlReturnElement(elementId), {method: "POST"});
+
+    if (response.status == 200) {                       
+        console.log('Element Returned');     
+    }else{
+        alert(`Error ${response.status}: Returning element`);
+        logoutKeycloak();
+    }
+    
+    return response.status;
 }
 
 var returnButton = document.getElementById('return');

WebGde/WebContent/src/accessFile/accessFile.js

@@ -248,7 +248,7 @@ async function accessFile() {
                 if(IS_RETRIEVE_FROM_GFS == "Y"){
                     const modal = document.getElementById("TiffViewerModal");
                     modal.style.display = 'none';//hide local modal\
-                    getFolder(FOLDER_URL+sessionStorage.getItem('user_id')+'/element5');                  
+                    getFolder(FOLDER_URL+sessionStorage.getItem('user_id')+'/element1');                  
                 }else{
                     if((localStorage.length)==0){
                         if(updated_input_files.length==0){

WebGde/WebContent/src/endSession/endSession.js

-// var submitted = false;
 const form = document.getElementById("fields");
 const sidebar = document.getElementById("sidebar");
 let closerWindow;
 
-// form.addEventListener('submit', (e)=>{
-//   submitted = true;
-// })
-
 endButton = document.createElement("button");
 endButton.id = "endBtn";
 endButton.innerHTML = "End Session";
@@ -17,7 +12,6 @@ endDiv.append(endButton);
 
 sidebar.append(endDiv);
 
-//checks if form is empty
 function checkForm(form){
   var inputs = form.getElementsByTagName("input");
   var selects = form.getElementsByTagName("select");
@@ -34,19 +28,37 @@ function checkForm(form){
   if(inputsBlankCount==0 && selectsBlankCount==0) return true;
 }
 
-//deletes the indexedDB if form is submitted or form is empty
 endButton.addEventListener("click", function(){      
+  let endWindow = document.getElementById('end_window');
+  endWindow.style.display = 'block';
+});
 
-    //clear localStorage
-    localStorage.clear();
-    sessionStorage.clear();
+createEndSessionWindow();
+
+function createEndSessionWindow(){
+    let endWindow = document.createElement('div');
+    endWindow.id = 'end_window';
+    endWindow.style.display = 'none';
+    document.body.appendChild(endWindow);
     
-  //if form is submitted or fields are blank, delete database
+    let endBodyDiv = document.createElement('div');
+    endBodyDiv.id = 'endBodyDiv'; 
+    let endLabel = document.createElement('p');
+    endLabel.innerText = "Session will end. Current Element will be Returned.";
+    let endContinue = document.createElement('p');
+    endContinue.innerText = "Continue Y/N?";
+    
+    let endOkCnclDiv = document.createElement('div');
+    endOkCnclDiv.id = 'endOkCnclCont';
+    
+    let okEnd = document.createElement('button');
+    okEnd.innerHTML = 'ok';
+    okEnd.id = 'okEndButtn';
+    okEnd.onclick = async function () {
     	if(checkForm(form)){
 		    var DBdeleteRequest = window.indexedDB.deleteDatabase("ImageDatabase");
 		    DBdeleteRequest.addEventListener('blocked', function(e){
 		      console.log("Database cleared.");     
-      //closerWindow = window.open("closer.html", '_self');
 		    });
 		    DBdeleteRequest.addEventListener('upgradeneeded', function(e){
 		      console.log("Upgrade needed in deleting database");
@@ -56,15 +68,38 @@ endButton.addEventListener("click", function(){
 		    });
 		    DBdeleteRequest.addEventListener('success', function(e){
 		      console.log("Database cleared.");     
-      //closerWindow = window.open("closer.html", '_self');
 		    });
 		    
+		    let returnElem = await returnElementLogout(sessionStorage.getItem("element_id"));		    
+		    if( returnElem == 200){
+		    	endWindow.style.display = 'none';
+		    	localStorage.clear();
+		  		sessionStorage.clear(); 		
 	    		logoutKeycloak();
-    //resets the the boolean checker if data is submitted
 			    submitted = false;		    
     		}
-  //if form is not empty but "End Session" button is pressed without submitting the form
+		  }  
 		  else{
 		    	alert("Fields are not empty. Submit or clear fields first.");
 		  }     	   	
-});
+	    		endWindow.style.display = 'none';	 	
\ No newline at end of file
+	}
+    
+    let cancelEnd = document.createElement('button');
+    cancelEnd.innerHTML = 'cancel';
+    cancelEnd.id = 'cnclEndButton';
+    cancelEnd.onclick = function () {     	   	
+    	endWindow.style.display = 'none'; 	 	
+    }
+        
+    endOkCnclDiv.appendChild(okEnd);
+    endOkCnclDiv.appendChild(cancelEnd);
+    
+    
+    endBodyDiv.appendChild(endLabel);
+    endBodyDiv.appendChild(endContinue);
+    endBodyDiv.appendChild(endOkCnclDiv);
+    endWindow.appendChild(endBodyDiv);
+    
+      
+}

WebGde/WebContent/style.css

@@ -527,7 +527,7 @@ select {
     width: 200px;
     border: 1px solid;
     position: absolute;
-    top: calc(50% - 83px);
+    top: calc(50% - 122px);
     transform: translate(0, -50%);
     left: calc(50% - 100px);
     transform: translate(-50%, 0);
@@ -563,3 +563,22 @@ select {
     margin-left: 3px;
     margin-bottom: 3px;
 }
+
+#end_window{
+	text-align:center;
+	height: 120px;
+    width: 400px;
+    border: 1px solid;
+    position: absolute;
+    top: calc(50% - 60px);
+    transform: translate(0, -50%);
+    left: calc(50% - 200px);
+    transform: translate(-50%, 0);
+    padding: 10px;
+    background-color: white;
+}
+
+#endOkCnclCont>button{	
+	margin:5px;
+	
+}