comprodls-sdk 2.86.2-valky → 2.90.2

package/dist/comprodls-sdk.js

@@ -207,18 +207,6 @@ exports.REALM_HOSTS = {
       ANALYTICS: 'http://dls-asgard-thor-1453383019.us-west-2.elb.amazonaws.com/lb-analytics',
       INTEGRATION: 'http://dls-asgard-thor-1453383019.us-west-2.elb.amazonaws.com/lb-integrations',
       DRIVE: 'http://dls-asgard-thor-1453383019.us-west-2.elb.amazonaws.com/lb-drive'
-    },
-    VALKY: {
-      PUB: 'http://internal-dls-asgard-valky-1830585247.us-west-2.elb.amazonaws.com/lb-pub',
-      AUTH: 'http://internal-dls-asgard-valky-1830585247.us-west-2.elb.amazonaws.com/lb-auth',
-      AUTHEXTN: 'http://internal-dls-asgard-valky-1830585247.us-west-2.elb.amazonaws.com/lb-authextn',
-      PUSHX: 'http://internal-dls-asgard-valky-1830585247.us-west-2.elb.amazonaws.com/lb-pushx',
-      XAPI: 'http://internal-dls-asgard-valky-1830585247.us-west-2.elb.amazonaws.com/lb-xapi',
-      ATTEMPTS: 'http://internal-dls-asgard-valky-1830585247.us-west-2.elb.amazonaws.com/lb-attempts',
-      PRODUCT: 'http://internal-dls-asgard-valky-1830585247.us-west-2.elb.amazonaws.com/lb-product',
-      ANALYTICS: 'http://internal-dls-asgard-valky-1830585247.us-west-2.elb.amazonaws.com/lb-analytics',
-      INTEGRATION: 'http://internal-dls-asgard-valky-1830585247.us-west-2.elb.amazonaws.com/lb-integrations',
-      DRIVE: 'http://internal-dls-asgard-valky-1830585247.us-west-2.elb.amazonaws.com/lb-drive'
     }
   },
   CUP: {
@@ -304,7 +292,6 @@ exports.AUTH_API_URLS = {
     getParticularShadowClassAPI: '/org/{orgId}/shadow/classes/{extClassId}',
     classProductAssociation: '/org/{orgId}/classes/{classId}/associate-product/{productcode}',
     multiClassProductAssociations: '/org/{orgId}/classes/{classId}/associate-product/multi',
-    classMaterialAssociation: '/org/{orgId}/classes/{classId}/associate-materials/multi',
     enrollUsertoClass: '/org/{orgId}/classes/{classId}/enroll-user/{userId}',
     enrollSelftoClass: '/org/{orgId}/classes/{classId}/enroll-self',
     enrollMultiUserstoClass: '/org/{orgId}/classes/{classId}/enroll-user/multi',
@@ -487,7 +474,8 @@ exports.PRODUCT_API_URLS = {
 
 exports.XAPI_API_URLS = {
     postMultiStatements: '/{orgId}/statements/multi',
-    postExternalMultiStatements: '/{orgId}/external/statements/multi'
+    postExternalMultiStatements: '/{orgId}/external/statements/multi',
+    resetUserProductProgress: '/accounts/{accountId}/progress/user/product/reset'
 };
 
 exports.ATTEMPTS_API_URLS = {
@@ -515,9 +503,7 @@ exports.PUB_API_URLS = {
 
 exports.PUSHX_API_URLS = {
     grantByUserOrgId: '/orgs/{orgId}/grants',
-    grantByAccountId: '/accounts/{accountId}/grants',
-    grantV2: '/ver/v2/grants',
-    getPushedEvents: '/accounts/{accountId}/pushed-events/channels'
+    grantByAccountId: '/accounts/{accountId}/grants'
 };
 
 exports.INTEGRATIONS_API_URLS = {
@@ -935,9 +921,7 @@ function validateGenericAPICaller(apiName, method, url, params) {
 var ERROR_TYPES = {
     "API_ERROR": "API_ERROR",
     "SDK_ERROR": "SDK_ERROR",
-    "CHANNEL_SUBSCRIPTION": "CHANNEL_SUBSCRIPTION",
-    "UNEXPECTED_ERROR": "UNEXPECTED_ERROR",
-    "POLLING_INITIATION": "POLLING_INITIATION"
+    "CHANNEL_SUBSCRIPTION": "CHANNEL_SUBSCRIPTION"
 };
 
 var ERROR_CATEGORY = {
@@ -1028,7 +1012,7 @@ function PUSHXError(category, error) {
 
     if (category === ERROR_CATEGORY.PUSHX) {
         this.category = ERROR_CATEGORY.PUSHX;
-        this.type = error.type || ERROR_TYPES.CHANNEL_SUBSCRIPTION;
+        this.type = ERROR_TYPES.CHANNEL_SUBSCRIPTION;
         this.status = ERROR_STATUS.ERROR;
         this.message = error.message;
         this.data = error;
@@ -4580,8 +4564,6 @@ function auth() {
     createClassProductAssociation: createClassProductAssociation.bind(this),
     removeClassProductAssociation: removeClassProductAssociation.bind(this),
     createMultiClassProductAssociations: createMultiClassProductAssociations.bind(this),
-    associateMaterialsWithClass: associateMaterialsWithClass.bind(this),
-    unassociateMaterialsWithClass: unassociateMaterialsWithClass.bind(this),
     addItemsToShowcaseOfAClass: addItemsToShowcaseOfAClass.bind(this),
     deleteItemsFromShowcaseOfAClass: deleteItemsFromShowcaseOfAClass.bind(this),
 
@@ -5900,111 +5882,6 @@ function createClassProductAssociation(options) {
   return dfd.promise;
 }
 
-/**
- * @param {
- *   *classId: 'string',
- *   *body: {
- *     productcodes: ['string'],
- *     bundlecodes: ['string'],
- *   }
- * } options
- */
-function associateMaterialsWithClass(options) {
-  var self = this;
-  // Initializing promise
-  var dfd = q.defer();
-  // Validations
-  var err = helpers.validations.isAuthenticated(self.orgId, self.token);
-  if(err) { dfd.reject(err); }
-  else {
-    if(options && options.classId && options.body && (options.body.productcodes
-      || options.body.bundlecodes)) {
-      // Passed all validations, Contruct API url
-      var url = self.config.DEFAULT_HOSTS.AUTH +
-                self.config.AUTH_API_URLS.classMaterialAssociation;
-      url = helpers.api.constructAPIUrl(url, {
-        orgId: self.orgId, classId: options.classId
-      });
-      // Setup request with URL and Params
-      var requestAPI = request.post(url)
-                       .set('Content-Type', 'application/json')
-                       .set('Accept', 'application/json');
-      if(self.traceid) { requestAPI.set('X-Amzn-Trace-Id', self.traceid); }
-
-      // Setup token in Authorization header
-      requestAPI = helpers.api.setupAPIToken(requestAPI, self.token);
-
-      requestAPI.agent(keepaliveAgent).end(function(err, response) {
-        if(err) {
-          err = new DLSError(helpers.errors.ERROR_TYPES.API_ERROR, err);
-          dfd.reject(err);
-        }
-        else { dfd.resolve(response.body); }
-      });
-    } else {
-      err = {};
-      err.message = err.description = 'classId or productcodes or bundlecodes not found in'
-        + 'request options.';
-      err = new DLSError(helpers.errors.ERROR_TYPES.SDK_ERROR, err);
-      dfd.reject(err);
-    }
-  }
-  return dfd.promise;
-}
-
-/**
- * @param {
- *   *classId: string,
- *   *body: {
- *    'productcodes' :['string'],
- *    'bundlecodes' : ['string']
- *    }
- * } options
- */
-function unassociateMaterialsWithClass(options) {
-  var self = this;
-  // Initializing promise
-  var dfd = q.defer();
-  // Validations
-  var err = helpers.validations.isAuthenticated(self.orgId, self.token);
-  if(err) { dfd.reject(err); }
-  else {
-    if(options && options.classId && options.body &&
-      (options.body.productcodes || options.body.bundlecodes)) {
-      // Passed all validations, Contruct API url
-      var url= self.config.DEFAULT_HOSTS.AUTH + self.config.AUTH_API_URLS.classMaterialAssociation;
-      url = helpers.api.constructAPIUrl(url, {
-        orgId: self.orgId, classId: options.classId
-      });
-      // Setup request with URL and Params
-      var requestAPI = request.delete(url)
-                       .set('Content-Type', 'application/json')
-                       .set('Accept', 'application/json');
-
-      if(self.traceid) { requestAPI.set('X-Amzn-Trace-Id', self.traceid); }
-
-      // Setup token in Authorization header
-      requestAPI = helpers.api.setupAPIToken(requestAPI, self.token);
-
-      requestAPI.agent(keepaliveAgent).end(function(err, response) {
-        if(err) {
-          err = new DLSError(helpers.errors.ERROR_TYPES.API_ERROR, err);
-          dfd.reject(err);
-        }
-        else { dfd.resolve(response.body); }
-      });
-    } else {
-      err = {};
-      const msg = 'classId or productcodes or bundlecodes not found in request options.';
-      err.message = msg;
-      err.description = msg;
-      err = new DLSError(helpers.errors.ERROR_TYPES.SDK_ERROR, err);
-      dfd.reject(err);
-    }
-  }
-  return dfd.promise;
-}
-
 //options = {
 //    classId: 'class uuid',
 //    productcode: 'product code'
@@ -6696,14 +6573,6 @@ function updateClass(options) {
           "productcode": "string",       //mandatory
           "title": ""
         }
-      ],
-      "bundles": [                      // optional
-        {
-          "bundlecode": "string",       //mandatory
-        },
-        {
-          "bundlecode": "string",       //mandatory
-        }
       ]
     }
   ],
@@ -6719,7 +6588,6 @@ function updateClass(options) {
         "students": true,
         "teachers": true,
         "products": true,
-        "bundles": true,
         "groups": true,
         "assigned_paths": true,
         "tags": true,
@@ -6727,7 +6595,6 @@ function updateClass(options) {
         "analytics_score_aggregation_type": true,
         "ext_data": true,
         "limits": true,
-        "skip_assigned_path_create_notification": true,
         "advanced": {
           "students": [
             {
@@ -6760,7 +6627,6 @@ function updateClass(options) {
             }
           ],
           "products": [ { "productcode": "string" } ],
-          "bundles": [ { "bundlecode": "string" } ],
           "analyticsharingmodel": "string"                 // Valid values: ['NOINHERIT_SYNCBACK']
           "analytics_score_aggregation_type": "string",     // Valid values: ['best', 'first', 'last']
           "limits": {los: number, students: number}   // Optional field
@@ -6987,12 +6853,7 @@ function deleteAssignedPath(options) {
           item_type: 'string',  //mandatory, ['dls-internal','external']
           dls_product_code: 'string' //mandatory only if item_type is 'dls-internal'
         }
-      ],
-      "rules": {},                // Optional
-      "context": {                // Optional (Needed for system event only)
-        "bundle-code": "string",
-        "space_key": "string"
-      }
+      ]
     }
   }
 */
@@ -7753,60 +7614,7 @@ function deleteItemsFromShowcaseOfAClass(options){
  * startdate: 'Epoch(Unix) timestamp in milliseconds',
  * enddate: 'Epoch(Unix) timestamp in milliseconds',
  * instructor: 'user who clones the class',
- * clone_setting: {                                     // optional field
- *  "students": true,
- *  "teachers": true,
- *  "products": true,
- *  "bundles": true,
- *  "groups": true,
- *  "assigned_paths": true,
- *  "skip_assigned_path_create_notification": true,
- *  "tags": true,
- *  "analyticsharingmodel": true,
- *  "analytics_score_aggregation_type": true,
- *  "ext_data": true,
- *  "limits": true,
- *  "advanced": {
- *  "students": [
- *      {
- *        "ext_user_id": "string"
- *      }
- *    ],
- *    "teachers": [
- *      {
- *        "ext_user_id": "string"
- *      }
- *    ],
- *    "groups": [
- *      {
- *        "groupid": "string"
- *      }
- *    ],
- *    "assigned_paths": [
- *      {
- *        "assigned_path_id": "string",
- *        "startdate": 0,
- *        "duedate": 0
- *      }
- *    ],
- *    "products": [
- *      {
- *        "productcode": "string"
- *      }
- *    ],
- *    "bundles": [
- *      {
- *        "bundlecode": "string"
- *      }
- *    ],
- *    "analyticsharingmodel": "NOINHERIT_SYNCBACK",
- *    "analytics_score_aggregation_type": "best",
- *    "limits": {
- *      "los": 0,
- *      "students": 0
- *    }
- *  }
- * },
+ * clone_setting: {},                          // Optional field
  * }
  */
 function cloneClass(options) {
@@ -8910,7 +8718,8 @@ var keepaliveAgent = new Agent({
 });
 
 //AuthExtn Adaptor Contsructor
-function authextn() {
+function authextn(accountId) {
+  this.accountId = accountId;
   return {
     // Gradeformat related APIs
     createGradeformat: createGradeformat.bind(this),
@@ -8936,7 +8745,9 @@ function authextn() {
     createOrgProductEntitlement: createOrgProductEntitlement.bind(this),
     updateOrgProductEntitlement: updateOrgProductEntitlement.bind(this),
     getParticularOrgProductEntitlement: getParticularOrgProductEntitlement.bind(this),
-    getAllOrgProductEntitlements: getAllOrgProductEntitlements.bind(this)
+    getAllOrgProductEntitlements: getAllOrgProductEntitlements.bind(this),
+    setupUser: setupUser.bind(this)
+
   };
 }
 
@@ -9593,17 +9404,14 @@ function getClassesOfAGradeformat(options) {
 
 /*
   options = {
-    assignedpathid: "string",  // Mandatory
+    assignedpathid: "string",  //Mandatory
     classid: "string",         // Mandatory
-    body : {
-      "users":[                   // min:1 , max: 50
-        {
-          extUserId: "string",   // Mandatory
-        }
-          ....
-      ],
-      "context": {}          // Optional
-    }
+    body : [                   // min:1 , max: 50
+      {
+        extUserId: "string", //Mandatory
+      }.
+      ....
+    ]
   }
 */
 function createUserAssignedPathEnrollments(options) {
@@ -9887,7 +9695,64 @@ function getParticularOrgProductEntitlement(options) {
   //Initializing promise
   var deferred = q.defer();
 
-  if (options && options.productcode) {
+  //Validations
+  var error = helpers.validations.isAuthenticated(self.orgId, self.token);
+  if (error) {
+    deferred.reject(error);
+  } else {
+    if (options && options.productcode) {
+      // Passed all validations, Contruct the API URL
+      var url = self.config.DEFAULT_HOSTS.AUTHEXTN +
+        self.config.AUTHEXTN_API_URLS.orgProductEntitlement;
+      url = helpers.api.constructAPIUrl(url, { orgid: self.orgId });
+
+      // Setup request with URL and Query Params
+      var params = { productcode: options.productcode };
+      var requestAPI = request.get(url).query(params);
+
+      // Setup 'traceid' in request header
+      if (self.traceid) { requestAPI.set('X-Amzn-Trace-Id', self.traceid); }
+
+      // Setup 'token' in Authorization header
+      requestAPI = helpers.api.setupAPIToken(requestAPI, self.token);
+
+      requestAPI.agent(keepaliveAgent).end(function (error, response) {
+        if (error) {
+          error = new DLSError(helpers.errors.ERROR_TYPES.API_ERROR, error);
+          deferred.reject(error);
+        } else {
+          deferred.resolve(response.body);
+        }
+      });
+    } else {
+      error = {};
+      error.message = error.description = 'Mandatory field \'productcode\' not found '+
+        'in request options.';
+      error = new DLSError(helpers.errors.ERROR_TYPES.SDK_ERROR, error);
+      deferred.reject(error);
+    }
+  }
+
+  return deferred.promise;
+}
+
+/**
+ * @param {
+ *  status: "string"             // ['active', 'revoked']
+ *  expired: <boolean>,
+ *  cursor: <epoch>
+ * } options
+ */
+function getAllOrgProductEntitlements(options) {
+  var self = this;
+  //Initializing promise
+  var deferred = q.defer();
+
+  //Validations
+  var error = helpers.validations.isAuthenticated(self.orgId, self.token);
+  if (error) {
+    deferred.reject(error);
+  } else {
     // Passed all validations, Contruct the API URL
     var url = self.config.DEFAULT_HOSTS.AUTHEXTN +
       self.config.AUTHEXTN_API_URLS.orgProductEntitlement;
@@ -9895,11 +9760,19 @@ function getParticularOrgProductEntitlement(options) {
 
     // Setup request with URL and Query Params
     var params = { productcode: options.productcode };
+
+    if (options.status) { params.status = options.status; }
+    if (options.hasOwnProperty('expired')) { params.expired = options.expired; }
+    if (options.cursor) { params.cursor = options.cursor; }
+
     var requestAPI = request.get(url).query(params);
 
     // Setup 'traceid' in request header
     if (self.traceid) { requestAPI.set('X-Amzn-Trace-Id', self.traceid); }
 
+    // Setup 'token' in Authorization header
+    requestAPI = helpers.api.setupAPIToken(requestAPI, self.token);
+
     requestAPI.agent(keepaliveAgent).end(function (error, response) {
       if (error) {
         error = new DLSError(helpers.errors.ERROR_TYPES.API_ERROR, error);
@@ -9908,12 +9781,6 @@ function getParticularOrgProductEntitlement(options) {
         deferred.resolve(response.body);
       }
     });
-  } else {
-    var error = {};
-    error.message = error.description = 'Mandatory field \'productcode\' not found '+
-      'in request options.';
-    error = new DLSError(helpers.errors.ERROR_TYPES.SDK_ERROR, error);
-    deferred.reject(error);
   }
 
   return deferred.promise;
@@ -9921,43 +9788,46 @@ function getParticularOrgProductEntitlement(options) {
 
 /**
  * @param {
- *  status: "string"             // ['active', 'revoked']
- *  expired: <boolean>,
- *  cursor: <epoch>
- * } options
- */
-function getAllOrgProductEntitlements(options) {
+*  ext_user_id: "string",        // mandatory
+*  workflow_type: "string",      // mandatory
+*  <workflow_type>: {}           // mandatory
+* } options
+*/
+function setupUser(options) {
   var self = this;
   //Initializing promise
   var deferred = q.defer();
 
-  // Contruct the API URL
-  var url = self.config.DEFAULT_HOSTS.AUTHEXTN +
-    self.config.AUTHEXTN_API_URLS.orgProductEntitlement;
-  url = helpers.api.constructAPIUrl(url, { orgid: self.orgId });
-
-  // Setup request with URL and Query Params
-  var params = { productcode: options.productcode };
-
-  if (options.status) { params.status = options.status; }
-  if (options.hasOwnProperty('expired')) { params.expired = options.expired; }
-  if (options.cursor) { params.cursor = options.cursor; }
-
-  var requestAPI = request.get(url).query(params);
+  if(options && options.ext_user_id && options.workflow_type) {
+    //Passed all validations, Contruct API url
+    var url = self.config.DEFAULT_HOSTS.AUTHEXTN + self.config.AUTHEXTN_API_URLS.setupUser;
+    url = helpers.api.constructAPIUrl(url,  { accountId: self.accountId });
 
-  // Setup 'traceid' in request header
-  if (self.traceid) { requestAPI.set('X-Amzn-Trace-Id', self.traceid); }
+    var requestAPI = request.post(url)
+    .set('Content-Type', 'application/json')
+    .set('Accept', 'application/json')
+    .send(options);
 
-  requestAPI.agent(keepaliveAgent).end(function (error, response) {
-    if (error) {
-      error = new DLSError(helpers.errors.ERROR_TYPES.API_ERROR, error);
-      deferred.reject(error);
-    } else {
-      deferred.resolve(response.body);
-    }
-  });
+    if(self.traceid) { requestAPI.set('X-Amzn-Trace-Id', self.traceid); }
 
-  return deferred.promise;
+    requestAPI
+    .agent(keepaliveAgent)
+    .end(function(err, res) {
+      if(err) {
+          err = new DLSError(helpers.errors.ERROR_TYPES.API_ERROR, err);
+          deferred.reject(err);
+      } else {
+        deferred.resolve(res.body);
+      }
+    });
+  } else {
+    err = {};
+    err.message = err.description = 'Mandatory field \'ext_user_id\' or \'workflow_type\' not found '+
+      'in the request options.';
+    err = new DLSError(helpers.errors.ERROR_TYPES.SDK_ERROR, err);
+    deferred.reject(err);
+  }
+return deferred.promise;
 }
 
 },{"../../helpers":3,"agentkeepalive":36,"q":42,"superagent":45}],18:[function(require,module,exports){
@@ -12157,10 +12027,9 @@ function getMicroEntitlementsForAUser(options) {
 
 }
 
-/* options= {
-  stage: "string",          //optional, stage number or version
-  target_role: "string"     // optional
-} */
+// options= {
+//  stage: "",          //stage number or version
+// }
 function getAllBundles(options) {
     var self = this;
     var dfd = q.defer();
@@ -12171,14 +12040,7 @@ function getAllBundles(options) {
   url = helpers.api.constructAPIUrl(url, { accountId : self.accountId });
   //Contruct parameters
   var params = {};
-  if(options) {
-    if(options.stage){
-      params.stage = options.stage;
-    }
-    if(options.target_role){
-      params.target_role = options.target_role;
-    }
-  }
+  if(options && options.stage) { params.stage = options.stage; }
 
   //Setup request with URL and Post data
   var requestAPI = request.get(url).query(params);
@@ -12653,10 +12515,10 @@ function updateBundle(options) {
   return dfd.promise;
 }
 
-/* options= {
-  stage: "string",          //optional, stage number or version
-  target_role: "string"     // optional
-} */
+// options= {
+//  stage: "",          //stage number or version
+// }
+
 function getAllBundles(options) {
   var self = this;
   //Initializing promise
@@ -12668,14 +12530,7 @@ function getAllBundles(options) {
   url = helpers.api.constructAPIUrl(url, { orgid: self.orgId, });
   //Contruct parameters
   var params = {};
-  if(options) {
-    if(options.stage){
-      params.stage = options.stage;
-    }
-    if(options.target_role){
-      params.target_role = options.target_role;
-    }
-  }
+  if(options && options.stage) { params.stage = options.stage; }
 
   //Setup request with URL and Post data
   var requestAPI = request.get(url).query(params);
@@ -12951,7 +12806,6 @@ function getAllProductFamilies(options) {
 
 var q = require('q');
 var request = require('superagent');
-var Agent = require('agentkeepalive');
 
 var helpers = require('../../helpers');
 var pubnubClientWrapper = require('./pubnubClientWrapper');
@@ -12962,25 +12816,18 @@ var DLSError = helpers.errors.DLSError;
  **********************************/
 module.exports = pushX;
 
-var keepaliveAgent = new Agent({
-  timeout: 60000,
-  freeSocketTimeout: 30000
-});
-
 /*********************************
  * Public Function definitions
  **********************************/
 function pushX() {
-  var _pubnubClientWrapper = pubnubClientWrapper();
-  return {
-    "connect": _connect.bind(this, _pubnubClientWrapper),
-    "cleanup": _cleanup.bind(this, _pubnubClientWrapper),
-    "grantByUserOrgId": grantByUserOrgId.bind(this),
-    "grantByAccountId": grantByAccountId.bind(this),
-    "grantByAccountIdOnExtUserId": grantByAccountIdOnExtUserId.bind(this),
-    "grantV2": grantV2.bind(this),
-    "getPushedEvents": getPushedEvents.bind(this)
-  };
+    var _pubnubClientWrapper = pubnubClientWrapper();
+    return {
+        "connect": _connect.bind(this, _pubnubClientWrapper),
+        "cleanup": _cleanup.bind(this, _pubnubClientWrapper),
+        "grantByUserOrgId": grantByUserOrgId.bind(this),
+        "grantByAccountId": grantByAccountId.bind(this),
+        "grantByAccountIdOnExtUserId": grantByAccountIdOnExtUserId.bind(this)
+    };
 }
 
 /*********************************
@@ -12988,195 +12835,149 @@ function pushX() {
  **********************************/
 
 function _connect(pubnubCW, options) {
-  var bpubnubV7 = true; // If pubnub v7 or higher in package.json, set it true
-  if (bpubnubV7 && !options.userid) {
-    var err = {};
-    err.message = err.description = 'Mandatory parameter userid not found in request options.';
-    err = new DLSError(helpers.errors.ERROR_TYPES.PUSHX_ERROR, err);
-    throw err;
-  }
-
-  // Adding SSL flag
-  return pubnubCW.setup({
-    'userid': options.userid,
-    'accountid': options.accountid,
-    'token': options.token,
-    'pubnub': {
-      'publishKey': options.publishKey,
-      'subscribeKey': options.subscribeKey,
-      'ssl': true,
-      'suppressLeaveEvents': true
-    }
-  });
+    var bpubnubV7 = true; // If pubnub v7 or higher in package.json, set it true
+    if (bpubnubV7 && !options.userid) {
+        var err = {};
+        err.message = err.description = 'Mandatory parameter userid not found in request options.';
+        err = new DLSError(helpers.errors.ERROR_TYPES.PUSHX_ERROR, err);
+        throw err;
+    }
+
+    // Adding SSL flag
+    return pubnubCW.setup({
+      'userid': options.userid,
+      'pubnub': {
+        'publishKey': options.publishKey,
+        'subscribeKey': options.subscribeKey,
+        'authKey': options.authKey,
+        'ssl': true
+      }
+    });
 }
 
 function _cleanup(pubnubCW) { pubnubCW.cleanup(); }
 
-/*options = {}*/
+/*options = {
+  authKey: <authKey>
+}*/
 function grantByUserOrgId(options) {
-  var dfd = q.defer();  // Initializing promise
-  var allowedChannels = ['jobs', 'systemevents'];
-  var baseChannelName = "o-" + this.orgId + "\\$u-" + this.token.access_token + "\\$";
-  var patterns = [];
-  for(var i in allowedChannels) {
-    var channelName = baseChannelName + allowedChannels[i] + "\\..*";
-    patterns.push(channelName);
-  }
-  options.channels = {};
-  options.channels.patterns = patterns;
-  grantV2.call(this, options)
-  .then(function (res) {
-    dfd.resolve(res);
-  })
-  .catch(function(err) {
-    dfd.reject(err);
-  });
-  return dfd.promise;
+    var self = this;
+    var dfd = q.defer();  // Initializing promise
+    // Validations
+    var err = helpers.validations.isAuthenticated(self.orgId, self.token);
+    if(err) { dfd.reject(err); }
+    else {
+        // Passed all validations, Construct API url
+        var url = self.config.DEFAULT_HOSTS.PUSHX + self.config.PUSHX_API_URLS.grantByUserOrgId;
+        url = helpers.api.constructAPIUrl(url, { orgId: self.orgId });
+        // Setup request with URL and Params
+        var requestAPI = request.post(url)
+                         .set('Content-Type', 'application/json')
+                         .set('Accept', 'application/json');
+
+        var body = {};
+        if(options.authKey) { body.authKey = options.authKey; }
+
+        requestAPI.send(body);
+
+        //Setup token in Authorization header
+        requestAPI = helpers.api.setupAPIToken(requestAPI, self.token);
+        if(self.traceid) { requestAPI.set('X-Amzn-Trace-Id', self.traceid); }
+
+        // Call Change Password Api
+        requestAPI.end(function(err, response) {
+            if(err) {
+                err = new DLSError(helpers.errors.ERROR_TYPES.API_ERROR, err);
+                dfd.reject(err);
+            }
+            else { dfd.resolve(response.body); }
+        });
+    }
+    return dfd.promise;
 }
 
 /*options = {
     accountId: <accountid>,
-    refId: <extRefId>
+    refId: <extRefId>,
+    authKey: <authKey>
 }*/
 function grantByAccountId(options) {
-	var err ={};
-  var dfd = q.defer();  // Initializing promise
-
-  if(options.accountId && options.refId) {
-    var channel = "a-" + options.accountId + "$refid." + options.refId;
-    var exactMatch = [channel];
-    options.channels = {};
-    options.channels.exactMatch = exactMatch;
-    grantV2.call(this, options)
-    .then(function (res) {
-      dfd.resolve(res);
-    })
-    .catch(function(err) {
-      dfd.reject(err);
-    });
-  }
-  else {
-    err.message = err.description = "Required parameter ['accountId', 'refId'] " +
-                                    "not found in request options";
-    err = new DLSError(helpers.errors.ERROR_TYPES.SDK_ERROR, err);
-    dfd.reject(err);
-  }
-  return dfd.promise;
+	var self = this, err ={};
+    var dfd = q.defer();  // Initializing promise
+
+    if(options.accountId && options.refId) {
+        // Passed all validations, Construct API url
+        var url = self.config.DEFAULT_HOSTS.PUSHX + self.config.PUSHX_API_URLS.grantByAccountId;
+        url = helpers.api.constructAPIUrl(url, { accountId: options.accountId });
+        // Setup request with URL and Params
+        var requestAPI = request.post(url)
+                         .set('Content-Type', 'application/json')
+                         .set('Accept', 'application/json');
+        if(self.traceid) { requestAPI.set('X-Amzn-Trace-Id', self.traceid); }
+
+        var body = { refId: options.refId };
+        if(options.authKey) { body.authKey = options.authKey; }
+
+        requestAPI.send(body);
+        requestAPI.end(function(err, response) {
+            if(err) {
+                err = new DLSError(helpers.errors.ERROR_TYPES.API_ERROR, err);
+                dfd.reject(err);
+            }
+            else { dfd.resolve(response.body); }
+        });
+    }
+    else {
+        err.message = err.description = "Required parameter ['accountId', 'refId'] " +
+                                        "not found in request options";
+        err = new DLSError(helpers.errors.ERROR_TYPES.SDK_ERROR, err);
+        dfd.reject(err);
+    }
+    return dfd.promise;
 }
 
 /*options = {
     accountId: <accountid>,
     extUserId: <extUserId>, //mandatory
+    authKey: <authKey>
 }*/
 function grantByAccountIdOnExtUserId(options) {
-	var err ={};
-  var dfd = q.defer();  // Initializing promise
-
-  if(options.accountId && options.extUserId) {
-    var channel = "a-" + options.accountId + "$u-" + options.extUserId;
-    var exactMatch = [channel];
-    options.channels = {};
-    options.channels.exactMatch = exactMatch;
-    grantV2.call(this, options)
-    .then(function (res) {
-      dfd.resolve(res);
-    })
-    .catch(function(err) {
-      dfd.reject(err);
-    });
-  }
-  else {
-    err.message = err.description = "Required parameter ['accountId', 'extUserId'] " +
-                                    "not found in request options";
-    err = new DLSError(helpers.errors.ERROR_TYPES.SDK_ERROR, err);
-    dfd.reject(err);
-  }
-  return dfd.promise;
-}
+	var self = this, err ={};
+    var dfd = q.defer();  // Initializing promise
 
-/**
- * This function provides grant token on given channels
- * @param { channels: { exactMatch: [], patterns: [] } } options 
- * @returns { token, publishKey, subscribeKey }
- */
-function grantV2(options) {
-  var self = this, err = {};
-  var dfd = q.defer();
-  var body = { channels: {} };
-  if(!options.channels) {
-    err.message = err.description = "channels not given in input body.";
-    err = new DLSError(helpers.errors.ERROR_TYPES.SDK_ERROR, err);
-    dfd.reject(err);
-    return dfd.promise;
-  }
-  body.channels = options.channels;
-  // Passed all validations, Construct API url
-  var url = self.config.DEFAULT_HOSTS.PUSHX + self.config.PUSHX_API_URLS.grantV2;
-  // Setup request with URL and Params
-  var requestAPI = request.post(url)
-                    .set('Content-Type', 'application/json')
-                    .set('Accept', 'application/json');
-  if(self.traceid) { requestAPI.set('X-Amzn-Trace-Id', self.traceid); }
+    if(options.accountId && options.extUserId) {
+        // Passed all validations, Construct API url
+        var url = self.config.DEFAULT_HOSTS.PUSHX + self.config.PUSHX_API_URLS.grantByAccountId;
+        url = helpers.api.constructAPIUrl(url, { accountId: options.accountId });
+        // Setup request with URL and Params
+        var requestAPI = request.post(url)
+                         .set('Content-Type', 'application/json')
+                         .set('Accept', 'application/json');
+        if(self.traceid) { requestAPI.set('X-Amzn-Trace-Id', self.traceid); }
 
-  requestAPI.send(body);
-  requestAPI.end(function(err, response) {
-    if(err) {
-      err = new DLSError(helpers.errors.ERROR_TYPES.API_ERROR, err);
-      dfd.reject(err);
+        var body = { extUserId: options.extUserId };
+        if(options.authKey) { body.authKey = options.authKey; }
+
+        requestAPI.send(body);
+        requestAPI.end(function(err, response) {
+            if(err) {
+                err = new DLSError(helpers.errors.ERROR_TYPES.API_ERROR, err);
+                dfd.reject(err);
+            }
+            else { dfd.resolve(response.body); }
+        });
     }
-    else { dfd.resolve(response.body); }
-  });
-  return dfd.promise;
+    else {
+        err.message = err.description = "Required parameter ['accountId', 'extUserId'] " +
+                                        "not found in request options";
+        err = new DLSError(helpers.errors.ERROR_TYPES.SDK_ERROR, err);
+        dfd.reject(err);
+    }
+    return dfd.promise;
 }
 
-/**
- * @param {
- *  *accountid: "string",
- *  *channelName: "string",
- *  *starttime: number,
- *  *endtime: number
- * } options
- */
-function getPushedEvents(options) {
-  var self = this;
-  var dfd = q.defer();  // Initializing promise
-  var accountid = options.accountid,
-    channelname = options.channelname,
-    starttime = options.starttime,
-    endtime = options.endtime;
-
-  if (accountid && channelname && starttime && endtime) {
-    // Passed all validations, Construct API url
-    var url = self.config.DEFAULT_HOSTS.PUSHX + self.config.PUSHX_API_URLS.getPushedEvents;
-    url = helpers.api.constructAPIUrl(url, { accountId: accountid });
-
-    // Setup request with URL and Params
-    var params = {channelname: channelname, starttime: starttime, endtime: endtime};
-    var requestAPI = request.get(url).query(params);
-    if(self.traceid) { requestAPI.set('X-Amzn-Trace-Id', self.traceid); }
-
-    requestAPI
-      .agent(keepaliveAgent)
-      .end(function(error, response) {
-        if (error) {
-          error = new DLSError(helpers.errors.ERROR_TYPES.API_ERROR, error);
-          dfd.reject(error);
-        } else {
-          dfd.resolve(response.body);
-        }
-    });
-  }
-  else {
-    var err = {};
-    err.message = err.description = 'Mandatory parameters [accountId, channelname,' +
-      ' starttime, endtime] not found in request options';
-    err = new DLSError(helpers.errors.ERROR_TYPES.SDK_ERROR, err);
-    dfd.reject(err);
-  }
-  return dfd.promise;
-}
 
-},{"../../helpers":3,"./pubnubClientWrapper":26,"agentkeepalive":36,"q":42,"superagent":45}],26:[function(require,module,exports){
+},{"../../helpers":3,"./pubnubClientWrapper":26,"q":42,"superagent":45}],26:[function(require,module,exports){
 var pubNub = require("pubnub");
 var EventEmitter = require("events").EventEmitter;
 var helpers = require('../../helpers');
@@ -13254,7 +13055,7 @@ module.exports = function () {
         _eventEmitter.emit(subscribedChannel, message);
     };
 
-    var _translatePubnubStatus = function(status, options) {
+    var _translatePubnubStatus = function(status) {
         var channels = [], error, successObj;
         switch (status.category) {
             case "PNConnectedCategory":
@@ -13283,10 +13084,8 @@ module.exports = function () {
                 break;
             case "PNAccessDeniedCategory":
                 if(status.operation === "PNSubscribeOperation") {
-                    var errorText = status.errorData.response && status.errorData.response.text;
-                    var errorJSON = errorText ? JSON.parse(errorText) : undefined;
                     var errorData = {
-                        payload: errorJSON && errorJSON.payload || status.errorData.payload,
+                        payload: JSON.parse(status.errorData.response.text).payload,
                         message: 'Forbidden: Subscription failed.',
                         errorDetails: {
                             operation: status.operation,
@@ -13315,46 +13114,6 @@ module.exports = function () {
                 error = new PUSHXError(helpers.errors.ERROR_CATEGORY.PUSHX, error);
                 _eventEmitter.emit('pushx_status', error);
                 break;
-            case "PNNetworkIssuesCategory":
-                if(status.operation === 'PNSubscribeOperation') {
-                    if(!options.accountId) {
-                        error = {
-                            message: "Missing mandatory parameters to initiate polling operation - accountId",
-                            status: status.statusCode,
-                            type: helpers.errors.ERROR_TYPES.POLLING_INITIATION,
-                        };
-                        error = new PUSHXError(helpers.errors.ERROR_CATEGORY.PUSHX, error);
-                        _eventEmitter.emit('pushx_status', error);
-                        break;
-                    }
-                    else {
-                        /**
-                         * Handle network issue category status for 'subscription' opreration
-                         * Start the events polling here.
-                         *
-                         * The wrapper supports multiple channels, but the APP currently uses a single channel only.
-                         * Polling will also limited to a single channel.
-                         */
-                    }
-                }
-                else {
-                    // Handle network issue category status for other operations like 'unsubscription'
-                }
-                break;
-            case "PNReconnectedCategory":
-                // Handle reconnected category status.
-                break;
-            default:
-                // Emit error for other status-category received from pubnub
-                error = {
-                    message: "PushX Error",
-                    status: status.statusCode,
-                    type: helpers.errors.ERROR_TYPES.UNEXPECTED_ERROR,
-                    pushXError: status
-                };
-                error = new PUSHXError(helpers.errors.ERROR_CATEGORY.PUSHX, error);
-                _eventEmitter.emit('pushx_status', error);
-                break;
         }
     };
 
@@ -13388,12 +13147,9 @@ module.exports = function () {
     var __setup = function (userOptions) {
         var pubnubConfig = userOptions.pubnub;
         pubnubConfig.uuid = userOptions.userid;
-        var accountId = userOptions.accountid;
-        var token = userOptions.token;
 
         if (!_pubnubClient && pubnubConfig) {
             _pubnubClient = new pubNub(pubnubConfig); //Connect with PubNub SDK
-            _pubnubClient.setToken(token);
             processSetup();
         } else {
             return new Error('Already Initialized');
@@ -13409,8 +13165,7 @@ module.exports = function () {
                     _translatePubnubMessage(data);
                 },
                 "status": function (status) {
-                    var statusOptions = { accountId: accountId };
-                    _translatePubnubStatus(status, statusOptions);
+                    _translatePubnubStatus(status);
                 }
             });
         }
@@ -14433,7 +14188,6 @@ function provisionBulkSpaces(options) {
  *     *startdate: <epoch>,
  *     *enddate: <epoch>,
  *     description: 'string',
- *     ext_class_title : 'string',
  *     ext_data: {},
  *     limits: {
  *       *los: 0,
@@ -14447,7 +14201,6 @@ function provisionBulkSpaces(options) {
  *   clone_settings: {
  *     *src_ext_classid: 'string',
  *     products: boolean,
- *     bundles: boolean,
  *     assigned_paths: boolean,
  *     ext_assigned_path_id_rule: 'string'  //enum: ['SRC_ID']
  *     advanced: {
@@ -14461,9 +14214,6 @@ function provisionBulkSpaces(options) {
  *       ],
  *       products: [
  *         { *productcode: 'string' },
- *       ],
- *       bundles: [
- *         { *bundlecode: 'string' },
  *       ]
  *     }
  *   }
@@ -15142,8 +14892,7 @@ var keepaliveAgent = new Agent({
 function spacesextn(accountId) {
   this.accountId = accountId;
   return {
-    entitleBulkUsersToProducts: entitleBulkUsersToProducts.bind(this),
-    setupUser: setupUser.bind(this)
+    entitleBulkUsersToProducts: entitleBulkUsersToProducts.bind(this)
   };
 }
 
@@ -15204,49 +14953,6 @@ function entitleBulkUsersToProducts(options) {
   return dfd.promise;
 }
 
-/**
- * @param {
- *  *ext_user_id: "string",
- *  *workflow_type: "string",
- *  *<workflow_type>: {}
- * } options
- */
-function setupUser(options) {
-  var self = this;
-  //Initializing promise
-  var deferred = q.defer();
-
-  if (options && options.ext_user_id && options.workflow_type) {
-    //Passed all validations, Contruct API url
-    var url = self.config.DEFAULT_HOSTS.AUTHEXTN + self.config.AUTHEXTN_API_URLS.setupUser;
-    url = helpers.api.constructAPIUrl(url, { accountId: self.accountId });
-
-    var requestAPI = request.post(url)
-    .set('Content-Type', 'application/json')
-    .set('Accept', 'application/json')
-    .send(options);
-
-    if (self.traceid) { requestAPI.set('X-Amzn-Trace-Id', self.traceid); }
-
-    requestAPI
-    .agent(keepaliveAgent)
-    .end(function(err, res) {
-      if (err) {
-        err = new DLSError(helpers.errors.ERROR_TYPES.API_ERROR, err);
-        deferred.reject(err);
-      } else {
-        deferred.resolve(res.body);
-      }
-    });
-  } else {
-    var err = {};
-    err.message = err.description = 'Mandatory field \'ext_user_id\' or \'workflow_type\' not found '+
-      'in the request options.';
-    err = new DLSError(helpers.errors.ERROR_TYPES.SDK_ERROR, err);
-    deferred.reject(err);
-  }
-  return deferred.promise;
-}
 
 },{"../../helpers":3,"agentkeepalive":36,"q":42,"superagent":45}],30:[function(require,module,exports){
 /*************************************************************************
@@ -15924,7 +15630,6 @@ function workflows(accountId) {
       "address": {
         "city": "string",
         "country": "string",
-        "line1": "string",
         "street1": "string",
         "street2": "string",
         "street3": "string",
@@ -16280,7 +15985,6 @@ function completeAWorkflow(options) {
         "address": {
           "city": "string",
           "country": "string",
-          "line1": "string",
           "street1": "string",
           "street2": "string",
           "street3": "string",
@@ -16290,7 +15994,7 @@ function completeAWorkflow(options) {
         "display_name": "string",
         "school_key": "string"
       }
-    }
+    } 
   }
  */
 function updateWorkflowRequest(options) {
@@ -16329,8 +16033,7 @@ function updateWorkflowRequest(options) {
     dfd.reject(err);
   }
   return dfd.promise;
-}
-
+}
 },{"./../../helpers":3,"q":42,"superagent":45}],33:[function(require,module,exports){
 /*************************************************************************
  *
@@ -16376,7 +16079,8 @@ function xapi(accountId) {
   this.accountId = accountId;
   return {
     postStatement: postStatements.bind(this),
-    postExternalStatements: postExternalStatements.bind(this)
+    postExternalStatements: postExternalStatements.bind(this),
+    resetUserProductProgress: resetUserProductProgress.bind(this)
   };
 }
 
@@ -16565,6 +16269,47 @@ function postExternalStatements(options) {
   });
   return dfd.promise;
 }
+
+/*options = {
+    userid: 'string',
+    productcode: 'string',
+    actorid: 'string'
+}*/
+function resetUserProductProgress(options) {
+  var self = this;
+  // Initializing promise
+  var dfd = q.defer();
+  var err = {};
+  if(options && options.userid && options.productcode && options.actorid) {
+
+    // Passed all validations, Contruct API url
+    var url = self.config.DEFAULT_HOSTS.XAPI + self.config.XAPI_API_URLS.resetUserProductProgress;
+    url = helpers.api.constructAPIUrl(url, { accountId : self.accountId });
+
+    // Setup request with URL and Params
+    var requestAPI = request.delete(url)
+                    .set('Content-Type', 'application/json')
+                    .set('Accept', 'application/json')
+                    .send(options);
+
+    if(self.traceid) { requestAPI.set('X-Amzn-Trace-Id', self.traceid); }
+
+    requestAPI.end(function(error, response) {
+      if(error) {
+        err = new DLSError(helpers.errors.ERROR_TYPES.API_ERROR, error);
+        dfd.reject(err);
+      }
+      else { dfd.resolve(response.body); }
+    });
+  }
+  else {
+    err.message = err.description = 'userid, productcode or actorid not found in request options.';
+    err = new DLSError(helpers.errors.ERROR_TYPES.SDK_ERROR, err);
+    dfd.reject(err);
+  }
+
+  return dfd.promise;
+}
 
 },{"../../helpers":3,"q":42,"superagent":45}],34:[function(require,module,exports){
 /*************************************************************************