Merge pull request #114 from oddnetworks/json-api-bugfixes

Json api bugfixes
oddnetworks · Jul 17, 2016 · 0d74f99 · 0d74f99
2 parents 6def2da + 86119d2
commit 0d74f99
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/middleware/error-handler.js b/lib/middleware/error-handler.js
@@ -20,9 +20,9 @@ module.exports = function (options) {
 	function formatError(error) {
 		const output = error.output || {};
 		return {
-			status: output.statusCode ? output.statusCode.toString() : null,
-			title: error.name,
-			detail: error.message
+			status: output.statusCode ? output.statusCode.toString() : '500',
+			title: output.payload ? output.payload.error : error.name,
+			detail: output.payload ? output.payload.message : (error.message || error.toString())
 		};
 	}
 

diff --git a/lib/middleware/response-json-api.js b/lib/middleware/response-json-api.js
@@ -109,7 +109,7 @@ module.exports = function (options) {
 			defaultPort = true;
 		}
 
-		if (defaultPort) {
+		if (!defaultPort) {
 			baseUrl = `${baseUrl}:${port}`;
 		}
 		if (BASE_PREFIX) {