Merge pull request #404 from mozilla/oa-upt-dept

fix(deps): update some dependencies
mozilla · Jul 15, 2016 · cb4386b · cb4386b
2 parents d4ff105 + 09aa7b0
commit cb4386b
Show file tree

Hide file tree

Showing 8 changed files with 2,039 additions and 1,924 deletions.
diff --git a/.jscsrc b/.jscsrc
@@ -15,10 +15,5 @@
     "requireSpacesInConditionalExpression": true,
     "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
     "validateIndentation": 2,
-    "validateQuoteMarks": "'",
-    "validateJSDoc": {
-        "checkParamNames": true,
-        "checkRedundantParams": true,
-        "requireParamTypes": true
-    }
+    "validateQuoteMarks": "'"
 }
diff --git a/lib/db/index.js b/lib/db/index.js
@@ -55,7 +55,7 @@ function preClients() {
     logger.debug('predefined.loading', { clients: clients });
     return P.all(clients.map(function(c) {
       if (c.secret) {
-        console.error('Do not keep client secrets in the config file.'
+        console.error('Do not keep client secrets in the config file.' // eslint-disable-line no-console
           + ' Use the `hashedSecret` field instead.\n\n'
           + '\tclient=%s has `secret` field\n'
           + '\tuse hashedSecret="%s" instead',

diff --git a/lib/db/memory.js b/lib/db/memory.js
@@ -265,7 +265,7 @@ MemoryStore.prototype = {
     return P.resolve();
   },
   getEncodingInfo: function getEncodingInfo() {
-    console.warn('getEncodingInfo has no meaning with memory implementation');
+    console.warn('getEncodingInfo has no meaning with memory implementation'); // eslint-disable-line no-console
     return P.resolve({});
   },
   removeUser: function removeUser(userId) {

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "bluebird": "^2.9.14",
     "buf": "0.1.0",
     "commander": "^2.9.0",
-    "convict": "0.8",
+    "convict": "1.4",
     "fxa-jwtool": "^0.7.1",
     "fxa-notifier-aws": "1.0.0",
     "hapi": "7.5.3",
@@ -41,20 +41,19 @@
     "blanket": "1.1.6",
     "eslint-config-fxa": "^1.8.0",
     "generate-rsa-keypair": "0.1.1",
-    "grunt": "^0.4.5",
-    "grunt-bump": "0.3.1",
-    "grunt-cli": "^0.1.13",
+    "grunt": "^1.0.1",
+    "grunt-bump": "0.8.0",
     "grunt-conventional-changelog": "^1.1.0",
-    "grunt-copyright": "^0.2.0",
+    "grunt-copyright": "^0.3.0",
     "grunt-eslint": "^16.0.0",
-    "grunt-jscs": "^1.5.0",
+    "grunt-jscs": "^3.0.1",
     "grunt-mocha-test": "^0.12.2",
     "grunt-nodemon": "^0.4.0",
-    "grunt-nsp": "2.1.2",
-    "insist": "0.x",
+    "grunt-nsp": "2.3.1",
+    "insist": "1.x",
     "load-grunt-tasks": "^3.1.0",
     "mocha-text-cov": "^0.1.0",
-    "nock": "^1.2.1",
+    "nock": "^8.0.0",
     "proxyquire": "^1.6.0",
     "read": "^1.0.5",
     "sinon": "^1.15.4",

diff --git a/scripts/rpm-version.js b/scripts/rpm-version.js
@@ -30,6 +30,6 @@ cp.exec(cmd, function (err, stdout) { // eslint-disable-line handle-callback-err
   var cmd = 'git config --get remote.origin.url';
   cp.exec(cmd, function (err, stdout) { // eslint-disable-line handle-callback-err
     info.version.source = (stdout && stdout.trim()) || '';
-    console.log(JSON.stringify(info, null, 2));
+    console.log(JSON.stringify(info, null, 2)); // eslint-disable-line no-console
   });
 });
diff --git a/scripts/show-db-encoding.js b/scripts/show-db-encoding.js
@@ -8,5 +8,5 @@ const db = require('../lib/db');
 
 db.getEncodingInfo()
   .then(function(info) {
-    console.log(JSON.stringify(info, null, 2));
+    console.log(JSON.stringify(info, null, 2)); // eslint-disable-line no-console
   }).then(process.exit);
diff --git a/test/db/index.js b/test/db/index.js
@@ -131,23 +131,23 @@ describe('db', function() {
         userId = buf(randomString(16));
 
         return db.registerClient({
-            id: clientIdA,
-            name: 'ClientA',
+          id: clientIdA,
+          name: 'ClientA',
+          hashedSecret: randomString(32),
+          imageUri: 'https://example.domain/logo',
+          redirectUri: 'https://example.domain/return?foo=bar',
+          trusted: true
+        })
+        .then( function () {
+          return db.registerClient({
+            id: clientIdB,
+            name: 'ClientB',
             hashedSecret: randomString(32),
             imageUri: 'https://example.domain/logo',
             redirectUri: 'https://example.domain/return?foo=bar',
             trusted: true
-          })
-          .then( function () {
-            return db.registerClient({
-              id: clientIdB,
-              name: 'ClientB',
-              hashedSecret: randomString(32),
-              imageUri: 'https://example.domain/logo',
-              redirectUri: 'https://example.domain/return?foo=bar',
-              trusted: true
-            });
           });
+        });
       });
 
       beforeEach('seed with tokens', function () {