Fix Codacy Code Style issues

examples/sending-multiple-notifications.js

@@ -7,7 +7,7 @@ Send individualised notifications
 i.e. Account updates for users with one-or-more device tokens
 */
 
-const apn = require('apn');
+const apn = require("apn");
 
 let users = [
 	{ name: "Wendy", "devices": ["<insert device token>", "<insert device token>"]},

examples/sending-to-multiple-devices.js

@@ -11,7 +11,7 @@ Possible use cases:
  - Sport results
 */
 
-const apn = require('apn');
+const apn = require("apn");
 
 let tokens = ["<insert token here>", "<insert token here>"];
 

lib/client.js

@@ -60,7 +60,7 @@ module.exports = function (dependencies) {
       }, notification.headers);
 
       if (this.config.token) {
-        headers["authorization"] = "bearer " + this.config.token.current;
+        headers.authorization = "bearer " + this.config.token.current;
         tokenGeneration = this.config.token.generation;
       }
 
@@ -117,7 +117,7 @@ module.exports = function (dependencies) {
         resolve(stream);
       }
     });
-  }
+  };
 
   Client.prototype.shutdown = function shutdown() {
     if (this.queue.length > 0) {

lib/config.js

@@ -65,25 +65,28 @@ module.exports = function(dependencies) {
       }
 
       if (options.token) {
-        const token = options.token;
-        if (!token.keyId) {
-          throw new Error("token.keyId is missing");
-        } else if(typeof token.keyId !== "string") {
-          throw new Error("token.keyId must be a string");
-        }
-
-        if (!token.teamId) {
-          throw new Error("token.teamId is missing");
-        } else if(typeof token.teamId !== "string") {
-          throw new Error("token.teamId must be a string");
-        }
+        validateToken(options.token);
       }
     }
   }
 
   return config;
 };
 
+function validateToken(token) {
+  if (!token.keyId) {
+    throw new Error("token.keyId is missing");
+  } else if(typeof token.keyId !== "string") {
+    throw new Error("token.keyId must be a string");
+  }
+
+  if (!token.teamId) {
+    throw new Error("token.teamId is missing");
+  } else if(typeof token.teamId !== "string") {
+    throw new Error("token.teamId must be a string");
+  }
+}
+
 function configureAddress(options) {
   if (!options.address) {
     if (options.production) {

lib/credentials/index.js

@@ -31,7 +31,7 @@ module.exports = function (dependencies) {
 
 	const prepareCA = require("./ca/prepare")({
 		resolve,
-	})
+	});
 
 	return {
 	  certificate: prepareCertificate,

lib/credentials/token/prepare.js

@@ -30,7 +30,7 @@ module.exports = function (dependencies) {
             this.current = token();
           }
         }
-      }
+      };
     } catch (err) {
       throw new VError(err, "Failed to generate token");
     }

lib/protocol/endpoint.js

@@ -91,13 +91,13 @@ module.exports = function(dependencies) {
 
   Endpoint.prototype._protocolError = function protocolError(component, errCode) {
     this._error(component + " error: " + errCode);
-  }
+  };
 
   Endpoint.prototype._error = function error(err) {
     this.lastError = err;
 
     this.emit("error", err);
-  }
+  };
 
   Endpoint.prototype._goaway = function goaway(frame) {
     // When we receive a goaway we must be prepared to
@@ -123,7 +123,9 @@ module.exports = function(dependencies) {
     this._connection._streamIds.forEach( (stream, id) => {
 
       // Ignore stream 0 (connection stream)
-      if (id === 0) return;
+      if (id === 0) {
+        return;
+      }
 
       // let stream = this._connection._streamIds[id];
 

lib/protocol/endpointManager.js

@@ -41,7 +41,7 @@ module.exports = function(dependencies) {
     }
 
     return this._connectionFailures >= this._config.connectionRetryLimit;
-  }
+  };
 
   EndpointManager.prototype.createEndpoint = function createEndpoint() {
     if (this._currentConnection || this._endpoints.length >= this._config.maxConnections) {

lib/provider.js

@@ -44,7 +44,7 @@ module.exports = function(dependencies) {
 
   Provider.prototype.shutdown = function shutdown() {
     this.client.shutdown();
-  }
+  };
 
   return Provider;
 };

test/client.js

@@ -122,7 +122,7 @@ describe("Client", function () {
                 generation: 0,
                 current: "fake-token",
                 regenerate: sinon.stub(),
-              }
+              };
 
               client = new Client( { address: "testapi", token: fakes.token } );
 
@@ -137,7 +137,7 @@ describe("Client", function () {
                 expect(fakes.stream.headers).to.be.calledWithMatch({
                   authorization: "bearer fake-token",
                 });
-              })
+              });
             });
           });
 
@@ -535,7 +535,7 @@ describe("Client", function () {
 
         fakes.token.regenerate = function () {
           fakes.token.generation = 1;
-          fakes.token.current = "second-token"
+          fakes.token.current = "second-token";
         }
 
         fakes.endpointManager.getStream.onCall(0).returns(fakes.streams[0]);

test/config.js

@@ -206,7 +206,7 @@ describe("config", function () {
         it("throws an error if teamId is not a string", function () {
           expect(() => config({ token: { key, keyId, teamId: 123 }})).to.throw(/token\.teamId must be a string/);
         });
-      })
+      });
 
       it("does not invoke prepareCertificate", function () {
         let configuration = config({ token: { key, keyId, teamId } });

test/credentials/token/prepare.js

@@ -25,7 +25,7 @@ describe("perpareToken", function () {
 
     beforeEach(function() {
       fakes.resolve.withArgs("key.pem").returns("keyData");
-      fakes.sign.returns("generated-token")
+      fakes.sign.returns("generated-token");
 
       token = prepareToken(testOptions);
     });
@@ -105,7 +105,7 @@ describe("perpareToken", function () {
 
         it("does not change the `current` property", function () {
           expect(token.current).to.equal("generated-token");
-        })
+        });
       });
     });
   });

test/notification/apsProperties.js

@@ -359,7 +359,7 @@ describe("Notification", function() {
 
         it("sets the aps.alert.action property", function () {
           expect(compiledOutput()).to.have.deep.property("aps.alert.action", "Investigate");
-        })
+        });
       });
 
       describe("setAction", function () {

test/protocol/endpoint.js

@@ -364,7 +364,7 @@ describe("Endpoint", function () {
 
     beforeEach(function () {
       let endpoint = new Endpoint({});
-      endpoint.on("error", () => {})
+      endpoint.on("error", () => {});
 
       streams.connection._streamIds = [];
 
@@ -547,13 +547,13 @@ describe("Endpoint", function () {
     });
 
     context("with error", function () {
-      const debug_data = new Buffer(6);
-      debug_data.write("error!");
+      const debugData = new Buffer(6);
+      debugData.write("error!");
 
       const formattedError = "GOAWAY: PROTOCOL_ERROR error!";
 
       beforeEach(function () {
-        frame = { error: "PROTOCOL_ERROR", debug_data: debug_data };
+        frame = { error: "PROTOCOL_ERROR", debug_data: debugData };
       });
 
       it("emits an error with the type and debug data", function () {
@@ -620,7 +620,7 @@ describe("Endpoint", function () {
           expect(errorSpy).to.be.calledTwice.and.calledWith(formattedError);
         });
       });
-    })
+    });
   });
 
   describe("`wakeup` event", function () {

test/protocol/endpointManager.js

@@ -344,7 +344,7 @@ describe("Endpoint Manager", function () {
 
       beforeEach(function () {
         establishedEndpoint = establishEndpoint(manager);
-      })
+      });
 
       context("when the configured number of connections fail", function () {
         it("does not emit an error", function() {
@@ -501,7 +501,7 @@ describe("Endpoint Manager", function () {
     manager.getStream();
 
     if(fakes.Endpoint.callCount !== callCount + 1) {
-      return null
+      return null;
     }
 
     let endpoint = fakes.Endpoint.lastCall.returnValue;