Bug fixing and credential storing (#2)

Author: btoron

package-lock.json

@@ -5,7 +5,7 @@
   ],
   "name": "@ofs-users/plugin",
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Oracle Field Service plugin base code",
   "main": "dist/ofs-plugin.es.js",
   "module": "dist/ofs-plugin.es.js",
@@ -40,6 +40,6 @@
   },
   "license": "UPL-1.0",
   "dependencies": {
-    "@ofs-users/proxy": "https://github.com/oracle-samples/ofs-proxy-js.git"
+    "@ofs-users/proxy": "^1.7.1"
   }
-}
+}

package.json

@@ -12,7 +12,11 @@ export class OFSMessage {
     sendInitData?: boolean;
 
     static parse(str: string) {
-        return Object.assign(new OFSMessage(), JSON.parse(str)) as OFSMessage;
+        try {
+            return Object.assign(new OFSMessage(), JSON.parse(str)) as OFSMessage;
+        } catch (error) {
+            return new OFSMessage()
+        }
     }
 }
 
@@ -63,7 +67,9 @@ export abstract class OFSPlugin {
     private _getWebMessage(message: MessageEvent): boolean {
         console.log(`${this._tag}: Message received:`, message.data);
         console.log(`${this._tag}: Coming from ${message.origin}`);
+        // Validate that it is a valid OFS message
         var parsed_message = OFSMessage.parse(message.data);
+        this._storeCredentials(parsed_message);
         switch (parsed_message.method) {
             case "init":
                 this._init(parsed_message);
@@ -80,6 +86,9 @@ export abstract class OFSPlugin {
             case "error":
                 this.error(parsed_message);
                 break;
+            case "no method":
+                console.warn(`${this._tag}: Message discarded`)
+                break;
 
             default:
                 throw new Error(`Unknown method ${parsed_message.method}`);
@@ -89,7 +98,15 @@ export abstract class OFSPlugin {
     }
 
     private async _init(message: OFSMessage) {
-        // Processing securedData variables
+        this.init(message);
+        var messageData: OFSMessage = {
+            apiVersion: 1,
+            method: "initEnd",
+        };
+        this._sendWebMessage(messageData);
+    }
+
+    private _storeCredentials(message: OFSMessage) {
         if (message.securedData) {
             console.log(`${this._tag}: Processing`, message.securedData);
             // STEP 1: are we going to create a proxy?
@@ -103,21 +120,8 @@ export abstract class OFSPlugin {
                     clientId: message.securedData.ofsClientId,
                     clientSecret: message.securedData.ofsClientSecret,
                 });
-                var result = await this._proxy.getSubscriptions();
-                console.log(
-                    `${this._tag}: Connection with ${message.securedData.ofsInstance} successful: `,
-                    result.status == 200
-                );
             }
-            // STEP 2: do we need to store type information?
-            // TBD
         }
-        this.init(message);
-        var messageData: OFSMessage = {
-            apiVersion: 1,
-            method: "initEnd",
-        };
-        this._sendWebMessage(messageData);
     }
 
     private static _getOriginURL(url: string) {
@@ -133,7 +137,7 @@ export abstract class OFSPlugin {
     private _sendWebMessage(data: OFSMessage) {
         console.log(
             `${this._tag}: Sending  message` +
-                JSON.stringify(data, undefined, 4)
+            JSON.stringify(data, undefined, 4)
         );
         var originUrl =
             document.referrer ||