Merge branch 'master' into inputForm

Author: Steven-Nagie

controllers/endPointCtrl.js

@@ -0,0 +1,13 @@
+const app = require('../server');
+const db = app.get('db');
+const testCtrl = require('./testCtrl');
+
+module.exports = {
+    testScript: (req, res, next) => {
+        let script = req.body;
+        console.log(script);
+        let results = testCtrl.firstTest(script);
+        console.log(results);
+        res.json(results);
+     }
+}

controllers/testCtrl.js

@@ -7,17 +7,27 @@
 
 const exec = require('child_process').exec;
 
-let script = `let addTwo = (x) => {return x+2};`;
-let test = `Test.assertEquals(addTwo(2), 4);`;
+// let script = `let addTwo = (x) => {return x+2};`;
+let test = `Test.assertEquals(addTwo(2), 4)`;
+
 
 
 // This is where wer run a script.. I have verified that so long as we get it in string format we run unit tests
-exec(`docker run --rm codewars/node-runner run -l javascript -c "${script}" -t cw -f "${test}"`,
+// exec(`docker run --rm codewars/node-runner run -l javascript -c "${script}" -t cw -f "${test}"`,
+// 	(err, stdout, stderr) => {
+// 		if (err) console.log('err', err);
+// 		console.log(typeof stdout);
+// 		console.log('stdout', stdout);
+// 		console.log('stderr', stderr);
+// 	});
+
+module.exports = {
+	firstTest: (script) => {
+		exec(`docker run --rm codewars/node-runner run -l javascript -c "${script}" -t cw -f "${test}"`,
 	(err, stdout, stderr) => {
 		if (err) console.log('err', err);
-		console.log(typeof stdout);
-		console.log('stdout', stdout);
-		console.log('stderr', stderr);
+		if (stdout) return stdout;
+		if (stderr) return stderr;
 	});
-
-
+	} 
+}

package.json

@@ -32,6 +32,8 @@
     "gulp-sass": "^3.0.0",
     "gulp-sourcemaps": "^1.9.1",
     "gulp-uglify": "^2.0.0",
-    "massive": "^2.5.0"
+    "massive": "^2.5.0",
+    "passport": "^0.3.2",
+    "passport-github2": "^0.1.10"
   }
 }

server.js

@@ -4,26 +4,68 @@ const session = require('express-session');
 const cors = require('cors');
 const config = require('./config.js');
 const massive = require('massive');
+const passport = require('passport');
+const GithubStrategy = require('passport-github2').Strategy;
 const connectionString = config.connectionString;
 
+passport.serializeUser((user, done) => {
+  done(null, user);
+});
+
+passport.deserializeUser((obj, done)  => {
+  done(null, obj);
+});
+
+passport.use(new GithubStrategy({
+  clientID: config.githubId,
+  clientSecret: config.githubSecret,
+  callbackURL: '/auth/github/callback'
+}, (accessToken, refreshToken, profile, done) => {
+  // code goes here
+    // go to database and look for profile.id
+    // create user using profile.id
+    return done(null/*error*/, profile/*info that goes on session*/);
+}));
+
+
 const app = module.exports = express();
 
+
 const massiveInstance = massive.connectSync({connectionString : connectionString});
 
 app.use(express.static(__dirname + '/dist'));
 app.use(bodyParser.json());
 app.use(cors());
 
-app.set('db', massiveInstance);
-
-let db = app.get('db');
 
 app.use(session({
   secret: config.sessionSecret,
   saveUninitialized: false,
   resave: false
 }));
 
-app.listen(config.port, () => {
-  console.log('listening to port', config.port);
+
+app.use(passport.initialize());
+app.use(passport.session());
+
+app.set('db', massiveInstance);
+const db = app.get('db');
+const endPointCtrl = require('./controllers/endPointCtrl');
+
+app.get('/auth/github', passport.authenticate('github'));
+
+app.get('/auth/github/callback', 
+  passport.authenticate('github', { failureRedirect: '/login' }),
+  function(req, res) {
+    // Successful authentication, redirect home.
+    res.redirect('/');
+  });
+
+app.post('/solution', endPointCtrl.testScript);
+
+
+app.listen(config.port, function() {
+  console.log(`listening on port ${this.address().port}`);
+
+
 });