@qikdev/sdk 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qikdev/sdk",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "type": "module",
   "description": "Promise based Javascript SDK",
   "main": "./dist/main.js",

package/src/api/qik.access.js

@@ -27,42 +27,6 @@ var QikAccess = function (QikCore) {
 
   ///////////////////////////////////////////////
 
-  service.featureFlags = {
-    all: 1,
-    impersonation: 2,
-    products: 4,
-    checkin: 8,
-    events: 16,
-    ticketing: 32,
-    emails: 64,
-    sms: 128,
-    images: 256,
-    actions: 512,
-    timers: 1024,
-    listenertriggers: 2048,
-    builder: 4096,
-    scopes: 8192,
-    components: 16384,
-    video: 32768,
-    audio: 65536,
-    files: 131072,
-    developer: 262144,
-    notifications: 524288,
-    payments: 1048576,
-    comments: 2097152,
-    workflows: 4194304,
-    forms: 8388608,
-  };
-
-  service.featureIsIncludedInByteflag = function (byteflag, feature) {
-    return (
-      (byteflag & service.featureFlags[feature]) ===
-      service.featureFlags[feature]
-    );
-  };
-
-  ///////////////////////////////////////////////
-
   /**
    * @alias access.hasFeature
    * @description Checks if a user has a specific feature enabled for their organisation
@@ -73,26 +37,11 @@ var QikAccess = function (QikCore) {
    * const formsFeatureIsEnabled =  sdk.access.hasFeature(user, 'forms');
    */
   service.hasFeature = function (user, feature) {
-    const organisation = user?.organisation || {};
-    const features = organisation.features || {};
-
+    const features = user?.organisation?.features || {};
     if (features.all) {
       return true;
     }
-
-    if (features[feature]) {
-      return true;
-    }
-
-    // Check the byteflag
-    const byteflag = organisation.ff;
-
-    if (service.featureIsIncludedInByteflag(byteflag, "all")) {
-      return true;
-    }
-
-    //Let us know if there are any permissions for this user
-    return service.featureIsIncludedInByteflag(byteflag, feature);
+    return Boolean(features[feature]);
   };
 
   ///////////////////////////////////////////////

package/src/api/qik.socket.js

@@ -90,10 +90,14 @@ const QikSocket = function(qik, mode) {
             bucket.dispatch('message', message);
         }
 
-        // Destroy the service
+        // Destroy this channel - stop receiving its events and tell the
+        // server to unsubscribe. Only touches this channel's own listeners,
+        // leaving every other channel (and connection-level listeners) intact.
         bucket.destroy = function() {
-            service.removeAllListeners();
-            buckets[key] = null;
+            service.removeEventListener(key, dispatchMessage);
+            service.unsubscribe(key);
+            bucket.removeAllListeners();
+            delete buckets[key];
         }
 
         return buckets[key];
@@ -340,6 +344,37 @@ const QikSocket = function(qik, mode) {
 
     ///////////////////////////////////////////////////
 
+    // Reconnect the socket whenever the authenticated organisation changes.
+    // The WebSocket authenticates with an access token at connect time, so the
+    // connection stays bound to whichever organisation was active when it
+    // opened. Switching organisations issues a new token but leaves the socket
+    // untouched, so without this it keeps streaming the previous
+    // organisation's events. Reconnecting re-authenticates with the new token.
+    let currentOrganisationID = qik.utils.id(qik.auth.getCurrentUser()?.organisation);
+
+    qik.auth.addEventListener('change', async function(user) {
+        const organisationID = qik.utils.id(user?.organisation);
+
+        // Ignore auth changes that don't change the organisation (e.g. routine
+        // access token refreshes) so we don't churn the connection needlessly.
+        if (organisationID === currentOrganisationID) {
+            return;
+        }
+
+        currentOrganisationID = organisationID;
+
+        // Nothing to reconnect if the socket was never opened.
+        if (!socket) {
+            return;
+        }
+
+        service.debug ? console.log('[socket] - organisation changed, reconnecting') : null;
+        await service.close();
+        await service.reconnect();
+    });
+
+    ///////////////////////////////////////////////////
+
     return service;
 
 }