jsHint and whitespace cleanup

client/oz.js

@@ -100,7 +100,7 @@ Oz.macMessage = function (message, ticket) {
     // Sign normalized request string
 
     return Crypto.util.bytesToBase64(Crypto.HMAC(hashFunc, Oz.internals.utf8Encode(message), ticket.key, { asBytes: true }));
-}
+};
 
 
 // Escape header attribute value

lib/crypto.js

@@ -300,8 +300,4 @@ exports.unseal = function (sealed, encryptionPassword, options, callback) {
             return callback(null, object);
         });
     });
-};
-
-
-
-
+};

lib/endpoints.js

@@ -263,4 +263,4 @@ internals.basicAuth = function (req) {
 
     var credentials = new Buffer(parts[1], 'base64').toString().split(':');
     return { username: credentials[0], password: credentials[1] };
-};
+};

lib/error.js

@@ -103,7 +103,4 @@ internals.Error.internal = function (message, data) {
     err.trace = Utils.callStack(1);
     err.data = data;
     return err;
-};
-
-
-
+};

lib/oz.js

@@ -26,5 +26,4 @@ internals.export = function () {
     }
 };
 
-internals.export();
-
+internals.export();

lib/request.js

@@ -3,8 +3,8 @@
 var Url = require('url');
 var Crypto = require('./crypto');
 var Ticket = require('./ticket');
-var Settings = require('./settings')
-var Utils = require('./utils')
+var Settings = require('./settings');
+var Utils = require('./utils');
 var Err = require('./error');
 
 
@@ -241,7 +241,4 @@ exports.generateHeader = function (request, ticket, attributes) {
     var mac = exports.mac(request, ticket, attributes);
     var header = exports.formatHeader(attributes, ticket.id, ticket.app, mac);
     return header;
-};
-
-
-
+};

lib/rsvp.js

@@ -60,6 +60,4 @@ exports.parse = function (rsvp, encryptionPassword, callback) {
     Utils.toss(encryptionPassword, Err.internal('Invalid encryption password'), callback);
 
     Crypto.unseal(rsvp, encryptionPassword, Settings.ticket, callback);
-};
-
-
+};

lib/scope.js

@@ -52,5 +52,4 @@ exports.isSubset = function (scope, subset) {
 
     var common = Utils.intersect(scope, subset);
     return common.length === subset.length;
-};
-
+};

lib/settings.js

@@ -1,6 +1,6 @@
 // Load modules
 
-var Utils = require('./utils')
+var Utils = require('./utils');
 
 
 // Declare internals
@@ -52,5 +52,4 @@ exports.set = function (arg1, arg2) {     // (group, settings) OR (tree)
         Utils.assert(['ticket'].indexOf(group) !== -1, 'Unknown settings group: ' + group);
         Utils.merge(exports[group], settings[group]);
     }
-};
-
+};

lib/ticket.js

@@ -72,7 +72,7 @@ exports.issue = function (app, grant, encryptionPassword, options, callback) {
     }
 
     if (options.ext) {
-        envelope.ext = options.ext
+        envelope.ext = options.ext;
     }
 
     exports.generate(envelope, encryptionPassword, callback);
@@ -184,6 +184,4 @@ exports.parse = function (id, encryptionPassword, callback) {
         ticket.id = id;
         return callback(null, ticket);
     });
-};
-
-
+};

lib/utils.js

@@ -11,7 +11,7 @@ var internals = {};
 
 // Import Hoek Utilities
 
-internals.import = function () {
+internals.importHoek = function () {
 
     for (var i in Hoek) {
         if (Hoek.hasOwnProperty(i)) {
@@ -20,7 +20,7 @@ internals.import = function () {
     }
 };
 
-internals.import();
+internals.importHoek();
 
 
 // oz version
@@ -57,4 +57,4 @@ exports.base64urlDecode = function (encoded) {
 exports.escapeHeaderAttribute = function (attribute) {
 
     return attribute.replace(/\\/g, '\\\\').replace(/\"/g, '\\"');
-};
+};