pubnub - npm Package Compare versions

Comparing version 4.25.2 to 4.26.0

CHANGELOG.md

@@ -1,5 +0,17 @@
-## [v4.25.2](https://github.com/pubnub/javascript/tree/v4.25.2)
-  August-23-2019
+## [v4.26.0](https://github.com/pubnub/javascript/tree/v4.26.0)
+  September-20-2019
 
 
+  [Full Changelog](https://github.com/pubnub/javascript/compare/v4.25.2...v4.26.0)
+
+
+
+- ⭐ Add support for auth tokens with Objects for Users, Spaces and Memberships
+
+
+
+## [v4.25.2](https://github.com/pubnub/javascript/tree/v4.25.2)
+  September-03-2019
+
+
   [Full Changelog](https://github.com/pubnub/javascript/compare/v4.25.1...v4.25.2)
@@ -6,0 +18,0 @@

lib/core/components/config.js

@@ -258,3 +258,3 @@ "use strict";
     value: function getVersion() {
-      return '4.25.2';
+      return '4.26.0';
     }
@@ -261,0 +261,0 @@ }, {

lib/core/components/endpoint.js

@@ -82,2 +82,12 @@ "use strict";
 
+function getAuthToken(endpoint, modules, incomingParams) {
+  var token;
+
+  if (endpoint.getAuthToken) {
+    token = endpoint.getAuthToken(modules, incomingParams);
+  }
+
+  return token;
+}
+
 function generatePNSDK(config) {
@@ -98,11 +108,43 @@ if (config.sdkName) {
 
-function signRequest(modules, url, outgoingParams) {
+function getHttpMethod(modules, endpoint, incomingParams) {
+  if (endpoint.usePost && endpoint.usePost(modules, incomingParams)) {
+    return 'POST';
+  } else if (endpoint.usePatch && endpoint.usePatch(modules, incomingParams)) {
+    return 'PATCH';
+  } else if (endpoint.useDelete && endpoint.useDelete(modules, incomingParams)) {
+    return 'DELETE';
+  } else {
+    return 'GET';
+  }
+}
+
+function signRequest(modules, url, outgoingParams, incomingParams, endpoint) {
   var config = modules.config,
       crypto = modules.crypto;
+  var httpMethod = getHttpMethod(modules, endpoint, incomingParams);
   outgoingParams.timestamp = Math.floor(new Date().getTime() / 1000);
-  var signInput = "".concat(config.subscribeKey, "\n").concat(config.publishKey, "\n").concat(url, "\n");
-  signInput += _utils["default"].signPamFromParams(outgoingParams);
-  var signature = crypto.HMACSHA256(signInput);
+  var signInput = "".concat(httpMethod, "\n").concat(config.publishKey, "\n").concat(url, "\n").concat(_utils["default"].signPamFromParams(outgoingParams), "\n");
+
+  if (httpMethod === 'POST') {
+    var payload = endpoint.postPayload(modules, incomingParams);
+
+    if (typeof payload === 'string') {
+      signInput += payload;
+    } else {
+      signInput += JSON.stringify(payload);
+    }
+  } else if (httpMethod === 'PATCH') {
+    var _payload = endpoint.patchPayload(modules, incomingParams);
+
+    if (typeof _payload === 'string') {
+      signInput += _payload;
+    } else {
+      signInput += JSON.stringify(_payload);
+    }
+  }
+
+  var signature = "v2.".concat(crypto.HMACSHA256(signInput));
   signature = signature.replace(/\+/g, '-');
   signature = signature.replace(/\//g, '_');
+  signature = signature.replace(/=+$/, '');
   outgoingParams.signature = signature;
@@ -161,8 +203,13 @@ }
 
-  if (endpoint.isAuthSupported() && config.getAuthKey()) {
-    outgoingParams.auth = config.getAuthKey();
+  if (endpoint.isAuthSupported()) {
+    var token = getAuthToken(endpoint, modules, incomingParams);
+    var tokenOrKey = token || config.getAuthKey();
+
+    if (tokenOrKey) {
+      outgoingParams.auth = tokenOrKey;
+    }
   }
 
   if (config.secretKey) {
-    signRequest(modules, url, outgoingParams);
+    signRequest(modules, url, outgoingParams, incomingParams, endpoint);
   }
@@ -190,10 +237,10 @@
 
-  if (endpoint.usePost && endpoint.usePost(modules, incomingParams)) {
+  if (getHttpMethod(modules, endpoint, incomingParams) === 'POST') {
     var payload = endpoint.postPayload(modules, incomingParams);
     callInstance = networking.POST(outgoingParams, payload, networkingParams, onResponse);
-  } else if (endpoint.usePatch && endpoint.usePatch(modules, incomingParams)) {
-    var _payload = endpoint.patchPayload(modules, incomingParams);
+  } else if (getHttpMethod(modules, endpoint, incomingParams) === 'PATCH') {
+    var _payload2 = endpoint.patchPayload(modules, incomingParams);
 
-    callInstance = networking.PATCH(outgoingParams, _payload, networkingParams, onResponse);
-  } else if (endpoint.useDelete && endpoint.useDelete()) {
+    callInstance = networking.PATCH(outgoingParams, _payload2, networkingParams, onResponse);
+  } else if (getHttpMethod(modules, endpoint, incomingParams) === 'DELETE') {
     callInstance = networking.DELETE(outgoingParams, networkingParams, onResponse);
@@ -200,0 +247,0 @@ } else {

lib/core/constants/operations.js

@@ -44,2 +44,3 @@ "use strict";
   PNAccessManagerGrant: 'PNAccessManagerGrant',
+  PNAccessManagerGrantToken: 'PNAccessManagerGrantToken',
   PNAccessManagerAudit: 'PNAccessManagerAudit'
@@ -46,0 +47,0 @@ };

lib/core/endpoints/memberships/add_members.js

@@ -13,2 +13,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -24,5 +25,22 @@ exports.patchPayload = patchPayload;
 
-function prepareMessagePayload(modules, messagePayload) {
-  var stringifiedPayload = JSON.stringify(messagePayload);
-  return stringifiedPayload;
+function prepareMessagePayload(modules, incomingParams) {
+  var users = incomingParams.users;
+  var payload = {};
+
+  if (users && users.length > 0) {
+    payload.add = [];
+    users.forEach(function (addMember) {
+      var currentAdd = {
+        id: addMember.id
+      };
+
+      if (addMember.custom) {
+        currentAdd.custom = addMember.custom;
+      }
+
+      payload.add.push(currentAdd);
+    });
+  }
+
+  return payload;
 }
@@ -64,2 +82,7 @@
 
+function getAuthToken(modules, incomingParams) {
+  var token = modules.tokenManager.getToken('space', incomingParams.spaceId) || modules.tokenManager.getToken('space');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -115,21 +138,3 @@ var include = incomingParams.include,
 function patchPayload(modules, incomingParams) {
-  var users = incomingParams.users;
-  var payload = {};
-
-  if (users && users.length > 0) {
-    payload.add = [];
-    users.forEach(function (addMember) {
-      var currentAdd = {
-        id: addMember.id
-      };
-
-      if (addMember.custom) {
-        currentAdd.custom = addMember.custom;
-      }
-
-      payload.add.push(currentAdd);
-    });
-  }
-
-  return prepareMessagePayload(modules, payload);
+  return prepareMessagePayload(modules, incomingParams);
 }
@@ -136,0 +141,0 @@

lib/core/endpoints/memberships/get_members.js

@@ -11,2 +11,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -44,2 +45,7 @@ exports.handleResponse = handleResponse;
 
+function getAuthToken(modules, incomingParams) {
+  var token = modules.tokenManager.getToken('space', incomingParams.spaceId) || modules.tokenManager.getToken('space');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -46,0 +52,0 @@ var include = incomingParams.include,

lib/core/endpoints/memberships/get_memberships.js

@@ -11,2 +11,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -44,2 +45,7 @@ exports.handleResponse = handleResponse;
 
+function getAuthToken(modules, incomingParams) {
+  var token = modules.tokenManager.getToken('user', incomingParams.userId) || modules.tokenManager.getToken('user');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -46,0 +52,0 @@ var include = incomingParams.include,

lib/core/endpoints/memberships/join_spaces.js

@@ -13,2 +13,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -24,5 +25,22 @@ exports.patchPayload = patchPayload;
 
-function prepareMessagePayload(modules, messagePayload) {
-  var stringifiedPayload = JSON.stringify(messagePayload);
-  return stringifiedPayload;
+function prepareMessagePayload(modules, incomingParams) {
+  var spaces = incomingParams.spaces;
+  var payload = {};
+
+  if (spaces && spaces.length > 0) {
+    payload.add = [];
+    spaces.forEach(function (addMembership) {
+      var currentAdd = {
+        id: addMembership.id
+      };
+
+      if (addMembership.custom) {
+        currentAdd.custom = addMembership.custom;
+      }
+
+      payload.add.push(currentAdd);
+    });
+  }
+
+  return payload;
 }
@@ -64,2 +82,7 @@
 
+function getAuthToken(modules, incomingParams) {
+  var token = modules.tokenManager.getToken('user', incomingParams.userId) || modules.tokenManager.getToken('user');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -115,21 +138,3 @@ var include = incomingParams.include,
 function patchPayload(modules, incomingParams) {
-  var spaces = incomingParams.spaces;
-  var payload = {};
-
-  if (spaces && spaces.length > 0) {
-    payload.add = [];
-    spaces.forEach(function (addMembership) {
-      var currentAdd = {
-        id: addMembership.id
-      };
-
-      if (addMembership.custom) {
-        currentAdd.custom = addMembership.custom;
-      }
-
-      payload.add.push(currentAdd);
-    });
-  }
-
-  return prepareMessagePayload(modules, payload);
+  return prepareMessagePayload(modules, incomingParams);
 }
@@ -136,0 +141,0 @@

lib/core/endpoints/memberships/leave_spaces.js

@@ -13,2 +13,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -24,5 +25,16 @@ exports.patchPayload = patchPayload;
 
-function prepareMessagePayload(modules, messagePayload) {
-  var stringifiedPayload = JSON.stringify(messagePayload);
-  return stringifiedPayload;
+function prepareMessagePayload(modules, incomingParams) {
+  var spaces = incomingParams.spaces;
+  var payload = {};
+
+  if (spaces && spaces.length > 0) {
+    payload.remove = [];
+    spaces.forEach(function (removeMembershipId) {
+      payload.remove.push({
+        id: removeMembershipId
+      });
+    });
+  }
+
+  return payload;
 }
@@ -64,2 +76,7 @@
 
+function getAuthToken(modules, incomingParams) {
+  var token = modules.tokenManager.getToken('user', incomingParams.userId) || modules.tokenManager.getToken('user');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -115,15 +132,3 @@ var include = incomingParams.include,
 function patchPayload(modules, incomingParams) {
-  var spaces = incomingParams.spaces;
-  var payload = {};
-
-  if (spaces && spaces.length > 0) {
-    payload.remove = [];
-    spaces.forEach(function (removeMembershipId) {
-      payload.remove.push({
-        id: removeMembershipId
-      });
-    });
-  }
-
-  return prepareMessagePayload(modules, payload);
+  return prepareMessagePayload(modules, incomingParams);
 }
@@ -130,0 +135,0 @@

lib/core/endpoints/memberships/remove_members.js

@@ -13,2 +13,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -24,5 +25,16 @@ exports.patchPayload = patchPayload;
 
-function prepareMessagePayload(modules, messagePayload) {
-  var stringifiedPayload = JSON.stringify(messagePayload);
-  return stringifiedPayload;
+function prepareMessagePayload(modules, incomingParams) {
+  var users = incomingParams.users;
+  var payload = {};
+
+  if (users && users.length > 0) {
+    payload.remove = [];
+    users.forEach(function (removeMemberId) {
+      payload.remove.push({
+        id: removeMemberId
+      });
+    });
+  }
+
+  return payload;
 }
@@ -64,2 +76,7 @@
 
+function getAuthToken(modules, incomingParams) {
+  var token = modules.tokenManager.getToken('space', incomingParams.spaceId) || modules.tokenManager.getToken('space');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -115,15 +132,3 @@ var include = incomingParams.include,
 function patchPayload(modules, incomingParams) {
-  var users = incomingParams.users;
-  var payload = {};
-
-  if (users && users.length > 0) {
-    payload.remove = [];
-    users.forEach(function (removeMemberId) {
-      payload.remove.push({
-        id: removeMemberId
-      });
-    });
-  }
-
-  return prepareMessagePayload(modules, payload);
+  return prepareMessagePayload(modules, incomingParams);
 }
@@ -130,0 +135,0 @@

lib/core/endpoints/memberships/update_members.js

@@ -13,2 +13,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -24,5 +25,64 @@ exports.patchPayload = patchPayload;
 
-function prepareMessagePayload(modules, messagePayload) {
-  var stringifiedPayload = JSON.stringify(messagePayload);
-  return stringifiedPayload;
+function prepareMessagePayload(modules, incomingParams) {
+  var addMembers = incomingParams.addMembers,
+      updateMembers = incomingParams.updateMembers,
+      removeMembers = incomingParams.removeMembers,
+      users = incomingParams.users;
+  var payload = {};
+
+  if (addMembers && addMembers.length > 0) {
+    payload.add = [];
+    addMembers.forEach(function (addMember) {
+      var currentAdd = {
+        id: addMember.id
+      };
+
+      if (addMember.custom) {
+        currentAdd.custom = addMember.custom;
+      }
+
+      payload.add.push(currentAdd);
+    });
+  }
+
+  if (updateMembers && updateMembers.length > 0) {
+    payload.update = [];
+    updateMembers.forEach(function (updateMember) {
+      var currentUpdate = {
+        id: updateMember.id
+      };
+
+      if (updateMember.custom) {
+        currentUpdate.custom = updateMember.custom;
+      }
+
+      payload.update.push(currentUpdate);
+    });
+  }
+
+  if (users && users.length > 0) {
+    payload.update = payload.update || [];
+    users.forEach(function (updateMember) {
+      var currentUpdate = {
+        id: updateMember.id
+      };
+
+      if (updateMember.custom) {
+        currentUpdate.custom = updateMember.custom;
+      }
+
+      payload.update.push(currentUpdate);
+    });
+  }
+
+  if (removeMembers && removeMembers.length > 0) {
+    payload.remove = [];
+    removeMembers.forEach(function (removeMemberId) {
+      payload.remove.push({
+        id: removeMemberId
+      });
+    });
+  }
+
+  return payload;
 }
@@ -64,2 +124,7 @@
 
+function getAuthToken(modules, incomingParams) {
+  var token = modules.tokenManager.getToken('space', incomingParams.spaceId) || modules.tokenManager.getToken('space');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -115,63 +180,3 @@ var include = incomingParams.include,
 function patchPayload(modules, incomingParams) {
-  var addMembers = incomingParams.addMembers,
-      updateMembers = incomingParams.updateMembers,
-      removeMembers = incomingParams.removeMembers,
-      users = incomingParams.users;
-  var payload = {};
-
-  if (addMembers && addMembers.length > 0) {
-    payload.add = [];
-    addMembers.forEach(function (addMember) {
-      var currentAdd = {
-        id: addMember.id
-      };
-
-      if (addMember.custom) {
-        currentAdd.custom = addMember.custom;
-      }
-
-      payload.add.push(currentAdd);
-    });
-  }
-
-  if (updateMembers && updateMembers.length > 0) {
-    payload.update = [];
-    updateMembers.forEach(function (updateMember) {
-      var currentUpdate = {
-        id: updateMember.id
-      };
-
-      if (updateMember.custom) {
-        currentUpdate.custom = updateMember.custom;
-      }
-
-      payload.update.push(currentUpdate);
-    });
-  }
-
-  if (users && users.length > 0) {
-    payload.update = payload.update || [];
-    users.forEach(function (updateMember) {
-      var currentUpdate = {
-        id: updateMember.id
-      };
-
-      if (updateMember.custom) {
-        currentUpdate.custom = updateMember.custom;
-      }
-
-      payload.update.push(currentUpdate);
-    });
-  }
-
-  if (removeMembers && removeMembers.length > 0) {
-    payload.remove = [];
-    removeMembers.forEach(function (removeMemberId) {
-      payload.remove.push({
-        id: removeMemberId
-      });
-    });
-  }
-
-  return prepareMessagePayload(modules, payload);
+  return prepareMessagePayload(modules, incomingParams);
 }
@@ -178,0 +183,0 @@

lib/core/endpoints/memberships/update_memberships.js

@@ -13,2 +13,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -24,5 +25,64 @@ exports.patchPayload = patchPayload;
 
-function prepareMessagePayload(modules, messagePayload) {
-  var stringifiedPayload = JSON.stringify(messagePayload);
-  return stringifiedPayload;
+function prepareMessagePayload(modules, incomingParams) {
+  var addMemberships = incomingParams.addMemberships,
+      updateMemberships = incomingParams.updateMemberships,
+      removeMemberships = incomingParams.removeMemberships,
+      spaces = incomingParams.spaces;
+  var payload = {};
+
+  if (addMemberships && addMemberships.length > 0) {
+    payload.add = [];
+    addMemberships.forEach(function (addMembership) {
+      var currentAdd = {
+        id: addMembership.id
+      };
+
+      if (addMembership.custom) {
+        currentAdd.custom = addMembership.custom;
+      }
+
+      payload.add.push(currentAdd);
+    });
+  }
+
+  if (updateMemberships && updateMemberships.length > 0) {
+    payload.update = [];
+    updateMemberships.forEach(function (updateMembership) {
+      var currentUpdate = {
+        id: updateMembership.id
+      };
+
+      if (updateMembership.custom) {
+        currentUpdate.custom = updateMembership.custom;
+      }
+
+      payload.update.push(currentUpdate);
+    });
+  }
+
+  if (spaces && spaces.length > 0) {
+    payload.update = payload.update || [];
+    spaces.forEach(function (updateMembership) {
+      var currentUpdate = {
+        id: updateMembership.id
+      };
+
+      if (updateMembership.custom) {
+        currentUpdate.custom = updateMembership.custom;
+      }
+
+      payload.update.push(currentUpdate);
+    });
+  }
+
+  if (removeMemberships && removeMemberships.length > 0) {
+    payload.remove = [];
+    removeMemberships.forEach(function (removeMembershipId) {
+      payload.remove.push({
+        id: removeMembershipId
+      });
+    });
+  }
+
+  return payload;
 }
@@ -64,2 +124,7 @@
 
+function getAuthToken(modules, incomingParams) {
+  var token = modules.tokenManager.getToken('user', incomingParams.userId) || modules.tokenManager.getToken('user');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -115,63 +180,3 @@ var include = incomingParams.include,
 function patchPayload(modules, incomingParams) {
-  var addMemberships = incomingParams.addMemberships,
-      updateMemberships = incomingParams.updateMemberships,
-      removeMemberships = incomingParams.removeMemberships,
-      spaces = incomingParams.spaces;
-  var payload = {};
-
-  if (addMemberships && addMemberships.length > 0) {
-    payload.add = [];
-    addMemberships.forEach(function (addMembership) {
-      var currentAdd = {
-        id: addMembership.id
-      };
-
-      if (addMembership.custom) {
-        currentAdd.custom = addMembership.custom;
-      }
-
-      payload.add.push(currentAdd);
-    });
-  }
-
-  if (updateMemberships && updateMemberships.length > 0) {
-    payload.update = [];
-    updateMemberships.forEach(function (updateMembership) {
-      var currentUpdate = {
-        id: updateMembership.id
-      };
-
-      if (updateMembership.custom) {
-        currentUpdate.custom = updateMembership.custom;
-      }
-
-      payload.update.push(currentUpdate);
-    });
-  }
-
-  if (spaces && spaces.length > 0) {
-    payload.update = payload.update || [];
-    spaces.forEach(function (updateMembership) {
-      var currentUpdate = {
-        id: updateMembership.id
-      };
-
-      if (updateMembership.custom) {
-        currentUpdate.custom = updateMembership.custom;
-      }
-
-      payload.update.push(currentUpdate);
-    });
-  }
-
-  if (removeMemberships && removeMemberships.length > 0) {
-    payload.remove = [];
-    removeMemberships.forEach(function (removeMembershipId) {
-      payload.remove.push({
-        id: removeMembershipId
-      });
-    });
-  }
-
-  return prepareMessagePayload(modules, payload);
+  return prepareMessagePayload(modules, incomingParams);
 }
@@ -178,0 +183,0 @@

lib/core/endpoints/spaces/create_space.js

@@ -13,2 +13,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -24,5 +25,4 @@ exports.postPayload = postPayload;
 
-function prepareMessagePayload(modules, messagePayload) {
-  var stringifiedPayload = JSON.stringify(messagePayload);
-  return stringifiedPayload;
+function prepareMessagePayload(modules, incomingParams) {
+  return incomingParams;
 }
@@ -75,2 +75,7 @@
 
+function getAuthToken(modules, incomingParams) {
+  var token = modules.tokenManager.getToken('space', incomingParams.id) || modules.tokenManager.getToken('space');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -77,0 +82,0 @@ var include = incomingParams.include;

lib/core/endpoints/spaces/delete_space.js

@@ -12,2 +12,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -50,2 +51,7 @@ exports.handleResponse = handleResponse;
 
+function getAuthToken(modules, spaceId) {
+  var token = modules.tokenManager.getToken('space', spaceId) || modules.tokenManager.getToken('space');
+  return token;
+}
+
 function prepareParams() {
@@ -52,0 +58,0 @@ return {};

lib/core/endpoints/spaces/get_space.js

@@ -11,2 +11,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -44,2 +45,7 @@ exports.handleResponse = handleResponse;
 
+function getAuthToken(modules, incomingParams) {
+  var token = modules.tokenManager.getToken('space', incomingParams.spaceId) || modules.tokenManager.getToken('space');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -46,0 +52,0 @@ var include = incomingParams.include;

lib/core/endpoints/spaces/get_spaces.js

@@ -11,2 +11,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -41,2 +42,7 @@ exports.handleResponse = handleResponse;
 
+function getAuthToken(modules) {
+  var token = modules.tokenManager.getToken('space');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -43,0 +49,0 @@ var include = incomingParams.include,

lib/core/endpoints/spaces/update_space.js

@@ -13,2 +13,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -24,5 +25,4 @@ exports.patchPayload = patchPayload;
 
-function prepareMessagePayload(modules, messagePayload) {
-  var stringifiedPayload = JSON.stringify(messagePayload);
-  return stringifiedPayload;
+function prepareMessagePayload(modules, incomingParams) {
+  return incomingParams;
 }
@@ -77,2 +77,7 @@
 
+function getAuthToken(modules, incomingParams) {
+  var token = modules.tokenManager.getToken('space', incomingParams.id) || modules.tokenManager.getToken('space');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -79,0 +84,0 @@ var include = incomingParams.include;

lib/core/endpoints/users/create_user.js

@@ -13,2 +13,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -24,5 +25,4 @@ exports.postPayload = postPayload;
 
-function prepareMessagePayload(modules, messagePayload) {
-  var stringifiedPayload = JSON.stringify(messagePayload);
-  return stringifiedPayload;
+function prepareMessagePayload(modules, incomingParams) {
+  return incomingParams;
 }
@@ -75,2 +75,7 @@
 
+function getAuthToken(modules, incomingParams) {
+  var token = modules.tokenManager.getToken('user', incomingParams.id) || modules.tokenManager.getToken('user');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -77,0 +82,0 @@ var include = incomingParams.include;

lib/core/endpoints/users/delete_user.js

@@ -12,2 +12,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -50,2 +51,7 @@ exports.handleResponse = handleResponse;
 
+function getAuthToken(modules, userId) {
+  var token = modules.tokenManager.getToken('user', userId) || modules.tokenManager.getToken('user');
+  return token;
+}
+
 function prepareParams() {
@@ -52,0 +58,0 @@ return {};

lib/core/endpoints/users/get_user.js

@@ -11,2 +11,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -44,2 +45,7 @@ exports.handleResponse = handleResponse;
 
+function getAuthToken(modules, incomingParams) {
+  var token = modules.tokenManager.getToken('user', incomingParams.userId) || modules.tokenManager.getToken('user');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -46,0 +52,0 @@ var include = incomingParams.include;

lib/core/endpoints/users/get_users.js

@@ -11,2 +11,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -41,2 +42,7 @@ exports.handleResponse = handleResponse;
 
+function getAuthToken(modules) {
+  var token = modules.tokenManager.getToken('user');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -43,0 +49,0 @@ var include = incomingParams.include,

lib/core/endpoints/users/update_user.js

@@ -13,2 +13,3 @@ "use strict";
 exports.isAuthSupported = isAuthSupported;
+exports.getAuthToken = getAuthToken;
 exports.prepareParams = prepareParams;
@@ -24,5 +25,4 @@ exports.patchPayload = patchPayload;
 
-function prepareMessagePayload(modules, messagePayload) {
-  var stringifiedPayload = JSON.stringify(messagePayload);
-  return stringifiedPayload;
+function prepareMessagePayload(modules, incomingParams) {
+  return incomingParams;
 }
@@ -77,2 +77,7 @@
 
+function getAuthToken(modules, incomingParams) {
+  var token = modules.tokenManager.getToken('user', incomingParams.id) || modules.tokenManager.getToken('user');
+  return token;
+}
+
 function prepareParams(modules, incomingParams) {
@@ -79,0 +84,0 @@ var include = incomingParams.include;

lib/core/pubnub-common.js

@@ -16,2 +16,4 @@ "use strict";
 
+var _token_manager = _interopRequireDefault(require("./components/token_manager"));
+
 var _endpoint = _interopRequireDefault(require("./components/endpoint"));
@@ -89,2 +91,4 @@
 
+var grantTokenEndpointConfig = _interopRequireWildcard(require("./endpoints/access_manager/grant_token"));
+
 var publishEndpointConfig = _interopRequireWildcard(require("./endpoints/publish"));
@@ -136,2 +140,4 @@
 
+    _defineProperty(this, "_tokenManager", void 0);
+
     _defineProperty(this, "time", void 0);
@@ -165,2 +171,4 @@
 
+    _defineProperty(this, "grantToken", void 0);
+
     _defineProperty(this, "audit", void 0);
@@ -232,2 +240,14 @@
 
+    _defineProperty(this, "parseToken", void 0);
+
+    _defineProperty(this, "setToken", void 0);
+
+    _defineProperty(this, "setTokens", void 0);
+
+    _defineProperty(this, "getToken", void 0);
+
+    _defineProperty(this, "getTokens", void 0);
+
+    _defineProperty(this, "clearTokens", void 0);
+
     _defineProperty(this, "getAuthKey", void 0);
@@ -256,3 +276,4 @@
     var db = setup.db,
-        networking = setup.networking;
+        networking = setup.networking,
+        cbor = setup.cbor;
     var config = this._config = new _config["default"]({
@@ -266,6 +287,8 @@ setup: setup,
     networking.init(config);
+    var tokenManager = this._tokenManager = new _token_manager["default"](config, cbor);
     var modules = {
       config: config,
       networking: networking,
-      crypto: crypto
+      crypto: crypto,
+      tokenManager: tokenManager
     };
@@ -297,2 +320,8 @@
     this.removeAllListeners = listenerManager.removeAllListeners.bind(listenerManager);
+    this.parseToken = tokenManager.parseToken.bind(tokenManager);
+    this.setToken = tokenManager.setToken.bind(tokenManager);
+    this.setTokens = tokenManager.setTokens.bind(tokenManager);
+    this.getToken = tokenManager.getToken.bind(tokenManager);
+    this.getTokens = tokenManager.getTokens.bind(tokenManager);
+    this.clearTokens = tokenManager.clearTokens.bind(tokenManager);
     this.channelGroups = {
@@ -316,2 +345,3 @@ listGroups: _endpoint["default"].bind(this, modules, listChannelGroupsConfig),
     this.grant = _endpoint["default"].bind(this, modules, grantEndpointConfig);
+    this.grantToken = _endpoint["default"].bind(this, modules, grantTokenEndpointConfig);
     this.audit = _endpoint["default"].bind(this, modules, auditEndpointConfig);
@@ -318,0 +348,0 @@ this.publish = _endpoint["default"].bind(this, modules, publishEndpointConfig);

lib/node/index.js

@@ -14,2 +14,4 @@ "use strict";
 
+var _common2 = _interopRequireDefault(require("../cbor/common"));
+
 var _webNode = require("../networking/modules/web-node");
@@ -44,2 +46,3 @@
     setup.db = new _common["default"]();
+    setup.cbor = new _common2["default"]();
     setup.networking = new _networking["default"]({
@@ -46,0 +49,0 @@ keepAlive: _node.keepAlive,

lib/react_native/index.js

@@ -14,2 +14,4 @@ "use strict";
 
+var _common2 = _interopRequireDefault(require("../cbor/common"));
+
 var _webNode = require("../networking/modules/web-node");
@@ -42,2 +44,3 @@
     setup.db = new _common["default"]();
+    setup.cbor = new _common2["default"]();
     setup.networking = new _networking["default"]({
@@ -44,0 +47,0 @@ del: _webNode.del,

lib/titanium/index.js

@@ -14,2 +14,4 @@ "use strict";
 
+var _common2 = _interopRequireDefault(require("../cbor/common"));
+
 var _titanium = require("../networking/modules/titanium");
@@ -42,2 +44,3 @@
     setup.db = new _common["default"]();
+    setup.cbor = new _common2["default"]();
     setup.sdkFamily = 'TitaniumSDK';
@@ -44,0 +47,0 @@ setup.networking = new _networking["default"]({

lib/web/index.js

@@ -14,2 +14,4 @@ "use strict";
 
+var _common = _interopRequireDefault(require("../cbor/common"));
+
 var _webNode = require("../networking/modules/web-node");
@@ -54,2 +56,3 @@
     setup.db = _web["default"];
+    setup.cbor = new _common["default"]();
     setup.sdkFamily = 'Web';
@@ -56,0 +59,0 @@ setup.networking = new _networking["default"]({

package.json

 {
   "name": "pubnub",
-  "version": "4.25.2",
+  "version": "4.26.0",
   "author": "PubNub <[e-mail]>",
@@ -31,2 +31,3 @@ "description": "Publish & Subscribe Real-time Messaging with PubNub",
     "agentkeepalive": "^3.5.2",
+    "cbor-sync": "^1.0.4",
     "lil-uuid": "^0.1.1",
@@ -33,0 +34,0 @@ "superagent": "^3.8.1",

README.md

@@ -25,3 +25,3 @@ # PubNub JavaScript SDK (V4)
 
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.25.2.min.js
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.25.2.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.26.0.min.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.26.0.js

src/core/components/config.js

@@ -299,3 +299,3 @@ /* @flow */
   getVersion(): string {
-    return '4.25.2';
+    return '4.26.0';
   }
@@ -302,0 +302,0 @@

src/core/components/endpoint.js

@@ -36,2 +36,12 @@ import uuidGenerator from './uuid';
 
+function getAuthToken(endpoint, modules, incomingParams) {
+  let token;
+
+  if (endpoint.getAuthToken) {
+    token = endpoint.getAuthToken(modules, incomingParams);
+  }
+
+  return token;
+}
+
 function generatePNSDK(config: Config): string {
@@ -53,12 +63,42 @@ if (config.sdkName) {
 
-function signRequest(modules, url, outgoingParams) {
+function getHttpMethod(modules, endpoint, incomingParams) {
+  if (endpoint.usePost && endpoint.usePost(modules, incomingParams)) {
+    return 'POST';
+  } else if (endpoint.usePatch && endpoint.usePatch(modules, incomingParams)) {
+    return 'PATCH';
+  } else if (endpoint.useDelete && endpoint.useDelete(modules, incomingParams)) {
+    return 'DELETE';
+  } else {
+    return 'GET';
+  }
+}
+
+function signRequest(modules, url, outgoingParams, incomingParams, endpoint) {
   let { config, crypto } = modules;
 
+  let httpMethod = getHttpMethod(modules, endpoint, incomingParams);
+
   outgoingParams.timestamp = Math.floor(new Date().getTime() / 1000);
-  let signInput = `${config.subscribeKey}\n${config.publishKey}\n${url}\n`;
-  signInput += utils.signPamFromParams(outgoingParams);
+  let signInput = `${httpMethod}\n${config.publishKey}\n${url}\n${utils.signPamFromParams(outgoingParams)}\n`;
 
-  let signature = crypto.HMACSHA256(signInput);
+  if (httpMethod === 'POST') {
+    let payload = endpoint.postPayload(modules, incomingParams);
+    if (typeof payload === 'string') {
+      signInput += payload;
+    } else {
+      signInput += JSON.stringify(payload);
+    }
+  } else if (httpMethod === 'PATCH') {
+    let payload = endpoint.patchPayload(modules, incomingParams);
+    if (typeof payload === 'string') {
+      signInput += payload;
+    } else {
+      signInput += JSON.stringify(payload);
+    }
+  }
+
+  let signature = `v2.${crypto.HMACSHA256(signInput)}`;
   signature = signature.replace(/\+/g, '-');
   signature = signature.replace(/\//g, '_');
+  signature = signature.replace(/=+$/, '');
 
@@ -117,8 +157,13 @@ outgoingParams.signature = signature;
 
-  if (endpoint.isAuthSupported() && config.getAuthKey()) {
-    outgoingParams.auth = config.getAuthKey();
+  if (endpoint.isAuthSupported()) {
+    let token = getAuthToken(endpoint, modules, incomingParams);
+    let tokenOrKey = token || config.getAuthKey();
+
+    if (tokenOrKey) {
+      outgoingParams.auth = tokenOrKey;
+    }
   }
 
   if (config.secretKey) {
-    signRequest(modules, url, outgoingParams);
+    signRequest(modules, url, outgoingParams, incomingParams, endpoint);
   }
@@ -145,9 +190,9 @@
 
-  if (endpoint.usePost && endpoint.usePost(modules, incomingParams)) {
+  if (getHttpMethod(modules, endpoint, incomingParams) === 'POST') {
     let payload = endpoint.postPayload(modules, incomingParams);
     callInstance = networking.POST(outgoingParams, payload, networkingParams, onResponse);
-  } else if (endpoint.usePatch && endpoint.usePatch(modules, incomingParams)) {
+  } else if (getHttpMethod(modules, endpoint, incomingParams) === 'PATCH') {
     let payload = endpoint.patchPayload(modules, incomingParams);
     callInstance = networking.PATCH(outgoingParams, payload, networkingParams, onResponse);
-  } else if (endpoint.useDelete && endpoint.useDelete()) {
+  } else if (getHttpMethod(modules, endpoint, incomingParams) === 'DELETE') {
     callInstance = networking.DELETE(outgoingParams, networkingParams, onResponse);
@@ -154,0 +199,0 @@ } else {

src/core/constants/operations.js

@@ -56,2 +56,3 @@ /* @flow */
   PNAccessManagerGrant: 'PNAccessManagerGrant',
+  PNAccessManagerGrantToken: 'PNAccessManagerGrantToken',
   PNAccessManagerAudit: 'PNAccessManagerAudit',
@@ -58,0 +59,0 @@ //

src/core/endpoints/memberships/add_members.js

@@ -11,6 +11,21 @@ /* @flow */
 
-function prepareMessagePayload(modules, messagePayload) {
-  let stringifiedPayload = JSON.stringify(messagePayload);
+function prepareMessagePayload(modules, incomingParams) {
+  const { users } = incomingParams;
+  let payload = {};
 
-  return stringifiedPayload;
+  if (users && users.length > 0) {
+    payload.add = [];
+
+    users.forEach((addMember) => {
+      let currentAdd: AddMembers = { id: addMember.id };
+
+      if (addMember.custom) {
+        currentAdd.custom = addMember.custom;
+      }
+
+      payload.add.push(currentAdd);
+    });
+  }
+
+  return payload;
 }
@@ -62,2 +77,10 @@
 
+export function getAuthToken(modules: ModulesInject, incomingParams: MembersInput): string {
+  let token =
+    modules.tokenManager.getToken('space', incomingParams.spaceId) ||
+    modules.tokenManager.getToken('space');
+
+  return token;
+}
+
 export function prepareParams(
@@ -115,21 +138,4 @@ modules: ModulesInject,
   incomingParams: MembersInput
-): string {
-  const { users } = incomingParams;
-  let payload = {};
-
-  if (users && users.length > 0) {
-    payload.add = [];
-
-    users.forEach((addMember) => {
-      let currentAdd: AddMembers = { id: addMember.id };
-
-      if (addMember.custom) {
-        currentAdd.custom = addMember.custom;
-      }
-
-      payload.add.push(currentAdd);
-    });
-  }
-
-  return prepareMessagePayload(modules, payload);
+): Object {
+  return prepareMessagePayload(modules, incomingParams);
 }
@@ -136,0 +142,0 @@

src/core/endpoints/memberships/get_members.js

@@ -37,2 +37,10 @@ /* @flow */
 
+export function getAuthToken(modules: ModulesInject, incomingParams: MembersInput): string {
+  let token =
+    modules.tokenManager.getToken('space', incomingParams.spaceId) ||
+    modules.tokenManager.getToken('space');
+
+  return token;
+}
+
 export function prepareParams(
@@ -39,0 +47,0 @@ modules: ModulesInject,

src/core/endpoints/memberships/get_memberships.js

@@ -37,2 +37,10 @@ /* @flow */
 
+export function getAuthToken(modules: ModulesInject, incomingParams: MembershipsInput): string {
+  let token =
+    modules.tokenManager.getToken('user', incomingParams.userId) ||
+    modules.tokenManager.getToken('user');
+
+  return token;
+}
+
 export function prepareParams(
@@ -39,0 +47,0 @@ modules: ModulesInject,

src/core/endpoints/memberships/join_spaces.js

@@ -11,6 +11,21 @@ /* @flow */
 
-function prepareMessagePayload(modules, messagePayload) {
-  let stringifiedPayload = JSON.stringify(messagePayload);
+function prepareMessagePayload(modules, incomingParams) {
+  const { spaces } = incomingParams;
+  let payload = {};
 
-  return stringifiedPayload;
+  if (spaces && spaces.length > 0) {
+    payload.add = [];
+
+    spaces.forEach((addMembership) => {
+      let currentAdd: AddMemberships = { id: addMembership.id };
+
+      if (addMembership.custom) {
+        currentAdd.custom = addMembership.custom;
+      }
+
+      payload.add.push(currentAdd);
+    });
+  }
+
+  return payload;
 }
@@ -62,2 +77,10 @@
 
+export function getAuthToken(modules: ModulesInject, incomingParams: MembershipsInput): string {
+  let token =
+    modules.tokenManager.getToken('user', incomingParams.userId) ||
+    modules.tokenManager.getToken('user');
+
+  return token;
+}
+
 export function prepareParams(
@@ -115,21 +138,4 @@ modules: ModulesInject,
   incomingParams: MembershipsInput
-): string {
-  const { spaces } = incomingParams;
-  let payload = {};
-
-  if (spaces && spaces.length > 0) {
-    payload.add = [];
-
-    spaces.forEach((addMembership) => {
-      let currentAdd: AddMemberships = { id: addMembership.id };
-
-      if (addMembership.custom) {
-        currentAdd.custom = addMembership.custom;
-      }
-
-      payload.add.push(currentAdd);
-    });
-  }
-
-  return prepareMessagePayload(modules, payload);
+): Object {
+  return prepareMessagePayload(modules, incomingParams);
 }
@@ -136,0 +142,0 @@

src/core/endpoints/memberships/leave_spaces.js

@@ -10,6 +10,15 @@ /* @flow */
 
-function prepareMessagePayload(modules, messagePayload) {
-  let stringifiedPayload = JSON.stringify(messagePayload);
+function prepareMessagePayload(modules, incomingParams) {
+  const { spaces } = incomingParams;
+  let payload = {};
 
-  return stringifiedPayload;
+  if (spaces && spaces.length > 0) {
+    payload.remove = [];
+
+    spaces.forEach((removeMembershipId) => {
+      payload.remove.push({ id: removeMembershipId });
+    });
+  }
+
+  return payload;
 }
@@ -61,2 +70,10 @@
 
+export function getAuthToken(modules: ModulesInject, incomingParams: MembershipsInput): string {
+  let token =
+    modules.tokenManager.getToken('user', incomingParams.userId) ||
+    modules.tokenManager.getToken('user');
+
+  return token;
+}
+
 export function prepareParams(
@@ -114,15 +131,4 @@ modules: ModulesInject,
   incomingParams: MembershipsInput
-): string {
-  const { spaces } = incomingParams;
-  let payload = {};
-
-  if (spaces && spaces.length > 0) {
-    payload.remove = [];
-
-    spaces.forEach((removeMembershipId) => {
-      payload.remove.push({ id: removeMembershipId });
-    });
-  }
-
-  return prepareMessagePayload(modules, payload);
+): Object {
+  return prepareMessagePayload(modules, incomingParams);
 }
@@ -129,0 +135,0 @@

src/core/endpoints/memberships/remove_members.js

@@ -10,6 +10,15 @@ /* @flow */
 
-function prepareMessagePayload(modules, messagePayload) {
-  let stringifiedPayload = JSON.stringify(messagePayload);
+function prepareMessagePayload(modules, incomingParams) {
+  const { users } = incomingParams;
+  let payload = {};
 
-  return stringifiedPayload;
+  if (users && users.length > 0) {
+    payload.remove = [];
+
+    users.forEach((removeMemberId) => {
+      payload.remove.push({ id: removeMemberId });
+    });
+  }
+
+  return payload;
 }
@@ -61,2 +70,10 @@
 
+export function getAuthToken(modules: ModulesInject, incomingParams: MembersInput): string {
+  let token =
+    modules.tokenManager.getToken('space', incomingParams.spaceId) ||
+    modules.tokenManager.getToken('space');
+
+  return token;
+}
+
 export function prepareParams(
@@ -114,15 +131,4 @@ modules: ModulesInject,
   incomingParams: MembersInput
-): string {
-  const { users } = incomingParams;
-  let payload = {};
-
-  if (users && users.length > 0) {
-    payload.remove = [];
-
-    users.forEach((removeMemberId) => {
-      payload.remove.push({ id: removeMemberId });
-    });
-  }
-
-  return prepareMessagePayload(modules, payload);
+): Object {
+  return prepareMessagePayload(modules, incomingParams);
 }
@@ -129,0 +135,0 @@

src/core/endpoints/memberships/update_members.js

@@ -12,6 +12,58 @@ /* @flow */
 
-function prepareMessagePayload(modules, messagePayload) {
-  let stringifiedPayload = JSON.stringify(messagePayload);
+function prepareMessagePayload(modules, incomingParams) {
+  const { addMembers, updateMembers, removeMembers, users } = incomingParams;
+  let payload = {};
 
-  return stringifiedPayload;
+  if (addMembers && addMembers.length > 0) {
+    payload.add = [];
+
+    addMembers.forEach((addMember) => {
+      let currentAdd: AddMembers = { id: addMember.id };
+
+      if (addMember.custom) {
+        currentAdd.custom = addMember.custom;
+      }
+
+      payload.add.push(currentAdd);
+    });
+  }
+
+  if (updateMembers && updateMembers.length > 0) {
+    payload.update = [];
+
+    updateMembers.forEach((updateMember) => {
+      let currentUpdate: UpdateMembers = { id: updateMember.id };
+
+      if (updateMember.custom) {
+        currentUpdate.custom = updateMember.custom;
+      }
+
+      payload.update.push(currentUpdate);
+    });
+  }
+
+  // if users is present then it is an update
+  if (users && users.length > 0) {
+    payload.update = payload.update || [];
+
+    users.forEach((updateMember) => {
+      let currentUpdate: UpdateMembers = { id: updateMember.id };
+
+      if (updateMember.custom) {
+        currentUpdate.custom = updateMember.custom;
+      }
+
+      payload.update.push(currentUpdate);
+    });
+  }
+
+  if (removeMembers && removeMembers.length > 0) {
+    payload.remove = [];
+
+    removeMembers.forEach((removeMemberId) => {
+      payload.remove.push({ id: removeMemberId });
+    });
+  }
+
+  return payload;
 }
@@ -63,2 +115,10 @@
 
+export function getAuthToken(modules: ModulesInject, incomingParams: MembersInput): string {
+  let token =
+    modules.tokenManager.getToken('space', incomingParams.spaceId) ||
+    modules.tokenManager.getToken('space');
+
+  return token;
+}
+
 export function prepareParams(
@@ -116,58 +176,4 @@ modules: ModulesInject,
   incomingParams: MembersInput
-): string {
-  const { addMembers, updateMembers, removeMembers, users } = incomingParams;
-  let payload = {};
-
-  if (addMembers && addMembers.length > 0) {
-    payload.add = [];
-
-    addMembers.forEach((addMember) => {
-      let currentAdd: AddMembers = { id: addMember.id };
-
-      if (addMember.custom) {
-        currentAdd.custom = addMember.custom;
-      }
-
-      payload.add.push(currentAdd);
-    });
-  }
-
-  if (updateMembers && updateMembers.length > 0) {
-    payload.update = [];
-
-    updateMembers.forEach((updateMember) => {
-      let currentUpdate: UpdateMembers = { id: updateMember.id };
-
-      if (updateMember.custom) {
-        currentUpdate.custom = updateMember.custom;
-      }
-
-      payload.update.push(currentUpdate);
-    });
-  }
-
-  // if users is present then it is an update
-  if (users && users.length > 0) {
-    payload.update = payload.update || [];
-
-    users.forEach((updateMember) => {
-      let currentUpdate: UpdateMembers = { id: updateMember.id };
-
-      if (updateMember.custom) {
-        currentUpdate.custom = updateMember.custom;
-      }
-
-      payload.update.push(currentUpdate);
-    });
-  }
-
-  if (removeMembers && removeMembers.length > 0) {
-    payload.remove = [];
-
-    removeMembers.forEach((removeMemberId) => {
-      payload.remove.push({ id: removeMemberId });
-    });
-  }
-
-  return prepareMessagePayload(modules, payload);
+): Object {
+  return prepareMessagePayload(modules, incomingParams);
 }
@@ -174,0 +180,0 @@

src/core/endpoints/memberships/update_memberships.js

@@ -12,6 +12,58 @@ /* @flow */
 
-function prepareMessagePayload(modules, messagePayload) {
-  let stringifiedPayload = JSON.stringify(messagePayload);
+function prepareMessagePayload(modules, incomingParams) {
+  const { addMemberships, updateMemberships, removeMemberships, spaces } = incomingParams;
+  let payload = {};
 
-  return stringifiedPayload;
+  if (addMemberships && addMemberships.length > 0) {
+    payload.add = [];
+
+    addMemberships.forEach((addMembership) => {
+      let currentAdd: AddMemberships = { id: addMembership.id };
+
+      if (addMembership.custom) {
+        currentAdd.custom = addMembership.custom;
+      }
+
+      payload.add.push(currentAdd);
+    });
+  }
+
+  if (updateMemberships && updateMemberships.length > 0) {
+    payload.update = [];
+
+    updateMemberships.forEach((updateMembership) => {
+      let currentUpdate: UpdateMemberships = { id: updateMembership.id };
+
+      if (updateMembership.custom) {
+        currentUpdate.custom = updateMembership.custom;
+      }
+
+      payload.update.push(currentUpdate);
+    });
+  }
+
+  // if spaces is present then it is an update
+  if (spaces && spaces.length > 0) {
+    payload.update = payload.update || [];
+
+    spaces.forEach((updateMembership) => {
+      let currentUpdate: UpdateMemberships = { id: updateMembership.id };
+
+      if (updateMembership.custom) {
+        currentUpdate.custom = updateMembership.custom;
+      }
+
+      payload.update.push(currentUpdate);
+    });
+  }
+
+  if (removeMemberships && removeMemberships.length > 0) {
+    payload.remove = [];
+
+    removeMemberships.forEach((removeMembershipId) => {
+      payload.remove.push({ id: removeMembershipId });
+    });
+  }
+
+  return payload;
 }
@@ -63,2 +115,10 @@
 
+export function getAuthToken(modules: ModulesInject, incomingParams: MembershipsInput): string {
+  let token =
+    modules.tokenManager.getToken('user', incomingParams.userId) ||
+    modules.tokenManager.getToken('user');
+
+  return token;
+}
+
 export function prepareParams(
@@ -116,58 +176,4 @@ modules: ModulesInject,
   incomingParams: MembershipsInput
-): string {
-  const { addMemberships, updateMemberships, removeMemberships, spaces } = incomingParams;
-  let payload = {};
-
-  if (addMemberships && addMemberships.length > 0) {
-    payload.add = [];
-
-    addMemberships.forEach((addMembership) => {
-      let currentAdd: AddMemberships = { id: addMembership.id };
-
-      if (addMembership.custom) {
-        currentAdd.custom = addMembership.custom;
-      }
-
-      payload.add.push(currentAdd);
-    });
-  }
-
-  if (updateMemberships && updateMemberships.length > 0) {
-    payload.update = [];
-
-    updateMemberships.forEach((updateMembership) => {
-      let currentUpdate: UpdateMemberships = { id: updateMembership.id };
-
-      if (updateMembership.custom) {
-        currentUpdate.custom = updateMembership.custom;
-      }
-
-      payload.update.push(currentUpdate);
-    });
-  }
-
-  // if spaces is present then it is an update
-  if (spaces && spaces.length > 0) {
-    payload.update = payload.update || [];
-
-    spaces.forEach((updateMembership) => {
-      let currentUpdate: UpdateMemberships = { id: updateMembership.id };
-
-      if (updateMembership.custom) {
-        currentUpdate.custom = updateMembership.custom;
-      }
-
-      payload.update.push(currentUpdate);
-    });
-  }
-
-  if (removeMemberships && removeMemberships.length > 0) {
-    payload.remove = [];
-
-    removeMemberships.forEach((removeMembershipId) => {
-      payload.remove.push({ id: removeMembershipId });
-    });
-  }
-
-  return prepareMessagePayload(modules, payload);
+): Object {
+  return prepareMessagePayload(modules, incomingParams);
 }
@@ -174,0 +180,0 @@

src/core/endpoints/spaces/create_space.js

@@ -10,6 +10,4 @@ /* @flow */
 
-function prepareMessagePayload(modules, messagePayload) {
-  let stringifiedPayload = JSON.stringify(messagePayload);
-
-  return stringifiedPayload;
+function prepareMessagePayload(modules, incomingParams) {
+  return incomingParams;
 }
@@ -66,2 +64,10 @@
 
+export function getAuthToken(modules: ModulesInject, incomingParams: SpacesObjectInput): string {
+  let token =
+    modules.tokenManager.getToken('space', incomingParams.id) ||
+    modules.tokenManager.getToken('space');
+
+  return token;
+}
+
 export function prepareParams(
@@ -103,3 +109,3 @@ modules: ModulesInject,
   incomingParams: SpacesObjectInput
-): string {
+): Object {
   return prepareMessagePayload(modules, incomingParams);
@@ -106,0 +112,0 @@ }

src/core/endpoints/spaces/delete_space.js

@@ -32,2 +32,10 @@ /* @flow */
 
+export function getAuthToken(modules: ModulesInject, spaceId: string): string {
+  let token =
+    modules.tokenManager.getToken('space', spaceId) ||
+    modules.tokenManager.getToken('space');
+
+  return token;
+}
+
 export function prepareParams(): Object {
@@ -34,0 +42,0 @@ return {};

src/core/endpoints/spaces/get_space.js

@@ -36,2 +36,10 @@ /* @flow */
 
+export function getAuthToken(modules: ModulesInject, incomingParams: SingleSpaceInput): string {
+  let token =
+    modules.tokenManager.getToken('space', incomingParams.spaceId) ||
+    modules.tokenManager.getToken('space');
+
+  return token;
+}
+
 export function prepareParams(
@@ -38,0 +46,0 @@ modules: ModulesInject,

src/core/endpoints/spaces/get_spaces.js

@@ -34,2 +34,8 @@ /* @flow */
 
+export function getAuthToken(modules: ModulesInject): string {
+  let token = modules.tokenManager.getToken('space');
+
+  return token;
+}
+
 export function prepareParams(
@@ -36,0 +42,0 @@ modules: ModulesInject,

src/core/endpoints/spaces/update_space.js

@@ -10,6 +10,4 @@ /* @flow */
 
-function prepareMessagePayload(modules, messagePayload) {
-  let stringifiedPayload = JSON.stringify(messagePayload);
-
-  return stringifiedPayload;
+function prepareMessagePayload(modules, incomingParams) {
+  return incomingParams;
 }
@@ -68,2 +66,10 @@
 
+export function getAuthToken(modules: ModulesInject, incomingParams: SpacesObjectInput): string {
+  let token =
+    modules.tokenManager.getToken('space', incomingParams.id) ||
+    modules.tokenManager.getToken('space');
+
+  return token;
+}
+
 export function prepareParams(
@@ -105,3 +111,3 @@ modules: ModulesInject,
   incomingParams: SpacesObjectInput
-): string {
+): Object {
   return prepareMessagePayload(modules, incomingParams);
@@ -108,0 +114,0 @@ }

src/core/endpoints/users/create_user.js

@@ -10,6 +10,4 @@ /* @flow */
 
-function prepareMessagePayload(modules, messagePayload) {
-  let stringifiedPayload = JSON.stringify(messagePayload);
-
-  return stringifiedPayload;
+function prepareMessagePayload(modules, incomingParams) {
+  return incomingParams;
 }
@@ -66,2 +64,10 @@
 
+export function getAuthToken(modules: ModulesInject, incomingParams: UsersObjectInput): string {
+  let token =
+    modules.tokenManager.getToken('user', incomingParams.id) ||
+    modules.tokenManager.getToken('user');
+
+  return token;
+}
+
 export function prepareParams(
@@ -103,3 +109,3 @@ modules: ModulesInject,
   incomingParams: UsersObjectInput
-): string {
+): Object {
   return prepareMessagePayload(modules, incomingParams);
@@ -106,0 +112,0 @@ }

src/core/endpoints/users/delete_user.js

@@ -32,2 +32,10 @@ /* @flow */
 
+export function getAuthToken(modules: ModulesInject, userId: string): string {
+  let token =
+    modules.tokenManager.getToken('user', userId) ||
+    modules.tokenManager.getToken('user');
+
+  return token;
+}
+
 export function prepareParams(): Object {
@@ -34,0 +42,0 @@ return {};

src/core/endpoints/users/get_user.js

@@ -37,2 +37,10 @@ /* @flow */
 
+export function getAuthToken(modules: ModulesInject, incomingParams: SingleUserInput): string {
+  let token =
+    modules.tokenManager.getToken('user', incomingParams.userId) ||
+    modules.tokenManager.getToken('user');
+
+  return token;
+}
+
 export function prepareParams(
@@ -39,0 +47,0 @@ modules: ModulesInject,

src/core/endpoints/users/get_users.js

@@ -33,2 +33,8 @@ /* @flow */
 
+export function getAuthToken(modules: ModulesInject): string {
+  let token = modules.tokenManager.getToken('user');
+
+  return token;
+}
+
 export function prepareParams(
@@ -35,0 +41,0 @@ modules: ModulesInject,

src/core/endpoints/users/update_user.js

@@ -10,6 +10,4 @@ /* @flow */
 
-function prepareMessagePayload(modules, messagePayload) {
-  let stringifiedPayload = JSON.stringify(messagePayload);
-
-  return stringifiedPayload;
+function prepareMessagePayload(modules, incomingParams) {
+  return incomingParams;
 }
@@ -68,2 +66,10 @@
 
+export function getAuthToken(modules: ModulesInject, incomingParams: UsersObjectInput): string {
+  let token =
+    modules.tokenManager.getToken('user', incomingParams.id) ||
+    modules.tokenManager.getToken('user');
+
+  return token;
+}
+
 export function prepareParams(
@@ -105,3 +111,3 @@ modules: ModulesInject,
   incomingParams: UsersObjectInput
-): string {
+): Object {
   return prepareMessagePayload(modules, incomingParams);
@@ -108,0 +114,0 @@ }

src/core/flow_interfaces.js

@@ -404,2 +404,70 @@ /* eslint no-unused-vars: 0 */
 
+// Base permissions object
+interface GrantTokenObject {
+  create: boolean,
+  read: boolean,
+  write: boolean,
+  manage: boolean,
+  delete: boolean,
+}
+
+interface GrantTokenInput {
+  ttl: number,
+  resources?: {
+    channels?: {
+      [key: String]: GrantTokenObject,
+    },
+    groups?: {
+      [key: String]: GrantTokenObject,
+    },
+    users?: {
+      [key: String]: GrantTokenObject,
+    },
+    spaces?: {
+      [key: String]: GrantTokenObject,
+    },
+  },
+  patterns?: {
+    channels?: {
+      [key: String]: GrantTokenObject,
+    },
+    groups?: {
+      [key: String]: GrantTokenObject,
+    },
+    users?: {
+      [key: String]: GrantTokenObject,
+    },
+    spaces?: {
+      [key: String]: GrantTokenObject,
+    },
+  },
+  meta?: Object
+}
+
+interface GrantTokenOutput extends GrantTokenInput {
+  version: number,
+  timestamp: number,
+  signature: Buffer
+}
+
+// token manager
+
+type TokensDefinition = {
+  user?: string,
+  space?: string,
+  users?: {
+    [key: String]: String
+  },
+  spaces?: {
+    [key: String]: String
+  }
+};
+
+type GetTokensInput= {
+  user?: boolean,
+  space?: boolean,
+  users?:  Array<string>,
+  spaces?:  Array<string>
+};
+
 // publish
@@ -451,3 +519,3 @@
 
-type UserObjectInput = {
+type UsersObjectInput = {
   id: string,
@@ -464,3 +532,3 @@ name: string,
   data: {
-    ...UserObjectInput,
+    ...UsersObjectInput,
     created: string,
@@ -472,3 +540,2 @@ updated: string,
 
-
 type UsersListResponse = {
@@ -484,2 +551,21 @@ status: number,
 
+type SpaceListInput = {
+  limit?: number,
+  page?: {
+    next?: string,
+    prev?: string,
+  },
+  include?: {
+    totalCount?: boolean,
+    customFields?: boolean,
+  }
+}
+
+type SingleSpaceInput = {
+  spaceId: string,
+  include?: {
+    customFields?: boolean,
+  }
+}
+
 type SpacesObjectInput = {
@@ -505,2 +591,20 @@ id: string,
 
+type SpaceResponse = {
+  status: number,
+  data: {
+    ...SpacesObjectInput,
+    created: string,
+    updated: string,
+    eTag: string,
+  },
+};
+
+type SpacesListResponse = {
+  status: number,
+  totalCount: number,
+  next: String,
+  prev: String,
+  data: Array<SpaceResponse>,
+};
+
 // Memberships Object
@@ -564,3 +668,3 @@
 type MembersInput = {
-  userId: string,
+  spaceId: string,
   limit?: number,
@@ -567,0 +671,0 @@ page?: {

src/core/pubnub-common.js

@@ -7,2 +7,3 @@ /* @flow */
 import ListenerManager from './components/listener_manager';
+import TokenManager from './components/token_manager';
 
@@ -52,2 +53,3 @@ import endpointCreator from './components/endpoint';
 import * as grantEndpointConfig from './endpoints/access_manager/grant';
+import * as grantTokenEndpointConfig from './endpoints/access_manager/grant_token';
 
@@ -72,2 +74,3 @@ import * as publishEndpointConfig from './endpoints/publish';
   _listenerManager: ListenerManager;
+  _tokenManager: TokenManager;
 
@@ -95,2 +98,3 @@ // tell flow about the mounted endpoint
   grant: Function;
+  grantToken: Function;
   audit: Function;
@@ -138,2 +142,9 @@ //
 
+  parseToken: Function;
+  setToken: Function;
+  setTokens: Function;
+  getToken: Function;
+  getTokens: Function;
+  clearTokens: Function;
+
   getAuthKey: Function;
@@ -159,3 +170,3 @@ setAuthKey: Function;
   constructor(setup: InternalSetupStruct) {
-    let { db, networking } = setup;
+    let { db, networking, cbor } = setup;
 
@@ -167,4 +178,6 @@ const config = (this._config = new Config({ setup, db }));
 
-    let modules = { config, networking, crypto };
+    const tokenManager = (this._tokenManager = new TokenManager(config, cbor));
 
+    let modules = { config, networking, crypto, tokenManager };
+
     const timeEndpoint = endpointCreator.bind(
@@ -216,2 +229,9 @@ this,
 
+    this.parseToken = tokenManager.parseToken.bind(tokenManager);
+    this.setToken = tokenManager.setToken.bind(tokenManager);
+    this.setTokens = tokenManager.setTokens.bind(tokenManager);
+    this.getToken = tokenManager.getToken.bind(tokenManager);
+    this.getTokens = tokenManager.getTokens.bind(tokenManager);
+    this.clearTokens = tokenManager.clearTokens.bind(tokenManager);
+
     /* channel groups */
@@ -265,2 +285,3 @@ this.channelGroups = {
     this.grant = endpointCreator.bind(this, modules, grantEndpointConfig);
+    this.grantToken = endpointCreator.bind(this, modules, grantTokenEndpointConfig);
     this.audit = endpointCreator.bind(this, modules, auditEndpointConfig);
@@ -267,0 +288,0 @@ //

src/node/index.js

@@ -6,2 +6,3 @@ /* @flow */
 import Database from '../db/common';
+import Cbor from '../cbor/common';
 import { del, get, patch, post } from '../networking/modules/web-node';
@@ -14,2 +15,3 @@ import { keepAlive, proxy } from '../networking/modules/node';
     setup.db = new Database();
+    setup.cbor = new Cbor();
     setup.networking = new Networking({ keepAlive, del, get, post, patch, proxy });
@@ -16,0 +18,0 @@ setup.sdkFamily = 'Nodejs';

src/react_native/index.js

@@ -6,2 +6,3 @@ /* @flow */
 import Database from '../db/common';
+import Cbor from '../cbor/common';
 import { del, get, post, patch } from '../networking/modules/web-node';
@@ -13,2 +14,3 @@ import { InternalSetupStruct } from '../core/flow_interfaces';
     setup.db = new Database();
+    setup.cbor = new Cbor();
     setup.networking = new Networking({ del, get, post, patch });
@@ -15,0 +17,0 @@ setup.sdkFamily = 'ReactNative';

src/titanium/index.js

@@ -6,2 +6,3 @@ /* @flow */
 import Database from '../db/common';
+import Cbor from '../cbor/common';
 import { del, get, post, patch } from '../networking/modules/titanium';
@@ -13,2 +14,3 @@ import { InternalSetupStruct } from '../core/flow_interfaces';
     setup.db = new Database();
+    setup.cbor = new Cbor();
     setup.sdkFamily = 'TitaniumSDK';
@@ -15,0 +17,0 @@ setup.networking = new Networking({ del, get, post, patch });

src/web/index.js

@@ -7,2 +7,3 @@ /* @flow */
 import db from '../db/web';
+import Cbor from '../cbor/common';
 import { del, get, post, patch } from '../networking/modules/web-node';
@@ -25,2 +26,3 @@ import { InternalSetupStruct } from '../core/flow_interfaces';
     setup.db = db;
+    setup.cbor = new Cbor();
     setup.sdkFamily = 'Web';
@@ -27,0 +29,0 @@ setup.networking = new Networking({ del, get, post, patch, sendBeacon });

test/integration/components/subscription_manager.test.js

@@ -551,3 +551,2 @@ /* global describe, beforeEach, it, before, afterEach, after */
     setTimeout(() => {
-      console.log(messageCount);
       if (messageCount === 3) {
@@ -554,0 +553,0 @@ done();

test/integration/endpoints/access.test.js

@@ -48,3 +48,3 @@ /* global describe, beforeEach, it, before, after */
           pnsdk: 'PubNub-JS-Nodejs/suchJavascript',
-          signature: 'T7d76LD7SJJdhaljs8yku5cY04TvynsCVBs2D8FMF8Y=',
+          signature: 'v2.I7AFqanrAAtwVfvLHyKECTWw7UcZmwbRnwENpXdGB9E',
         })
@@ -84,3 +84,3 @@ .reply(
           pnsdk: 'PubNub-JS-Nodejs/suchJavascript',
-          signature: 'P3xBKue_zoj23Kc0JcTDmeLO751R_bYtr74LFEyfwZM=',
+          signature: 'v2.2hdDeYpF_Hoo4XLK2CMlZApcLin5lJxh6vsKMQnTet8',
         })
@@ -120,3 +120,3 @@ .reply(
           pnsdk: 'PubNub-JS-Nodejs/suchJavascript',
-          signature: 'OlwW-JbL2_pnp9qLaCnQwc2oWAoybQYi4wqLOegc1Kg=',
+          signature: 'v2.lVKZELiJFleDoPqMkSgojCUsX39AZqop7bKVyHv-T_s',
         })
@@ -159,3 +159,3 @@ .reply(
           pnsdk: 'PubNub-JS-Nodejs/suchJavascript',
-          signature: 'eHfy2MycQdZySF95iavsSftLDD0oG5umBKgTxHbMFwg=',
+          signature: 'v2.D1gsJZ7zAo5CJAYNJW4gvegRoaF0QBkMZcCQonXJLKo',
           r: 0,
@@ -190,3 +190,3 @@ w: 0,
           pnsdk: 'PubNub-JS-Nodejs/suchJavascript',
-          signature: 'B4QZ4K5nd_eI0AT6JAw4Ubk57x87-Ze7jsihw-vV--A=',
+          signature: 'v2.zq2yORr4O0AjHIgGtI4rjmZ866o_iurekk9hVMpfsvY',
           r: 1,
@@ -226,3 +226,3 @@ w: 1,
           pnsdk: 'PubNub-JS-Nodejs/suchJavascript',
-          signature: 'CAPs9l4jliNPnle-Tx7PjZCLTYQYg9CU9YKaiAYTuRQ=',
+          signature: 'v2.J7G4Z6DYnnSsLaeCfyRG4-2EMCvRyu_P3SFLl3E5A8g',
           r: 1,
@@ -229,0 +229,0 @@ w: 1,

webpack.config.common.js

 let config = {
   mode: 'production',
+  optimization: {
+    minimize: false
+  },
   module: {
@@ -4,0 +7,0 @@ rules: [

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

5338924

increased by14.63%

Number of package files

408

increased by3.03%

Lines of code

68251

increased by41.2%

Worsened metrics

Dependency count

5

increased by25%

Dependency changes

• + Addedcbor-sync@^1.0.4

• + Addedcbor-sync@1.0.4(transitive)