From 21c957cf0f9f9eb82b83dd4f62e8d8fe9a51b5ab Mon Sep 17 00:00:00 2001
From: Damian Mee <damian.wasilewski@gmail.com>
Date: Tue, 5 Aug 2014 00:59:08 +0200
Subject: [PATCH] style(server): server setup cleanup

---
 lib/app.js | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/lib/app.js b/lib/app.js
index 2dedc726..854e0dd8 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -47,10 +47,9 @@ module.exports = function (options) {
 
   app.use(express.bodyParser());
 
-  if (!options.https) {
-    server = http.createServer(app);
-  }
-  else {
+  var authMiddleware;
+
+  if (options.https) {
     var serverOptions = {
       key: options.https.key,
       cert: options.https.cert,
@@ -61,30 +60,28 @@ module.exports = function (options) {
     };
 
     server = https.createServer(serverOptions, app);
-  }
 
-  var authMiddleware = function (req, res, next) {
-    req.device = {};
-    return next();
-  };
-
-  if (options.https) {
     authMiddleware = function(req, res, next) {
-      var fingerprint = req.connection.getPeerCertificate().fingerprint;
-
-      config.isAuthorized(fingerprint, function (err, device) {
-        if (err) { 
+      config.isAuthorized(routes.getFingerprint(req), function (err, device) {
+        if (err) {
           res.json({err: 'Internal Server Error'});
           return next(err); 
         }
         if (!device) {
-          res.statusCode = 404;
-          res.json({err: 'Not Found'});
-          return next(new Error('Device is unpaired')); 
+          res.json(404, {err: 'Not Found'});
+          return next(new Error('Device is unpaired'));
         }
         next();
       });
     };
+
+  } else {
+    server = http.createServer(app);
+
+    authMiddleware = function (req, res, next) {
+      req.device = {};
+      return next();
+    };
   }
 
   routes.init(app, config, trader, authMiddleware);