Got exec commands to return results paired with the exact test.

Author: Joshua Baert

db/create/new_user_from_github.sql

@@ -0,0 +1,2 @@
+INSERT INTO users (github_id, first_name, last_name, email, username, picutre_url)
+VALUES ($1, null, null, $2, $3, $4);

db/read/user_by_github_id.sql

@@ -0,0 +1,2 @@
+select * from users
+where github_id = $1;

db/start/tables.sql

@@ -37,7 +37,7 @@ CREATE TABLE ratings (
 );
 
 INSERT INTO users (github_id, first_name, last_name, email, username, picutre_url)
-VALUES (null, 'bob', 'smith', 'bob@smith.com', 'bobIScool', null);
+VALUES ('12', 'bob', 'smith', 'bob@smith.com', 'bobIScool', null);
 
 INSERT INTO katas (kyu, description, starter_code, name, examples, test_script)
 VALUES (8, 'var a should equal 1', 'var a = 1', 'Sumbit This', '[{"test":"Test.assertEquals(a, 1)","result":""}]', '[{"test":"Test.assertEquals(a, 0)","result":""},{"test":"Test.assertEquals(a, 2)","result":""},{"test":"Test.assertEquals(a, 1)","result":""}]');

server.js

@@ -22,10 +22,35 @@ passport.use(new GithubStrategy({
 	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, profile);
+	db.read.user_by_github_id([profile.id], (err, user) => {
+		console.log(user);
+		if (err) {
+			console.log(err);
+		} else if (user [0]) {
+			done(null, user);
+		} else {
+			console.log('attempting account creation')
+			db.create.new_user_from_github([profile.id, profile._json.email, profile.displayName, profile._json.avatar_url],
+				(err) => {
+					if (err) {
+						console.log(err);
+					}	else {
+						db.read.user_by_github_id([profile.id], (err, newUser) => {
+							if(err) {
+								console.log(err);
+							} else {
+								console.log(newUser);
+								done(null, newUser[0])
+							}
+						});
+					}
+				})
+		}
+		
+	});
+
+
+//	return done(null, profile);
 }));
 
 
@@ -57,7 +82,7 @@ app.use(passport.session());
 
 
 
-app.get('/auth/github', passport.authenticate('github'));
+app.get('/auth/github', passport.authenticate('github', {scope: ['user:email', 'user']}));
 
 app.get('/auth/github/callback',
 	passport.authenticate('github', {failureRedirect: '/login'}),
@@ -81,7 +106,6 @@ app.post('/solution/:kataId', kataCtrl.postSolution);
 
 
 
-
 app.listen(config.port, function () {
 	console.log(`listening on port ${this.address().port}`);
 

src/login.html

@@ -12,7 +12,7 @@
         <p class='font16-reg logo-font logo'>clonewars</p><br><br>
       </div>
       <div>
-        <a href='http://www.github.com' style=>
+        <a href='/auth/github' style=>
           <div class='button font12-reg'>
             <div>
               <!--<img src='../src/assets/imgs/ST.png' class='button-icon'>-->