Skip to content

Commit

Permalink
Merge files in app.js
Browse files Browse the repository at this point in the history
  • Loading branch information
supertinou committed Jun 16, 2016
1 parent e132efa commit 9cf613b
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 49 deletions.
3 changes: 2 additions & 1 deletion server/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
/.tmp
/.sass-cache
/bower_components
/db
/db
/npm-debug.log
39 changes: 31 additions & 8 deletions server/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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());

Expand All @@ -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) {
Expand All @@ -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
});
Expand All @@ -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: {}
});
Expand Down
37 changes: 0 additions & 37 deletions server/routes/github_oauth.js

This file was deleted.

3 changes: 0 additions & 3 deletions server/views/error.ejs

This file was deleted.

0 comments on commit 9cf613b

Please sign in to comment.