From aebe2fdfeebf85ae8bd60657d3e79c6d19cf7e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 11 Nov 2016 13:30:24 -0500
Subject: [PATCH] nameservice: set all responses to JSON content-type

Change-Id: I57e07aa36842354e9900075dfe19a63a9fb63a51
---
 index.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/index.js b/index.js
index 1f73294..5eaa93f 100644
--- a/index.js
+++ b/index.js
@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+'use strict';
+
 var connect = require('connect');
 var express = require('express');
 var bodyParser = require('body-parser');
@@ -9,7 +11,7 @@ var Web3 = require('web3');
 var web3 = new Web3();
 
 Object.getPrototypeOf(web3.eth).awaitConsensus = function(txhash, mined_cb) {
-    ethP = this;
+    var ethP = this;
     var tries = 5;
     var filter = this.filter('latest');
     filter.watch(function(error, result) {
@@ -178,10 +180,13 @@ function startServer() {
     var app = express();
     app.disable('x-powered-by');
     app.use(bodyParser.json());
+    app.use(function(req, res, next) {
+      res.setHeader('Content-Type', 'application/json');
+      next();
+    });
 
     // Register name lookup handler
     app.get("/name/:name", function(req, http_res) {
-        http_res.setHeader('Content-Type', 'application/json');
         try {
             reg.addr(req.params.name, function(err, res) {
                 try {
@@ -205,7 +210,6 @@ function startServer() {
 
     // Register owner lookup handler
     app.get("/name/:name/owner", function(req, http_res) {
-        http_res.setHeader('Content-Type', 'application/json');
         try {
             reg.owner(req.params.name, function(err, res) {
                 try {
@@ -230,7 +234,6 @@ function startServer() {
 
     // Register address lookup handler
     app.get("/addr/:addr", function(req, http_res) {
-        http_res.setHeader('Content-Type', 'application/json');
         try {
             var addr = formatAddress(req.params.addr);
             if (!addr) {
@@ -260,7 +263,6 @@ function startServer() {
 
     // Register name registration handler
     app.post("/name/:name", function(req, http_res) {
-        http_res.setHeader('Content-Type', 'application/json');
         try {
             var addr = formatAddress(req.body.addr);
             if (!addr) {
-- 
GitLab