Merge pull request #574 from stormpath/update-uuid

Update uuid

benchmark/api-key-encryption.js

@@ -1,5 +1,5 @@
 var stormpath = require('../');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 var base64 = require('../lib/utils').base64;
 var Benchmark = require('benchmark');
 var async = require('async');

lib/authc/ApiKeyEncryptedOptions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 
 var utils = require('../utils');
 

lib/authc/Sauthc1RequestAuthenticator.js

@@ -2,7 +2,7 @@
 
 var moment = require('moment');
 var url = require('url');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 
 var _ = require('../underscore');
 var RequestAuthenticator = require('./RequestAuthenticator');

lib/resource/Application.js

@@ -4,7 +4,7 @@ var async = require('async');
 var _ = require('underscore');
 var njwt = require('njwt');
 var url = require('url');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 
 var Account = require('./Account');
 var ApiAuthRequestError = require('../error/ApiAuthRequestError');

lib/saml/SamlIdpUrlBuilder.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var njwt = require('njwt');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 var querystring = require('querystring');
 
 var utils = require('../utils');

lib/utils.js

@@ -7,7 +7,7 @@ var Buffer = require('buffer').Buffer;
 var util = require('util');
 
 var stormpathConfig = require('stormpath-config');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 var url = require('url');
 
 function shallowCopy(src, dest) {

package.json

@@ -47,13 +47,13 @@
     "memcached": "~2.2.2",
     "moment": "^2.15.2",
     "njwt": "^0.3.1",
-    "node-uuid": "~1.4.7",
     "properties-parser": "~0.3.1",
     "redis": "~2.6.2",
     "request": "~2.74.0",
     "stormpath-config": "^0.0.24",
     "underscore": "~1.5.2",
-    "underscore.string": "~3.2.3"
+    "underscore.string": "~3.2.3",
+    "uuid": "^3.0.0"
   },
   "devDependencies": {
     "benchmark": "^2.0.0",
@@ -83,7 +83,6 @@
     "sinon-chai": "~2.8.0",
     "time-grunt": "~1.4.0",
     "timekeeper": "~0.1.1",
-    "tmp": "0.0.28",
-    "uuid": "^2.0.1"
+    "tmp": "0.0.28"
   }
 }

quickstart.js

@@ -13,7 +13,7 @@ var stormpath = require('stormpath');
 
 //helper function to prevent any data collisions in the tenant while running the quickstart:
 function unique(aString) {
-  return aString + '-' + require('node-uuid').v4().toString();
+  return aString + '-' + require('uuid').v4().toString();
 }
 
 //populated during the quickstart steps

test/common.js

@@ -10,7 +10,7 @@ var assert = require('chai').assert;
 var should = require("chai").should();
 var moment = require('moment');
 var sinonChai = require("sinon-chai");
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 var nock = require('nock');
 var timekeeper = require('timekeeper');
 var jwt = require('njwt');

test/sp.auth.unit_test.js

@@ -78,7 +78,7 @@ describe('Authorization module', function () {
     var sandbox, guidStub;
 
     before(function () {
-      uuid = require('node-uuid');
+      uuid = require('uuid');
       auth = getAuthenticator({apiKey: apiKey, authenticationScheme:'SAUTHC1'});
 
       sandbox = sinon.sandbox.create();

test/sp.resource.application_test.js

@@ -21,7 +21,7 @@ var PasswordResetToken = require('../lib/resource/PasswordResetToken');
 var AccountLinkingPolicy = require('../lib/resource/AccountLinkingPolicy');
 var nJwt = require('njwt');
 var nJwtProperties = require('njwt/properties');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 var url = require('url');
 
 describe('Resources: ', function () {

test/sp.resource.tenant_test.js

@@ -1,7 +1,7 @@
 var common = require('./common');
 var assert = common.assert;
 var sinon = common.sinon;
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 
 var Account = require('../lib/resource/Account');
 var AccountLink = require('../lib/resource/AccountLink');