Merge remote-tracking branch 'origin/master' into...

Merge remote-tracking branch 'origin/master' into 269-implement-workflow-for-signing-already-uploaded-document

javascript/src/iframe/viamapi-iframe.js

@@ -1323,6 +1323,10 @@ connection.promise.then(parent => {
   let identityLoadedEvent = false;
   let identityAuthenticatedEvent = false;
 
+  let previousLocalStorageUUID;
+  let previousLocalStorageToken;
+  let previousLocalStorageIdentity;
+
   setInterval(async function () {
     if (window.currentlyAuthenticatedIdentity) {
       const { authentication } = window.currentlyAuthenticatedIdentity;
@@ -1378,6 +1382,28 @@ connection.promise.then(parent => {
         window.lastTimeGetProfile = now;
       }
     }
+
+    const currentLocalStorageUUID = localStorage.getItem("uuid");
+    const currentLocalStorageToken = localStorage.getItem("token");
+    const currentLocalStorageIdentity = localStorage.getItem("authenticatedIdentity");
+    if (
+      !currentLocalStorageUUID && previousLocalStorageUUID ||
+      !currentLocalStorageToken && previousLocalStorageToken ||
+      !currentLocalStorageIdentity && previousLocalStorageIdentity
+    ) {
+      previousLocalStorageUUID = null;
+      previousLocalStorageToken = null;
+      previousLocalStorageIdentity = null;
+
+      destroyAuthentication();
+
+      const event = createEvent("", "LogoutExternal");
+      parent.onEvent(event);
+    } else {
+      previousLocalStorageUUID = currentLocalStorageUUID;
+      previousLocalStorageToken = currentLocalStorageToken;
+      previousLocalStorageIdentity = currentLocalStorageIdentity;
+    }
   }, 50);
 
   const getNewEventsWithoutSession = async () => {

main.go

@@ -38,9 +38,17 @@ func buildPenpalMethods() string {
 	prefixes := []string{}
 	endPoints := server.GetEndPoints(prefixes)
 
-	result :=
-		"import Penpal from 'penpal';\n\n" +
-			"export default {\n"
+	result := `
+const encodeResponse = (code, data, status) => {
+  return {
+    code,
+    data,
+    status
+  };
+};
+
+export default {
+`
 
 	methods := generatePenpalRemoteMethods(endPoints)
 
@@ -590,31 +598,13 @@ func generatePenpalRemoteMethods(endPoints map[string]*server.EndPoint) string {
 	privateCheckSnippet := `
         const authenticationPublicKey = localStorage.getItem("authenticatedIdentity");
 
-	    if (authenticationPublicKey === null) {
-		    result({
-			    "data" : "",
-			    "code" : "400",
-			    "status" : "Identity not authenticated"
-		    });
-	    }
-
-	    if (loadedIdentities[authenticationPublicKey] === null) {
-		    result({
-			    "data" : "",
-			    "code" : "400",
-			    "status" : "Identity not authenticated"
-		    });
- 	    }
-
-	    const success = extendPinCodeTtl(authenticationPublicKey);
-
-	    if(success === false) {
-		    result({"data" : "",
-			    "code" : "400",
-			    "status" : "Identity not authenticated"
-		    })
-		}
-
+        if (
+            !authenticationPublicKey ||
+            !window.loadedIdentities[authenticationPublicKey] ||
+            !extendPinCodeTtl(authenticationPublicKey)
+        ) {
+            return encodeResponse("400", "", "Identity not authenticated");
+        }
 	`
 
 	for i := 0; i < keysLen; i++ {
@@ -626,24 +616,14 @@ func generatePenpalRemoteMethods(endPoints map[string]*server.EndPoint) string {
 
 		if url == "/identity/getIdentityProfileData" {
 			privateCheckSnippet = `
-				const authenticationPublicKey = localStorage.getItem("authenticatedIdentity");
-
-				if (authenticationPublicKey === null) {
-					result({
-						"data" : "",
-						"code" : "400",
-						"status" : "Identity not authenticated"
-					});
-				}
-
-				if (loadedIdentities[authenticationPublicKey] === null) {
-					result({
-						"data" : "",
-						"code" : "400",
-						"status" : "Identity not authenticated"
-					});
-				}
-
+                const authenticationPublicKey = localStorage.getItem("authenticatedIdentity");
+
+                if (
+                    !authenticationPublicKey ||
+                    !window.loadedIdentities[authenticationPublicKey]
+                ) {
+                    return encodeResponse("400", "", "Identity not authenticated");
+                }
 			`
 		}
 
@@ -685,12 +665,9 @@ func generatePenpalRemoteMethods(endPoints map[string]*server.EndPoint) string {
 				lastComma = ""
 			}
 
-			method := packageStr + strings.Title(methodStr) + ": function(" + args + ") {\n" +
-				"    return new Penpal.Promise(function(result) {\n" + snippet +
-				"    executeRestfulFunction(\"" + endPoints[url].HandlerType + "\", viamApi, viamApi." + packageStr + strings.Title(methodStr) + ", null" + lastComma + args + ").then(function(executeResult) {\n" +
-				"            result(executeResult);\n" +
-				"        });\n" +
-				"    });\n" +
+			method := packageStr + strings.Title(methodStr) + ": async function(" + args + ") {\n" +
+				snippet +
+				"    return await executeRestfulFunction(\"" + endPoints[url].HandlerType + "\", viamApi, viamApi." + packageStr + strings.Title(methodStr) + ", null" + lastComma + args + ");\n" +
 				"}"
 
 			methods += method
@@ -713,12 +690,9 @@ func generatePenpalRemoteMethods(endPoints map[string]*server.EndPoint) string {
 				snippet = privateCheckSnippet
 			}
 
-			method := packageStr + strings.Title(methodStr) + ": function() {\n" +
-				"    return new Penpal.Promise(function(result) {\n" + snippet +
-				"    executeRestfulFunction(\"" + endPoints[url].HandlerType + "\", viamApi, viamApi." + packageStr + strings.Title(methodStr) + ", null).then(function(executeResult) {\n" +
-				"            result(executeResult);\n" +
-				"        });\n" +
-				"    });\n" +
+			method := packageStr + strings.Title(methodStr) + ": async function() {\n" +
+				snippet +
+				"    return await executeRestfulFunction(\"" + endPoints[url].HandlerType + "\", viamApi, viamApi." + packageStr + strings.Title(methodStr) + ", null);\n" +
 				"}"
 
 			methods += method