hawk - npm Package Compare versions

Comparing version 3.1.0 to 3.1.1

lib/browser.js

@@ -96,4 +96,4 @@ /*
             method: method,
-            resource: uri.relative,
-            host: uri.hostname,
+            resource: uri.resource,
+            host: uri.host,
             port: uri.port,
@@ -205,4 +205,4 @@ hash: options.hash,
             method: 'GET',
-            resource: uri.relative,                            // Maintain trailing '?' and query params
-            host: uri.hostname,
+            resource: uri.resource,                            // Maintain trailing '?' and query params
+            host: uri.host,
             port: uri.port,
@@ -588,22 +588,16 @@ ext: options.ext
 
+    uriRegex: /^([^:]+)\:\/\/(?:[^@]*@)?([^\/:]+)(?:\:(\d+))?([^#]*)(?:#.*)?$/,       // scheme://credentials@host:port/resource#fragment
     parseUri: function (input) {
 
-        // Based on: parseURI 1.2.2
-        // http://blog.stevenlevithan.com/archives/parseuri
-        // (c) Steven Levithan <stevenlevithan.com>
-        // MIT License
-
-        var keys = ['source', 'protocol', 'authority', 'userInfo', 'user', 'password', 'hostname', 'port', 'resource', 'relative', 'pathname', 'directory', 'file', 'query', 'fragment'];
-
-        var uriRegex = /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?))?(((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?)(?:#(.*))?)/;
-        var uriByNumber = input.match(uriRegex);
-        var uri = {};
-
-        for (var i = 0, il = keys.length; i < il; ++i) {
-            uri[keys[i]] = uriByNumber[i] || '';
+        var parts = input.match(hawk.utils.uriRegex);
+        if (!parts) {
+            return { host: '', port: '', resource: '' };
         }
 
-        if (uri.port === '') {
-            uri.port = (uri.protocol.toLowerCase() === 'http' ? '80' : (uri.protocol.toLowerCase() === 'https' ? '443' : ''));
-        }
+        var scheme = parts[1].toLowerCase();
+        var uri = {
+            host: parts[2],
+            port: parts[3] || (scheme === 'http' ? '80' : (scheme === 'https' ? '443' : '')),
+            resource: parts[4]
+        };
 
@@ -610,0 +604,0 @@ return uri;

package.json

 {
   "name": "hawk",
   "description": "HTTP Hawk Authentication Scheme",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "author": "Eran Hammer <[e-mail]> (http://hueniverse.com)",
@@ -6,0 +6,0 @@ "contributors": [],

test/browser.js

@@ -47,11 +47,11 @@ // Load modules
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var bewit = Browser.client.bewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials, ttlSec: 60 * 60 * 24 * 365 * 100, ext: 'some-app-data' });
+            var bewit = Browser.client.bewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials1, ttlSec: 60 * 60 * 24 * 365 * 100, ext: 'some-app-data' });
             req.url += '&bewit=' + bewit;
 
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
+            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials2, attributes) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(attributes.ext).to.equal('some-app-data');
@@ -72,11 +72,11 @@ done();
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var bewit = Browser.client.bewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials, ttlSec: 60 * 60 * 24 * 365 * 100 });
+            var bewit = Browser.client.bewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials1, ttlSec: 60 * 60 * 24 * 365 * 100 });
             req.url += '&bewit=' + bewit;
 
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
+            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials2, attributes) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 done();
@@ -247,11 +247,11 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' }).field;
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data' }).field;
             expect(req.authorization).to.exist();
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
@@ -276,13 +276,13 @@ done();
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
+            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
             req.headers.authorization = reqHeader.field;
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
+                expect(Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.equal(true);
 
@@ -299,6 +299,6 @@ var res = {
 
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
+                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
                 expect(res.headers['server-authorization']).to.exist();
 
-                expect(Browser.client.authenticate(res, credentials, artifacts, { payload: 'some reply' })).to.equal(true);
+                expect(Browser.client.authenticate(res, credentials2, artifacts, { payload: 'some reply' })).to.equal(true);
                 done();
@@ -322,13 +322,13 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
+            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
             req.headers.authorization = reqHeader.field;
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
+                expect(Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.equal(true);
 
@@ -345,6 +345,6 @@ var res = {
 
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
+                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
                 expect(res.headers['server-authorization']).to.exist();
 
-                expect(Browser.client.authenticate(res, credentials, artifacts, { payload: 'some reply' })).to.equal(true);
+                expect(Browser.client.authenticate(res, credentials2, artifacts, { payload: 'some reply' })).to.equal(true);
                 done();
@@ -364,11 +364,11 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', localtimeOffsetMsec: 100000 }).field;
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', localtimeOffsetMsec: 100000 }).field;
             expect(req.authorization).to.exist();
 
-            Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 100000 }, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 100000 }, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
@@ -393,13 +393,13 @@ done();
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
+            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
             req.headers.authorization = reqHeader.field;
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
+                expect(Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.equal(true);
 
@@ -416,6 +416,6 @@ var res = {
 
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts);
+                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts);
                 expect(res.headers['server-authorization']).to.exist();
 
-                expect(Browser.client.authenticate(res, credentials, artifacts)).to.equal(true);
+                expect(Browser.client.authenticate(res, credentials2, artifacts)).to.equal(true);
                 done();
@@ -439,13 +439,13 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
+            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
             req.headers.authorization = reqHeader.field;
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
+                expect(Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.equal(true);
 
@@ -462,3 +462,3 @@ var res = {
 
-                expect(Browser.client.authenticate(res, credentials, artifacts)).to.equal(true);
+                expect(Browser.client.authenticate(res, credentials2, artifacts)).to.equal(true);
                 done();
@@ -478,10 +478,10 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
             Browser.utils.setNtpOffset(60 * 60 * 1000);
-            var header = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' });
+            var header = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data' });
             req.authorization = header.field;
             expect(req.authorization).to.exist();
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts2) {
 
@@ -495,5 +495,5 @@ expect(err).to.exist();
                     },
-                    getResponseHeader: function (header) {
+                    getResponseHeader: function (lookup) {
 
-                        return res.headers[header.toLowerCase()];
+                        return res.headers[lookup.toLowerCase()];
                     }
@@ -503,13 +503,13 @@ };
                 expect(Browser.utils.getNtpOffset()).to.equal(60 * 60 * 1000);
-                expect(Browser.client.authenticate(res, credentials, header.artifacts)).to.equal(true);
+                expect(Browser.client.authenticate(res, credentials2, header.artifacts)).to.equal(true);
                 expect(Browser.utils.getNtpOffset()).to.equal(0);
 
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' }).field;
+                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials2, ext: 'some-app-data' }).field;
                 expect(req.authorization).to.exist();
 
-                Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+                Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials3, artifacts3) {
 
                     expect(err).to.not.exist();
-                    expect(credentials.user).to.equal('steve');
-                    expect(artifacts.ext).to.equal('some-app-data');
+                    expect(credentials3.user).to.equal('steve');
+                    expect(artifacts3.ext).to.equal('some-app-data');
                     done();
@@ -530,3 +530,3 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
@@ -538,7 +538,7 @@ var localStorage = new Browser.internals.LocalStorage();
             Browser.utils.setNtpOffset(60 * 60 * 1000);
-            var header = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' });
+            var header = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data' });
             req.authorization = header.field;
             expect(req.authorization).to.exist();
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts2) {
 
@@ -552,5 +552,5 @@ expect(err).to.exist();
                     },
-                    getResponseHeader: function (header) {
+                    getResponseHeader: function (lookup) {
 
-                        return res.headers[header.toLowerCase()];
+                        return res.headers[lookup.toLowerCase()];
                     }
@@ -561,14 +561,14 @@ };
                 expect(Browser.utils.getNtpOffset()).to.equal(60 * 60 * 1000);
-                expect(Browser.client.authenticate(res, credentials, header.artifacts)).to.equal(true);
+                expect(Browser.client.authenticate(res, credentials2, header.artifacts)).to.equal(true);
                 expect(Browser.utils.getNtpOffset()).to.equal(0);
                 expect(parseInt(localStorage.getItem('hawk_ntp_offset'))).to.equal(0);
 
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' }).field;
+                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials2, ext: 'some-app-data' }).field;
                 expect(req.authorization).to.exist();
 
-                Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+                Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials3, artifacts3) {
 
                     expect(err).to.not.exist();
-                    expect(credentials.user).to.equal('steve');
-                    expect(artifacts.ext).to.equal('some-app-data');
+                    expect(credentials3.user).to.equal('steve');
+                    expect(artifacts3.ext).to.equal('some-app-data');
                     done();
@@ -593,13 +593,13 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
+            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
             req.headers.authorization = reqHeader.field;
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
+                expect(Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.equal(true);
 
@@ -616,6 +616,6 @@ var res = {
 
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts);
+                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts);
                 expect(res.headers['server-authorization']).to.exist();
 
-                expect(Browser.client.authenticate(res, credentials, artifacts, { payload: 'some reply' })).to.equal(false);
+                expect(Browser.client.authenticate(res, credentials2, artifacts, { payload: 'some reply' })).to.equal(false);
                 done();
@@ -635,9 +635,9 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, payload: 'hola!', ext: 'some-app-data' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
@@ -658,12 +658,12 @@ done();
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, payload: 'hola!', ext: 'some-app-data' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload('hola!', credentials, artifacts)).to.be.true();
-                expect(Hawk.server.authenticatePayload('hello!', credentials, artifacts)).to.be.false();
+                expect(Hawk.server.authenticatePayload('hola!', credentials2, artifacts)).to.be.true();
+                expect(Hawk.server.authenticatePayload('hello!', credentials2, artifacts)).to.be.false();
                 done();
@@ -683,9 +683,9 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', app: 'asd23ased' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', app: 'asd23ased' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
@@ -707,9 +707,9 @@ expect(artifacts.app).to.equal('asd23ased');
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', app: 'asd23ased', dlg: '23434szr3q4d' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', app: 'asd23ased', dlg: '23434szr3q4d' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
@@ -732,6 +732,6 @@ expect(artifacts.app).to.equal('asd23ased');
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, { payload: 'byebye!' }, function (err, credentials, artifacts) {
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, payload: 'hola!', ext: 'some-app-data' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, { payload: 'byebye!' }, function (err, credentials2, artifacts) {
 
@@ -754,11 +754,11 @@ expect(err).to.exist();
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' }).field;
+            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data' }).field;
             req.url = '/something/else';
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.exist();
-                expect(credentials).to.exist();
+                expect(credentials2).to.exist();
                 done();
@@ -1153,11 +1153,11 @@ });
 
-                credentialsFunc('123456', function (err, credentials) {
+                credentialsFunc('123456', function (err, credentials1) {
 
-                    var auth = Browser.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                    var auth = Browser.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                     expect(auth).to.exist();
 
-                    Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials) {
+                    Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials2) {
 
                         expect(err).to.not.exist();
-                        expect(credentials.user).to.equal('steve');
+                        expect(credentials2.user).to.equal('steve');
                         done();
@@ -1460,5 +1460,12 @@ });
 
+            it('returns empty object on invalid', function (done) {
+
+                var uri = Browser.utils.parseUri('ftp');
+                expect(uri).to.deep.equal({ host: '', port: '', resource: '' });
+                done();
+            });
+
             it('returns empty port when unknown scheme', function (done) {
 
-                var uri = Browser.utils.parseUri('ftp://domain');
+                var uri = Browser.utils.parseUri('ftp://example.com');
                 expect(uri.port).to.equal('');
@@ -1470,6 +1477,32 @@ done();
 
-                var uri = Browser.utils.parseUri('http://');
+                var uri = Browser.utils.parseUri('http://example.com');
                 expect(uri.port).to.equal('80');
                 done();
             });
+
+            it('handles unusual characters correctly', function (done) {
+
+                var parts = {
+                    protocol: 'http+vnd.my-extension',
+                    user: 'user!$&\'()*+,;=%40my-domain.com',
+                    password: 'pass!$&\'()*+,;=%40:word',
+                    hostname: 'foo-bar.com',
+                    port: '99',
+                    pathname: '/path/%40/!$&\'()*+,;=:@/',
+                    query: 'query%40/!$&\'()*+,;=:@/?',
+                    fragment: 'fragm%40/!$&\'()*+,;=:@/?'
+                };
+
+                parts.userInfo = parts.user + ':' + parts.password;
+                parts.authority = parts.userInfo + '@' + parts.hostname + ':' + parts.port;
+                parts.relative = parts.pathname + '?' + parts.query;
+                parts.resource = parts.relative + '#' + parts.fragment;
+                parts.source = parts.protocol + '://' + parts.authority + parts.resource;
+
+                var uri = Browser.utils.parseUri(parts.source);
+                expect(uri.host).to.equal('foo-bar.com');
+                expect(uri.port).to.equal('99');
+                expect(uri.resource).to.equal(parts.pathname + '?' + parts.query);
+                done();
+            });
         });
@@ -1476,0 +1509,0 @@

test/index.js

@@ -45,11 +45,11 @@ // Load modules
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Hawk.client.header(Url.parse('http://example.com:8080/resource/4?filter=a'), req.method, { credentials: credentials, ext: 'some-app-data' }).field;
+            req.authorization = Hawk.client.header(Url.parse('http://example.com:8080/resource/4?filter=a'), req.method, { credentials: credentials1, ext: 'some-app-data' }).field;
             expect(req.authorization).to.exist();
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
@@ -74,13 +74,13 @@ done();
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var reqHeader = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
+            var reqHeader = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
             req.headers.authorization = reqHeader.field;
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
+                expect(Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.equal(true);
 
@@ -93,6 +93,6 @@ var res = {
 
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
+                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
                 expect(res.headers['server-authorization']).to.exist();
 
-                expect(Hawk.client.authenticate(res, credentials, artifacts, { payload: 'some reply' })).to.equal(true);
+                expect(Hawk.client.authenticate(res, credentials2, artifacts, { payload: 'some reply' })).to.equal(true);
                 done();
@@ -116,13 +116,13 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var reqHeader = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
+            var reqHeader = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
             req.headers.authorization = reqHeader.field;
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
+                expect(Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.equal(true);
 
@@ -135,6 +135,6 @@ var res = {
 
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
+                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
                 expect(res.headers['server-authorization']).to.exist();
 
-                expect(Hawk.client.authenticate(res, credentials, artifacts, { payload: 'some reply' })).to.equal(true);
+                expect(Hawk.client.authenticate(res, credentials2, artifacts, { payload: 'some reply' })).to.equal(true);
                 done();
@@ -158,13 +158,13 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var reqHeader = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
+            var reqHeader = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
             req.headers.authorization = reqHeader.field;
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
+                expect(Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.equal(true);
 
@@ -177,6 +177,6 @@ var res = {
 
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts);
+                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts);
                 expect(res.headers['server-authorization']).to.exist();
 
-                expect(Hawk.client.authenticate(res, credentials, artifacts)).to.equal(true);
+                expect(Hawk.client.authenticate(res, credentials2, artifacts)).to.equal(true);
                 done();
@@ -200,13 +200,13 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var reqHeader = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
+            var reqHeader = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
             req.headers.authorization = reqHeader.field;
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
+                expect(Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.equal(true);
 
@@ -219,6 +219,6 @@ var res = {
 
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts);
+                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts);
                 expect(res.headers['server-authorization']).to.exist();
 
-                expect(Hawk.client.authenticate(res, credentials, artifacts, { payload: 'some reply' })).to.equal(false);
+                expect(Hawk.client.authenticate(res, credentials2, artifacts, { payload: 'some reply' })).to.equal(false);
                 done();
@@ -238,9 +238,9 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, payload: 'hola!', ext: 'some-app-data' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
@@ -261,12 +261,12 @@ done();
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, payload: 'hola!', ext: 'some-app-data' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload('hola!', credentials, artifacts)).to.be.true();
-                expect(Hawk.server.authenticatePayload('hello!', credentials, artifacts)).to.be.false();
+                expect(Hawk.server.authenticatePayload('hola!', credentials2, artifacts)).to.be.true();
+                expect(Hawk.server.authenticatePayload('hello!', credentials2, artifacts)).to.be.false();
                 done();
@@ -286,9 +286,9 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, { payload: 'hola!' }, function (err, credentials, artifacts) {
+            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, payload: 'hola!', ext: 'some-app-data' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, { payload: 'hola!' }, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
@@ -309,9 +309,9 @@ done();
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', app: 'asd23ased' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', app: 'asd23ased' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
@@ -333,9 +333,9 @@ expect(artifacts.app).to.equal('asd23ased');
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', app: 'asd23ased', dlg: '23434szr3q4d' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', app: 'asd23ased', dlg: '23434szr3q4d' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(artifacts.ext).to.equal('some-app-data');
@@ -358,6 +358,6 @@ expect(artifacts.app).to.equal('asd23ased');
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, { payload: 'byebye!' }, function (err, credentials, artifacts) {
+            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, payload: 'hola!', ext: 'some-app-data' }).field;
+            Hawk.server.authenticate(req, credentialsFunc, { payload: 'byebye!' }, function (err, credentials2, artifacts) {
 
@@ -380,11 +380,11 @@ expect(err).to.exist();
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' }).field;
+            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data' }).field;
             req.url = '/something/else';
 
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials2, artifacts) {
 
                 expect(err).to.exist();
-                expect(credentials).to.exist();
+                expect(credentials2).to.exist();
                 done();
@@ -391,0 +391,0 @@ });

test/server.js

@@ -203,8 +203,8 @@ // Load modules
 
-            Hawk.server.authenticate(req, credentialsFunc, options, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFunc, options, function (err, credentials1, artifacts1) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials1.user).to.equal('steve');
 
-                Hawk.server.authenticate(req, credentialsFunc, options, function (err, credentials, artifacts) {
+                Hawk.server.authenticate(req, credentialsFunc, options, function (err, credentials2, artifacts2) {
 
@@ -236,3 +236,3 @@ expect(err).to.exist();
 
-            var credentialsFunc = function (id, callback) {
+            var credentialsFuncion = function (id, callback) {
 
@@ -271,11 +271,11 @@ var credentials = {
 
-            Hawk.server.authenticate(reqSteve, credentialsFunc, options, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(reqSteve, credentialsFuncion, options, function (err, credentials1, artifacts1) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials1.user).to.equal('steve');
 
-                Hawk.server.authenticate(reqBob, credentialsFunc, options, function (err, credentials, artifacts) {
+                Hawk.server.authenticate(reqBob, credentialsFuncion, options, function (err, credentials2, artifacts2) {
 
                     expect(err).to.not.exist();
-                    expect(credentials.user).to.equal('bob');
+                    expect(credentials2.user).to.equal('bob');
                     done();
@@ -585,3 +585,3 @@ });
 
-            var credentialsFunc = function (id, callback) {
+            var credentialsFuncion = function (id, callback) {
 
@@ -591,3 +591,3 @@ return callback(new Error('Unknown user'));
 
-            Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFuncion, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
 
@@ -610,3 +610,3 @@ expect(err).to.exist();
 
-            var credentialsFunc = function (id, callback) {
+            var credentialsFuncion = function (id, callback) {
 
@@ -616,3 +616,3 @@ return callback(new Error('Unknown user'), { some: 'value' });
 
-            Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFuncion, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
 
@@ -636,3 +636,3 @@ expect(err).to.exist();
 
-            var credentialsFunc = function (id, callback) {
+            var credentialsFuncion = function (id, callback) {
 
@@ -642,3 +642,3 @@ return callback(null, null);
 
-            Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFuncion, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
 
@@ -661,3 +661,3 @@ expect(err).to.exist();
 
-            var credentialsFunc = function (id, callback) {
+            var credentialsFuncion = function (id, callback) {
 
@@ -672,3 +672,3 @@ var credentials = {
 
-            Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFuncion, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
 
@@ -692,3 +692,3 @@ expect(err).to.exist();
 
-            var credentialsFunc = function (id, callback) {
+            var credentialsFuncion = function (id, callback) {
 
@@ -703,3 +703,3 @@ var credentials = {
 
-            Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFuncion, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
 
@@ -723,3 +723,3 @@ expect(err).to.exist();
 
-            var credentialsFunc = function (id, callback) {
+            var credentialsFuncion = function (id, callback) {
 
@@ -735,3 +735,3 @@ var credentials = {
 
-            Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFuncion, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
 
@@ -755,3 +755,3 @@ expect(err).to.exist();
 
-            var credentialsFunc = function (id, callback) {
+            var credentialsFuncion = function (id, callback) {
 
@@ -767,3 +767,3 @@ var credentials = {
 
-            Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
+            Hawk.server.authenticate(req, credentialsFuncion, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
 
@@ -994,8 +994,8 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 delete auth.ts;
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials2) {
 
@@ -1011,8 +1011,8 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 delete auth.nonce;
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials2) {
 
@@ -1028,8 +1028,8 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 delete auth.hash;
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials2) {
 
@@ -1045,5 +1045,5 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
 
@@ -1053,7 +1053,7 @@ Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, function (id, callback) {
                     callback(new Error('something'), { some: 'value' });
-                }, {}, function (err, credentials) {
+                }, {}, function (err, credentials2) {
 
                     expect(err).to.exist();
                     expect(err.message).to.equal('something');
-                    expect(credentials.some).to.equal('value');
+                    expect(credentials2.some).to.equal('value');
                     done();
@@ -1066,5 +1066,5 @@ });
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {
@@ -1075,3 +1075,3 @@ nonceFunc: function (key, nonce, ts, nonceCallback) {
                     }
-                }, function (err, credentials) {
+                }, function (err, credentials2) {
 
@@ -1085,25 +1085,13 @@ expect(err).to.exist();
 
-        var credentialsFunc = function (id, callback) {
-
-            var credentials = {
-                id: id,
-                key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                algorithm: (id === '1' ? 'sha1' : 'sha256'),
-                user: 'steve'
-            };
-
-            return callback(null, credentials);
-        };
-
         it('should generate an authorization then successfully parse it', function (done) {
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials2) {
 
                     expect(err).to.not.exist();
-                    expect(credentials.user).to.equal('steve');
+                    expect(credentials2.user).to.equal('steve');
                     done();
@@ -1116,8 +1104,8 @@ });
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
 
-                Hawk.server.authenticateMessage('example1.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example1.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials2) {
 
@@ -1133,8 +1121,8 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, { localtimeOffsetMsec: 100000 }, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, { localtimeOffsetMsec: 100000 }, function (err, credentials2) {
 
@@ -1150,8 +1138,8 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials, localtimeOffsetMsec: 100000 });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1, localtimeOffsetMsec: 100000 });
                 expect(auth).to.exist();
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, { timestampSkewSec: 500 }, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, { timestampSkewSec: 500 }, function (err, credentials2) {
 
@@ -1166,9 +1154,9 @@ expect(err).to.not.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
                 delete auth.id;
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials2) {
 
@@ -1184,8 +1172,8 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message1', auth, credentialsFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message1', auth, credentialsFunc, {}, function (err, credentials2) {
 
@@ -1201,5 +1189,5 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
@@ -1212,3 +1200,3 @@
                     }
-                }, function (err, credentials) {
+                }, function (err, credentials2) {
 
@@ -1224,5 +1212,5 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
@@ -1235,3 +1223,3 @@
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials2) {
 
@@ -1247,5 +1235,5 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
@@ -1258,3 +1246,3 @@
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials2) {
 
@@ -1270,5 +1258,5 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
@@ -1281,3 +1269,3 @@
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials2) {
 
@@ -1293,5 +1281,5 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
@@ -1304,3 +1292,3 @@
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials2) {
 
@@ -1307,0 +1295,0 @@ expect(err).to.exist();

test/uri.js

@@ -31,3 +31,3 @@ // Load modules
             key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-            algorithm: 'sha256',
+            algorithm: (id === '1' ? 'sha1' : 'sha256'),
             user: 'steve'
@@ -48,11 +48,11 @@ };
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var bewit = Hawk.uri.getBewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials, ttlSec: 60 * 60 * 24 * 365 * 100, ext: 'some-app-data' });
+            var bewit = Hawk.uri.getBewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials1, ttlSec: 60 * 60 * 24 * 365 * 100, ext: 'some-app-data' });
             req.url += '&bewit=' + bewit;
 
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
+            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials2, attributes) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 expect(attributes.ext).to.equal('some-app-data');
@@ -73,11 +73,11 @@ done();
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
-            var bewit = Hawk.uri.getBewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials, ttlSec: 60 * 60 * 24 * 365 * 100 });
+            var bewit = Hawk.uri.getBewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials1, ttlSec: 60 * 60 * 24 * 365 * 100 });
             req.url += '&bewit=' + bewit;
 
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
+            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials2, attributes) {
 
                 expect(err).to.not.exist();
-                expect(credentials.user).to.equal('steve');
+                expect(credentials2.user).to.equal('steve');
                 done();
@@ -162,3 +162,3 @@ });
 
-        credentialsFunc('123456', function (err, credentials) {
+        credentialsFunc('123456', function (err, credentials1) {
 
@@ -174,3 +174,3 @@ var req = {
             var ext = 'some-app-data';
-            var mac = Hawk.crypto.calculateMac('bewit', credentials, {
+            var mac = Hawk.crypto.calculateMac('bewit', credentials1, {
                 timestamp: exp,
@@ -185,7 +185,7 @@ nonce: '',
 
-            var bewit = credentials.id + '\\' + exp + '\\' + mac + '\\' + ext;
+            var bewit = credentials1.id + '\\' + exp + '\\' + mac + '\\' + ext;
 
             req.url += '&bewit=' + Hoek.base64urlEncode(bewit);
 
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
+            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials2, attributes) {
 
@@ -610,27 +610,16 @@ expect(err).to.exist();
     });
+
     describe('authenticateMessage()', function () {
 
-        var credentialsFunc = function (id, callback) {
-
-            var credentials = {
-                id: id,
-                key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                algorithm: (id === '1' ? 'sha1' : 'sha256'),
-                user: 'steve'
-            };
-
-            return callback(null, credentials);
-        };
-
         it('should generate an authorization then successfully parse it', function (done) {
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials2) {
 
                     expect(err).to.not.exist();
-                    expect(credentials.user).to.equal('steve');
+                    expect(credentials2.user).to.equal('steve');
                     done();
@@ -643,8 +632,8 @@ });
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
 
-                Hawk.server.authenticateMessage('example1.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example1.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials2) {
 
@@ -660,8 +649,8 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, { localtimeOffsetMsec: 100000 }, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, { localtimeOffsetMsec: 100000 }, function (err, credentials2) {
 
@@ -677,8 +666,8 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials, localtimeOffsetMsec: 100000 });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1, localtimeOffsetMsec: 100000 });
                 expect(auth).to.exist();
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, { timestampSkewSec: 500 }, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, { timestampSkewSec: 500 }, function (err, credentials2) {
 
@@ -693,9 +682,9 @@ expect(err).to.not.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
                 delete auth.id;
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc, {}, function (err, credentials2) {
 
@@ -711,8 +700,8 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message1', auth, credentialsFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message1', auth, credentialsFunc, {}, function (err, credentials2) {
 
@@ -728,5 +717,5 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
@@ -739,3 +728,3 @@
                     }
-                }, function (err, credentials) {
+                }, function (err, credentials2) {
 
@@ -751,5 +740,5 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
@@ -762,3 +751,3 @@
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials2) {
 
@@ -774,5 +763,5 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
@@ -785,3 +774,3 @@
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials2) {
 
@@ -797,5 +786,5 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
@@ -808,3 +797,3 @@
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials2) {
 
@@ -820,5 +809,5 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.exist();
@@ -831,3 +820,3 @@
 
-                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials) {
+                Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, errFunc, {}, function (err, credentials2) {
 
@@ -843,5 +832,5 @@ expect(err).to.exist();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var auth = Hawk.client.message(null, 8080, 'some message', { credentials: credentials });
+                var auth = Hawk.client.message(null, 8080, 'some message', { credentials: credentials1 });
                 expect(auth).to.not.exist();
@@ -861,5 +850,5 @@ done();
 
-            credentialsFunc('123456', function (err, credentials) {
+            credentialsFunc('123456', function (err, credentials1) {
 
-                var creds = Hoek.clone(credentials);
+                var creds = Hoek.clone(credentials1);
                 creds.algorithm = 'blah';
@@ -866,0 +855,0 @@ var auth = Hawk.client.message('example.com', 8080, 'some message', { credentials: creds });

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

354088

increased by0.22%

Lines of code

4991

increased by0.12%

No dependency changes