From 9cf613b89e72fae40a8e2bb6a50243f72c30377a Mon Sep 17 00:00:00 2001
From: Martin Lagrange <lagrangemartin@gmail.com>
Date: Mon, 4 Apr 2016 11:15:15 -0700
Subject: [PATCH] Merge files in app.js

---
 server/.gitignore             |  3 ++-
 server/app.js                 | 39 ++++++++++++++++++++++++++++-------
 server/routes/github_oauth.js | 37 ---------------------------------
 server/views/error.ejs        |  3 ---
 4 files changed, 33 insertions(+), 49 deletions(-)
 delete mode 100644 server/routes/github_oauth.js
 delete mode 100644 server/views/error.ejs

diff --git a/server/.gitignore b/server/.gitignore
index 8d3c003..7ac9f88 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -3,4 +3,5 @@
 /.tmp
 /.sass-cache
 /bower_components
-/db
\ No newline at end of file
+/db
+/npm-debug.log
\ No newline at end of file
diff --git a/server/app.js b/server/app.js
index b02b6a1..ed1e51e 100644
--- a/server/app.js
+++ b/server/app.js
@@ -4,10 +4,12 @@ var logger = require('morgan');
 var cookieParser = require('cookie-parser');
 var bodyParser = require('body-parser');
 var cors = require('cors');
+var http = require("http");
+var parseUrlencoded = bodyParser.urlencoded({ extended: false });
+var request = require('request');
+var qs = require('querystring');
 var Datastore = require('nedb')
 
-var github_oauth = require('./routes/github_oauth');
-
 var app = express();
 
 // view engine setup
@@ -16,7 +18,6 @@ app.use(logger('dev'));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(cookieParser());
-app.set('view engine', 'ejs');
 
 app.use(cors());
 
@@ -37,7 +38,31 @@ db.access_tokens = new Datastore({ filename: 'db/access_tokens.db', autoload: tr
  |--------------------------------------------------------------------------
 */
 
-app.use('/', github_oauth);
+  app.post('/auth/github', function(req, res) {
+
+    var accessTokenUrl = 'https://github.com/login/oauth/access_token';
+
+    var params = {
+      code: req.body.code,
+      client_id: req.body.clientId,
+      client_secret: '3c69fde2d90e34e6ccc7eafd5920bf51d0f540e0',
+      redirect_uri: req.body.redirectUri
+    };
+
+    // Exchange authorization code for access token.
+    request.post({ url: accessTokenUrl, qs: params }, function(err, response, token) {
+
+         token = qs.parse(token);
+         accessToken = token.accessToken;
+
+         res.send({token: token.access_token});
+    });
+  });
+
+
+/*
+ |--------------------------------------------------------------------------
+*/
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
@@ -52,8 +77,7 @@ app.use(function(req, res, next) {
 // will print stacktrace
 if (app.get('env') === 'development') {
   app.use(function(err, req, res, next) {
-    res.status(err.status || 500);
-    res.render('error', {
+    res.status(err.status || 500).send({
       message: err.message,
       error: err
     });
@@ -63,8 +87,7 @@ if (app.get('env') === 'development') {
 // production error handler
 // no stacktraces leaked to user
 app.use(function(err, req, res, next) {
-  res.status(err.status || 500);
-  res.render('error', {
+  res.status(err.status || 500).send({
     message: err.message,
     error: {}
   });
diff --git a/server/routes/github_oauth.js b/server/routes/github_oauth.js
deleted file mode 100644
index ae5813d..0000000
--- a/server/routes/github_oauth.js
+++ /dev/null
@@ -1,37 +0,0 @@
-var express = require('express');
-var http = require("http");
-var router = express.Router();
-var bodyParser = require('body-parser');
-var parseUrlencoded = bodyParser.urlencoded({ extended: false });
-var request = require('request');
-var qs = require('querystring');
-
-/*
- |--------------------------------------------------------------------------
- | Login with GitHub
- |--------------------------------------------------------------------------
-*/
-
-router.route('/auth/github')
-	.post(function(req, res) {
-
-	  var accessTokenUrl = 'https://github.com/login/oauth/access_token';
-
-	  var params = {
-	    code: req.body.code,
-	    client_id: req.body.clientId,
-	    client_secret: '3c69fde2d90e34e6ccc7eafd5920bf51d0f540e0',
-	    redirect_uri: req.body.redirectUri
-	  };
-
-	  // Exchange authorization code for access token.
-	  request.post({ url: accessTokenUrl, qs: params }, function(err, response, token) {
-
-	  	   token = qs.parse(token);
-	  	   accessToken = token.accessToken;
-
-	       res.send({token: token.access_token});
-	  });
-	});
-
-module.exports = router;
\ No newline at end of file
diff --git a/server/views/error.ejs b/server/views/error.ejs
deleted file mode 100644
index 7cf94ed..0000000
--- a/server/views/error.ejs
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1><%= message %></h1>
-<h2><%= error.status %></h2>
-<pre><%= error.stack %></pre>