From 5ba8eb44da7cd639ca21070ea9be20d611b85f66 Mon Sep 17 00:00:00 2001 From: simov Date: Mon, 12 Mar 2018 12:28:03 +0200 Subject: [PATCH] Revert "Update hawk to 7.0.7 (#2880)" This reverts commit cfd230708c5a0a5c09935d5f1074f43de6e9c010. --- package.json | 2 +- request.js | 2 +- tests/test-hawk.js | 18 ++++++++---------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index a292127d2..0cf56d34a 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "forever-agent": "~0.6.1", "form-data": "~2.3.1", "har-validator": "~5.0.3", - "hawk": "~7.0.7", + "hawk": "~6.0.2", "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", diff --git a/request.js b/request.js index 404c859d2..ff19ca39c 100644 --- a/request.js +++ b/request.js @@ -1426,7 +1426,7 @@ Request.prototype.httpSignature = function (opts) { } Request.prototype.hawk = function (opts) { var self = this - self.setHeader('Authorization', hawk.client.header(self.uri, self.method, opts).header) + self.setHeader('Authorization', hawk.client.header(self.uri, self.method, opts).field) } Request.prototype.oauth = function (_oauth) { var self = this diff --git a/tests/test-hawk.js b/tests/test-hawk.js index 19aab5d7d..34db8da25 100644 --- a/tests/test-hawk.js +++ b/tests/test-hawk.js @@ -7,24 +7,22 @@ var tape = require('tape') var assert = require('assert') var server = http.createServer(function (req, res) { - var getCred = function (id) { + var getCred = function (id, callback) { assert.equal(id, 'dh37fgj492je') var credentials = { key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn', algorithm: 'sha256', user: 'Steve' } - return credentials + return callback(null, credentials) } - hawk.server.authenticate(req, getCred) - .then((credentials, artifacts) => { - res.writeHead(200, {'Content-Type': 'text/plain'}) - res.end('Hello ' + credentials.credentials.user) - }) - .catch(() => { - res.writeHead(401, {'Content-Type': 'text/plain'}) - res.end('Shoosh!') + + hawk.server.authenticate(req, getCred, {}, function (err, credentials, attributes) { + res.writeHead(err ? 401 : 200, { + 'Content-Type': 'text/plain' }) + res.end(err ? 'Shoosh!' : 'Hello ' + credentials.user) + }) }) tape('setup', function (t) {