hyper-aws4 - npm Package Compare versions

Comparing version 1.1.1 to 1.1.2

dst/index.js

@@ -31,6 +31,6 @@ 'use strict';
 
-var SignedHeaders = 'content-type;host;x-hyper-content-sha256;x-hyper-date';
+var HeaderDate = 'X-Hyper-Date';
 var HeaderContentHash = 'X-Hyper-Content-Sha256';
 var Algorithm = 'HYPER-HMAC-SHA256';
-var Region = 'us-west-1';
+var DefaultRegion = 'us-west-1';
 var Service = 'hyper';
@@ -41,13 +41,16 @@ var KeyPartsRequest = 'hyper_request';
 var Aws4 = function () {
-  function Aws4(_ref) {
-    var url = _ref.url;
-    var _ref$method = _ref.method;
-    var method = _ref$method === undefined ? 'GET' : _ref$method;
-    var _ref$body = _ref.body;
-    var body = _ref$body === undefined ? '' : _ref$body;
-    var credential = _ref.credential;
-    var date = _ref.date;
-
+  function Aws4(req, credential) {
     _classCallCheck(this, Aws4);
 
+    var url = req.url;
+    var _req$method = req.method;
+    var method = _req$method === undefined ? 'GET' : _req$method;
+    var _req$body = req.body;
+    var body = _req$body === undefined ? '' : _req$body;
+    var date = req.date;
+    var _req$headers = req.headers;
+    var headers = _req$headers === undefined ? {} : _req$headers;
+
+    if (!credential) credential = req.credential;
+
     _lodash2.default.extend(this, { url: url, body: body, method: method.toUpperCase(), credential: credential });
@@ -59,7 +62,21 @@
     this.query = _querystring2.default.parse(urlObj.query) || {};
+    this.date = date || this.amzDate;
 
-    this.date = date || this.amzDate();
+    this.headers = this.prepareHeaders(headers);
   }
 
   _createClass(Aws4, [{
+    key: 'prepareHeaders',
+    value: function prepareHeaders(headers) {
+      var _$extend;
+
+      var date = this.date;
+      var payloadHash = this.payloadHash;
+      var host = this.host;
+
+      return _lodash2.default.extend((_$extend = {
+        'Content-Type': 'application/json'
+      }, _defineProperty(_$extend, HeaderDate, date), _defineProperty(_$extend, HeaderContentHash, payloadHash), _defineProperty(_$extend, 'Host', host), _$extend), headers);
+    }
+  }, {
     key: 'hmac',
@@ -84,4 +101,22 @@ value: function hmac(key, string, encoding) {
   }, {
+    key: 'sign',
+
+
+    // Export
+    // Return signed headers
+    value: function sign() {
+      var credential = this.credential.accessKey + '/' + this.credentialScope;
+      var authorization = Algorithm + ' Credential=' + credential + ', SignedHeaders=' + this.signedHeaders + ', Signature=' + this.signature;
+
+      return _lodash2.default.extend({ Authorization: authorization }, this.headers);
+    }
+  }, {
+    key: 'region',
+    get: function get() {
+      var index = this.host.indexOf('.hyper.sh');
+      return index === -1 ? DefaultRegion : this.host.slice(0, index);
+    }
+  }, {
     key: 'amzDate',
-    value: function amzDate() {
+    get: function get() {
       return new Date().toISOString().replace(/[:\-]|\.\d{3}/g, '');
@@ -91,3 +126,3 @@ }
     key: 'dateStamp',
-    value: function dateStamp() {
+    get: function get() {
       return this.date.slice(0, 8);
@@ -97,3 +132,3 @@ }
     key: 'payloadHash',
-    value: function payloadHash() {
+    get: function get() {
       var body = _lodash2.default.isString(this.body) ? this.body : JSON.stringify(this.body);
@@ -104,3 +139,3 @@ return this.hash(body);
     key: 'canonicalPath',
-    value: function canonicalPath() {
+    get: function get() {
       var _this = this;
@@ -127,7 +162,7 @@
     key: 'canonicalQuery',
-    value: function canonicalQuery() {
+    get: function get() {
       var query = this.query;
       if (_lodash2.default.isEmpty(query)) return '';
 
-      return this.encodeRfc3986(_querystring2.default.stringify(Object.keys(query).sort().reduce(function (obj, key) {
+      return this.encodeRfc3986(_querystring2.default.stringify(_lodash2.default.keys(query).sort().reduce(function (obj, key) {
         if (!key) return obj;
@@ -140,25 +175,38 @@ obj[key] = !Array.isArray(query[key]) ? query[key] : query[key].slice().sort();
     key: 'canonicalHeaders',
-    value: function canonicalHeaders() {
-      return 'content-type:application/json' + '\nhost:' + this.host + '\nx-hyper-content-sha256:' + this.payloadHash() + '\nx-hyper-date:' + this.date + '\n';
+    get: function get() {
+      var _this2 = this;
+
+      return _lodash2.default.keys(this.headers).sort(function (a, b) {
+        return a.toLowerCase() < b.toLowerCase() ? -1 : 1;
+      }).map(function (key) {
+        return key.toLowerCase() + ':' + _this2.headers[key];
+      }).join('\n') + '\n';
     }
   }, {
+    key: 'signedHeaders',
+    get: function get() {
+      return _lodash2.default.keys(this.headers).map(function (key) {
+        return key.toLowerCase();
+      }).sort().join(';');
+    }
+  }, {
     key: 'canonicalRequest',
-    value: function canonicalRequest() {
-      return [this.method, this.canonicalPath(), this.canonicalQuery(), this.canonicalHeaders(), SignedHeaders, this.payloadHash()].join('\n');
+    get: function get() {
+      return [this.method, this.canonicalPath, this.canonicalQuery, this.canonicalHeaders, this.signedHeaders, this.payloadHash].join('\n');
     }
   }, {
     key: 'credentialScope',
-    value: function credentialScope() {
-      return [this.dateStamp(), Region, Service, KeyPartsRequest].join('/');
+    get: function get() {
+      return [this.dateStamp, this.region, Service, KeyPartsRequest].join('/');
     }
   }, {
     key: 'stringToSign',
-    value: function stringToSign() {
-      return [Algorithm, this.date, this.credentialScope(), this.hash(this.canonicalRequest())].join('\n');
+    get: function get() {
+      return [Algorithm, this.date, this.credentialScope, this.hash(this.canonicalRequest)].join('\n');
     }
   }, {
     key: 'signingKey',
-    value: function signingKey() {
-      var kDate = this.hmac(KeyPartsPrefix + this.credential.secretKey, this.dateStamp()),
-          kRegion = this.hmac(kDate, Region),
+    get: function get() {
+      var kDate = this.hmac(KeyPartsPrefix + this.credential.secretKey, this.dateStamp),
+          kRegion = this.hmac(kDate, this.region),
           kService = this.hmac(kRegion, Service),
@@ -171,25 +219,5 @@ kSigning = this.hmac(kService, KeyPartsRequest);
     key: 'signature',
-    value: function signature() {
-      return this.hmac(this.signingKey(), this.stringToSign(), 'hex');
+    get: function get() {
+      return this.hmac(this.signingKey, this.stringToSign, 'hex');
     }
-
-    // Export
-    // Return signed headers
-
-  }, {
-    key: 'sign',
-    value: function sign() {
-      var _ref2;
-
-      var date = this.date;
-      var payloadHash = this.payloadHash();
-      var host = this.host;
-      var credential = this.credential.accessKey + '/' + this.credentialScope();
-      var authorization = Algorithm + ' Credential=' + credential + ', SignedHeaders=' + SignedHeaders + ', Signature=' + this.signature();
-
-      return _ref2 = {
-        'Content-Type': 'application/json',
-        'X-Hyper-Date': date
-      }, _defineProperty(_ref2, HeaderContentHash, payloadHash), _defineProperty(_ref2, 'Host', host), _defineProperty(_ref2, 'Authorization', authorization), _ref2;
-    }
   }]);
@@ -201,6 +229,6 @@
 exports.default = {
-  sign: function sign(options) {
-    return new Aws4(options).sign();
+  sign: function sign(request, credential) {
+    return new Aws4(request, credential).sign();
   }
 };
 module.exports = exports['default'];

package.json

 {
   "name": "hyper-aws4",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "AWS Signature Version 4 Signing Library for Hyper",
@@ -5,0 +5,0 @@ "main": "dst/index.js",

No alert changes

Improved metrics

Total package byte prevSize

9589

8.05%

Lines of code

187

15.43%

No dependency changes