Merge pull request #98 from jcenturion/bug-fixing

Adding node polyfills for web bundle
auth0 · May 19, 2016 · 230a55e · 230a55e
2 parents 0f025d3 + 33d66b8
commit 230a55e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "auth0",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "SDK for Auth0 API v2",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/auth/index.js b/src/auth/index.js
@@ -66,7 +66,7 @@ var AuthenticationClient = function (options) {
   };
 
   if (options.telemetry !== false) {
-    var telemetry = jsonToBase64(this.getClientInfo());
+    var telemetry = jsonToBase64(options.clientInfo || this.getClientInfo());
     managerOptions.headers['Auth0-Client'] = telemetry;
   }
 

diff --git a/src/management/index.js b/src/management/index.js
@@ -73,7 +73,8 @@ var ManagementClient = function (options) {
   };
 
   if (options.telemetry !== false) {
-    var telemetry = jsonToBase64(this.getClientInfo());
+    var telemetry = jsonToBase64(options.clientInfo || this.getClientInfo());
+
     managerOptions.headers['Auth0-Client'] = telemetry;
   }
 
@@ -188,7 +189,6 @@ ManagementClient.prototype.getClientInfo = function () {
       version: process.version.replace('v', '')
     }]
   };
-
   // Add the dependencies to the client info object.
   Object
     .keys(pkg.dependencies)

diff --git a/webpack.config.js b/webpack.config.js
@@ -11,6 +11,11 @@ module.exports = {
     library: 'Auth0',
     libraryTarget: 'umd',
   },
+  node: {
+    Buffer: true,
+    process: true,
+    url: true
+  },
   module: {
     loaders: [
       {
@@ -46,6 +51,5 @@ module.exports = {
     modulesDirectories: ['node_modules'],
     root: __dirname,
     alias: {},
-  },
-  node: false
+  }
 };