code.iilab.org

config.json

@@ -1,8 +1,8 @@
 {
-  "oauth_client_id": "GITHUB_APPLICATION_CLIENT_ID",
-  "oauth_client_secret": "GITHUB_APPLICATION_CLIENT_SECRET",
-  "oauth_host": "github.com",
+  "oauth_client_id": "",
+  "oauth_client_secret": "",
+  "oauth_host": "https://code.iilab.org",
   "oauth_port": 443,
-  "oauth_path": "/login/oauth/access_token",
+  "oauth_path": "/oauth/token",
   "oauth_method": "POST"
-}
+}

package.json

@@ -7,7 +7,7 @@
     "oauth"
   ],
   "scripts": {
-      "start": "node server.js"
+    "start": "node server.js"
   },
   "repository": {
     "type": "git",
@@ -16,7 +16,8 @@
   "author": "Michael Aufreiter",
   "contributors": [],
   "dependencies": {
-    "express": "~3.16.0"
+    "express": "~3.16.0",
+    "request": "^2.72.0"
   },
   "engines": {
     "node": ">= 0.6.x"

server.js

@@ -1,8 +1,6 @@
 var url     = require('url'),
-    http    = require('http'),
-    https   = require('https'),
     fs      = require('fs'),
-    qs      = require('querystring'),
+    request = require('request'),
     express = require('express'),
     app     = express();
 
@@ -21,39 +19,37 @@ function loadConfig() {
 var config = loadConfig();
 
 function authenticate(code, cb) {
-  var data = qs.stringify({
+  var data = {
     client_id: config.oauth_client_id,
     client_secret: config.oauth_client_secret,
-    code: code
-  });
+    code: code,
+    grant_type: 'authorization_code',
+    redirect_uri: 'http://lieu.io/prose/'
+  };
 
   var reqOptions = {
-    host: config.oauth_host,
-    port: config.oauth_port,
-    path: config.oauth_path,
-    method: config.oauth_method,
-    headers: { 'content-length': data.length }
+    url: config.oauth_host + config.oauth_path,
+    qs: data
   };
 
-  var body = "";
-  var req = https.request(reqOptions, function(res) {
-    res.setEncoding('utf8');
-    res.on('data', function (chunk) { body += chunk; });
-    res.on('end', function() {
-      cb(null, qs.parse(body).access_token);
-    });
-  });
 
-  req.write(data);
-  req.end();
-  req.on('error', function(e) { cb(e.message); });
+  request.post(reqOptions, function (error, res, body) {
+    if (error) { cb(e.message); }
+    try {
+      body = JSON.parse(body);
+    }
+    catch (e) {
+      cb(e.message);
+    }
+    cb(null, body.access_token);
+  });
 }
 
 
 // Convenience for allowing CORS on routes - GET only
 app.all('*', function (req, res, next) {
-  res.header('Access-Control-Allow-Origin', '*'); 
-  res.header('Access-Control-Allow-Methods', 'GET, OPTIONS'); 
+  res.header('Access-Control-Allow-Origin', '*');
+  res.header('Access-Control-Allow-Methods', 'GET, OPTIONS');
   res.header('Access-Control-Allow-Headers', 'Content-Type');
   next();
 });
@@ -64,6 +60,9 @@ app.get('/authenticate/:code', function(req, res) {
   authenticate(req.params.code, function(err, token) {
     var result = err || !token ? {"error": "bad_code"} : { "token": token };
     console.log(result);
+    if (err) {
+      console.log(err);
+    }
     res.json(result);
   });
 });