smartystreets-javascript-sdk 2.2.0 → 3.0.0

package/Makefile

@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-VERSION           := $(shell tagit -m --dry-run)
+VERSION           := $(shell tagit -M --dry-run)
 VERSION_FILE1     := package.json
 VERSION_FILE2     := package-lock.json
 
@@ -11,7 +11,7 @@ node_modules:
 	npm install
 
 publish: test version upload unversion
-	tagit -m
+	tagit -M
 	git push origin --tags
 
 upload:

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "smartystreets-javascript-sdk",
- "version": "2.2.0",
+ "version": "3.0.0",
  "description": "Quick and easy Smarty address validation.",
  "keywords": [
   "smarty",

package/src/Errors.js

@@ -1,7 +1,14 @@
 class SmartyError extends Error {
+	constructor(message = "unexpected error") {
+		super(message);
+	}
+}
+
+class DefaultError extends SmartyError {
 	constructor(message) {
 		super(message);
 	}
+
 }
 
 class BatchFullError extends SmartyError {
@@ -88,5 +95,6 @@ module.exports = {
 	TooManyRequestsError: TooManyRequestsError,
 	InternalServerError: InternalServerError,
 	ServiceUnavailableError: ServiceUnavailableError,
-	GatewayTimeoutError: GatewayTimeoutError
+	GatewayTimeoutError: GatewayTimeoutError,
+	DefaultError: DefaultError
 };

package/src/HttpSender.js

@@ -1,9 +1,9 @@
-const Response = require("./Response");
 const Axios = require("axios");
 const {buildSmartyResponse} = require("../src/util/buildSmartyResponse");
 
 class HttpSender {
 	constructor(timeout = 10000, proxyConfig, debug = false) {
+		this.axiosInstance = Axios.create();
 		this.timeout = timeout;
 		this.proxyConfig = proxyConfig;
 		if (debug) this.enableDebug();
@@ -34,7 +34,7 @@ class HttpSender {
 		return new Promise((resolve, reject) => {
 			let requestConfig = this.buildRequestConfig(request);
 
-			Axios(requestConfig)
+			this.axiosInstance(requestConfig)
 				.then(response => {
 					let smartyResponse = buildSmartyResponse(response);
 
@@ -47,13 +47,13 @@ class HttpSender {
 	}
 
 	enableDebug() {
-		Axios.interceptors.request.use(request => {
+		this.axiosInstance.interceptors.request.use(request => {
 			console.log('Request:\r\n', request);
 			console.log('\r\n*******************************************\r\n');
 			return request
 		});
 
-		Axios.interceptors.response.use(response => {
+		this.axiosInstance.interceptors.response.use(response => {
 			console.log('Response:\r\n');
 			console.log('Status:', response.status, response.statusText);
 			console.log('Headers:', response.headers);

package/src/StatusCodeSender.js

@@ -11,30 +11,6 @@ class StatusCodeSender {
 				.then(resolve)
 				.catch(error => {
 					switch (error.statusCode) {
-						case 400:
-							error.error = new Errors.BadRequestError();
-							break;
-
-						case 401:
-							error.error = new Errors.BadCredentialsError();
-							break;
-
-						case 402:
-							error.error = new Errors.PaymentRequiredError();
-							break;
-
-						case 413:
-							error.error = new Errors.RequestEntityTooLargeError();
-							break;
-
-						case 422:
-							error.error = new Errors.UnprocessableEntityError("GET request lacked required fields.");
-							break;
-
-						case 429:
-							error.error = new Errors.TooManyRequestsError();
-							break;
-
 						case 500:
 							error.error = new Errors.InternalServerError();
 							break;
@@ -46,8 +22,10 @@ class StatusCodeSender {
 						case 504:
 							error.error = new Errors.GatewayTimeoutError();
 							break;
-					}
 
+						default:
+							error.error = new Errors.DefaultError(error && error.payload && error.payload.errors[0] && error.payload.errors[0].message);
+					}
 					reject(error);
 				});
 		});

package/tests/test_StatusCodeSender.js

@@ -23,35 +23,24 @@ describe("A status code sender", function () {
 		});
 	});
 
-	it("gives a Bad Credentials error on a 401.", function () {
-		return expectedErrorForStatusCode(errors.BadCredentialsError, 401);
-	});
-
-	it("gives a Payment Required error on a 402.", function () {
-		return expectedErrorForStatusCode(errors.PaymentRequiredError, 402);
-	});
-
-	it("gives a Request Entity Too Large error on a 413.", function () {
-		return expectedErrorForStatusCode(errors.RequestEntityTooLargeError, 413);
-	});
-
-	it("gives a Bad Request error on a 400.", function () {
-		return expectedErrorForStatusCode(errors.BadRequestError, 400);
-	});
-
-	it("gives an Unprocessable Entity error on a 422.", function () {
-		return expectedErrorForStatusCode(errors.UnprocessableEntityError, 422);
-	});
+	it("gives a custom message for 400", function () {
+		const payload = {
+			errors: [
+				{message: "custom message"}
+			]
+		};
+		return expectedErrorWithPayloadMessage(400, payload);
+	})
 
-	it("gives a Too Many Requests error on a 429.", function () {
-		return expectedErrorForStatusCode(errors.TooManyRequestsError, 429);
-	});
+	it("returns an error message if payload is undefined", function () {
+		return expectedDefaultError()
+	})
 
-	it("gives an Internal Server Error error on a 500.", function () {
+	it("gives an Internal Server Error on a 500.", function () {
 		return expectedErrorForStatusCode(errors.InternalServerError, 500);
 	});
 
-	it("gives an Service Unvailable error on a 503.", function () {
+	it("gives an Service Unavailable error on a 503.", function () {
 		return expectedErrorForStatusCode(errors.ServiceUnavailableError, 503);
 	});
 
@@ -60,22 +49,46 @@ describe("A status code sender", function () {
 	});
 });
 
+const expectedErrorWithPayloadMessage = (errorCode, payload) => {
+	let mockSender = generateMockSender(errorCode, payload);
+	let statusCodeSender = new StatusCodeSender(mockSender);
+	let request = new Request();
+
+	return statusCodeSender.send(request).then(() => {
+	}, error => {
+		expect(error.error).to.be.an.instanceOf(errors.DefaultError);
+		expect(error.error.message).to.be.equal(payload.errors[0].message);
+	})
+}
+
+const expectedDefaultError = () => {
+	let mockSender = generateMockSender(400);
+	let statusCodeSender = new StatusCodeSender(mockSender);
+	let request = new Request();
+
+	return statusCodeSender.send(request).then(() => {
+	}, error => {
+		expect(error.error).to.be.an.instanceOf(errors.DefaultError);
+		expect(error.error.message).to.be.equal("unexpected error");
+	})
+}
+
 function expectedErrorForStatusCode(expectedError, errorCode) {
 	let mockSender = generateMockSender(errorCode);
 	let statusCodeSender = new StatusCodeSender(mockSender);
 	let request = new Request();
 
-	return statusCodeSender.send(request).then(response => {
+	return statusCodeSender.send(request).then(() => {
 	}, error => {
 		expect(error.error).to.be.an.instanceOf(expectedError);
 	})
 }
 
-function generateMockSender(errorCode) {
+function generateMockSender(errorCode, payload) {
 	return {
 		send: () => {
 			return new Promise((resolve, reject) => {
-				reject(new Response(errorCode))
+				reject(new Response(errorCode, payload))
 			});
 		}
 	};