Fixed syntax for Kris's GitHub Auth code

backend/logic/app.js

@@ -36,105 +36,94 @@ const lib = {
 		app.options('*', cors(corsOptions));
 
 		let oauth2 = new OAuth2(
-			config.get("apis.github.client"),
-			config.get("apis.github.secret"),
+			config.get('apis.github.client'),
+			config.get('apis.github.secret'),
 			'https://github.com/',
 			'login/oauth/authorize',
 			'login/oauth/access_token',
 			null
 		);
 
-		let redirect_uri = config.get("serverDomain") + "/auth/github/authorize/callback";
+		let redirect_uri = config.get('serverDomain') + '/auth/github/authorize/callback';
 
 		app.get('/auth/github/authorize', (req, res) => {
 			let params = [
-				`client_id=${config.get("apis.github.client")}`,
-				`redirect_uri=http://localhost/auth/github/authorize/callback`,
+				`client_id=${config.get('apis.github.client')}`,
+				`redirect_uri=${config.get('serverDomain')}/auth/github/authorize/callback`,
 				`scope=user:email`
 			].join('&');
 			res.redirect(`https://github.com/login/oauth/authorize?${params}`);
 		});
 
+		function redirectOnErr (req, res, next) {
+			return res.redirect('http://' + config.get('domain') + '/?err=' + encodeURIComponent('err'));
+		}
+
 		app.get('/auth/github/authorize/callback', (req, res) => {
 			let code = req.query.code;
-			oauth2.getOAuthAccessToken(code, {'redirect_uri': redirect_uri}, (error, access_token, refresh_token, results) => {
-				if (!error) {
-					request.get({
+			oauth2.getOAuthAccessToken(code, { redirect_uri }, (err, access_token, refresh_token, results) => {
+				if (!err) request.get({
 						url: `https://api.github.com/user?access_token=${access_token}`,
-						headers: {'User-Agent': 'request'}
-					}, (error, httpResponse, body) => {
-						if (error) return res.redirect(`http://localhost:8080/?err=${encodeURIComponent("Something went wrong while logging in1.")}`);
+						headers: { 'User-Agent': 'request' }
+					}, (err, httpResponse, body) => {
+						if (err) return redirectOnErr('err');
 						body = JSON.parse(body);
-						db.models.user.findOne({"services.github.id": body.id}, (err, user) => {
-							if (err) return res.redirect(`http://localhost:8080/?err=${encodeURIComponent("Something went wrong while logging in2.")}`);
+						db.models.user.findOne({'services.github.id': body.id}, (err, user) => {
+							if (err) return redirectOnErr('err');
 							if (user) {
 								user.services.github.access_token = access_token;
-								user.save((err) => {
-									if (err) return res.redirect(`http://localhost:8080/?err=${encodeURIComponent("Something went wrong while logging in3.")}`);
+								user.save(err => {
+									if (err) return redirectOnErr('err');
 									let userSessionId = utils.guid();
-									cache.hset('userSessions', userSessionId, cache.schemas.userSession(user._id), (err) => {
-										if (err) return res.redirect(`http://localhost:8080/?err=${encodeURIComponent("Something went wrong while logging in3.")}`);
-										res.cookie("SID", userSessionId);
-										res.redirect(`http://localhost:8080/`);
+									cache.hset('userSessions', utils.guid(), cache.schemas.userSession(user._id), err => {
+										if (err) return redirectOnErr('err');
+										res.cookie('SID', utils.guid());
+										res.redirect(`http://${config.get('domain')}/`);
 									});
 								});
 							} else {
-								db.models.user.findOne({username: new RegExp(`^${body.login}$`, 'i')}, (err, user) => {
-									if (err) return res.redirect(`http://localhost:8080/?err=${encodeURIComponent("Something went wrong while logging in4.")}`);
-									if (user) {
-										res.redirect(`http://localhost:8080/?err=${encodeURIComponent("Something went wrong while logging in5.")}`);
-									} else {
-										request.get({
-											url: `https://api.github.com/user/emails?access_token=${access_token}`,
-											headers: {'User-Agent': 'request'}
-										}, (error, httpResponse, body2) => {
-											if (error) return res.redirect(`http://localhost:8080/?err=${encodeURIComponent("Something went wrong while logging in6.")}`);
-											body2 = JSON.parse(body2);
-											let primaryEmail;
-											body2.forEach((email) => {
-												if (email.primary) {
-													primaryEmail = email.email.toLowerCase();
-												}
-											});
-											db.models.user.findOne({"email.address": primaryEmail}, (err, user) => {
-												if (err) return res.redirect(`http://localhost:8080/?err=${encodeURIComponent("Something went wrong while logging in7.")}`);
-												if (user) {
-													if (err) return res.redirect(`http://localhost:8080/?err=${encodeURIComponent("Something went wrong while logging in8.")}`);
-												} else {
-													db.models.user.create({
-														username: body.login,
-														email: {
-															address: primaryEmail,
-															verificationToken: utils.generateRandomString(64)
-														},
-														services: {
-															github: {
-																id: body.id,
-																access_token: access_token
-															}
-														}
-													}, (err, user) => {
-														if (err) return res.redirect(`http://localhost:8080/?err=${encodeURIComponent("Something went wrong while logging in9.")}`);
-														//TODO Send verification email
-														let userSessionId = utils.guid();
-														cache.hset('userSessions', userSessionId, cache.schemas.userSession(user._id), (err) => {
-															if (err) return res.redirect(`http://localhost:8080/?err=${encodeURIComponent("Something went wrong while logging in3.")}`);
-															res.cookie("SID", userSessionId);
-															res.redirect(`http://localhost:8080/`);
-														});
-													});
+								db.models.user.findOne({ username: new RegExp(`^${body.login}$`, 'i') }, (err, user) => {
+									if (err) return redirectOnErr('err');
+									if (user) return redirectOnErr('err');
+									else request.get({
+										url: `https://api.github.com/user/emails?access_token=${access_token}`,
+										headers: {'User-Agent': 'request'}
+									}, (err, httpResponse, res) => {
+										if (err) return redirectOnErr('err');
+										res = JSON.parse(res);
+										let address;
+										res.forEach(email => {
+											if (email.primary) address = email.email.toLowerCase();
+										});
+										db.models.user.findOne({ 'email.address': address }, (err, user) => {
+											if (err) return redirectOnErr('err');
+											if (user) return redirectOnErr('err');
+											else db.models.user.create({
+												username: body.login,
+												email: {
+													address,
+													verificationToken: utils.generateRandomString(64)
+												},
+												services: {
+													github: { id: body.id, access_token }
 												}
+											}, (err, user) => {
+												if (err) return redirectOnErr('err');
+												//TODO Send verification email
+												let userSessionId = utils.guid();
+												cache.hset('userSessions', userSessionId, cache.schemas.userSession(user._id), err => {
+													if (err) return redirectOnErr('err');
+													res.cookie('SID', userSessionId);
+													res.redirect(`http://${config.get('domain')}/`);
+												});
 											});
 										});
-									}
+									});
 								});
 							}
 						});
 					});
-
-				} else {
-					res.redirect(`http://localhost:8080/?err=${encodeURIComponent("Something went wrong while logging in2.")}`);
-				}
+				else return redirectOnErr('err');
 			});
 		});
 

frontend/App.vue

@@ -3,8 +3,8 @@
 		<router-view></router-view>
 		<toast></toast>
 		<what-is-new></what-is-new>
-		<login-modal v-if="isLoginActive"></login-modal>
-		<register-modal v-if="isRegisterActive"></register-modal>
+		<login-modal v-if='isLoginActive'></login-modal>
+		<register-modal v-if='isRegisterActive'></register-modal>
 	</div>
 </template>
 
@@ -21,13 +21,13 @@
 		data() {
 			return {
 				register: {
-					email: "",
-					username: "",
-					password: ""
+					email: '',
+					username: '',
+					password: ''
 				},
 				login: {
-					email: "",
-					password: ""
+					email: '',
+					password: ''
 				},
 				loggedIn: false,
 				role: '',
@@ -39,20 +39,15 @@
 		},
 		methods: {
 			logout: function () {
-				this.socket.emit('users.logout', (result) => {
+				this.socket.emit('users.logout', result => {
 					if (result.status === 'success') {
 						document.cookie = 'SID=;expires=Thu, 01 Jan 1970 00:00:01 GMT;';
 						location.reload();
-					} else {
-						Toast.methods.addToast(result.message, 4000);
-					}
+					} else Toast.methods.addToast(result.message, 4000);
 				});
 			},
-			'submitOnEnter': function(cb, event){
-				if (event.which == 13) {
-					cb();
-					return false;
-				}
+			'submitOnEnter': (cb, event) => {
+				if (event.which == 13) b(); return false;
 			},
 		},
 		ready() {
@@ -63,7 +58,7 @@
 				_this.role = role;
 				_this.username = username;
 			});
-			lofig.get("serverDomain", (res) => {
+			lofig.get('serverDomain', res => {
 				_this.serverDomain = res;
 			});
 		},

frontend/components/Modals/Login.vue

@@ -1,24 +1,25 @@
 <template>
-	<div class="modal is-active">
-		<div class="modal-background"></div>
-		<div class="modal-card">
-			<header class="modal-card-head">
-				<p class="modal-card-title">Login</p>
-				<button class="delete" @click="toggleModal()"></button>
+	<div class='modal is-active'>
+		<div class='modal-background'></div>
+		<div class='modal-card'>
+			<header class='modal-card-head'>
+				<p class='modal-card-title'>Login</p>
+				<button class='delete' @click='toggleModal()'></button>
 			</header>
-			<section class="modal-card-body">
+			<section class='modal-card-body'>
 				<!-- validation to check if exists http://bulma.io/documentation/elements/form/ -->
-				<label class="label">Email</label>
-				<p class="control">
-					<input class="input" type="text" placeholder="Email..." v-model="$parent.login.email">
+				<label class='label'>Email</label>
+				<p class='control'>
+					<input class='input' type='text' placeholder='Email...' v-model='$parent.login.email'>
 				</p>
-				<label class="label">Password</label>
-				<p class="control">
-					<input class="input" type="password" placeholder="Password..." v-model="$parent.login.password" v-on:keypress="$parent.submitOnEnter(submitModal, $event)">
+				<label class='label'>Password</label>
+				<p class='control'>
+					<input class='input' type='password' placeholder='Password...' v-model='$parent.login.password' v-on:keypress='$parent.submitOnEnter(submitModal, $event)'>
 				</p>
 			</section>
-			<footer class="modal-card-foot">
-				<a class="button is-primary" @click="submitModal('login')">Submit</a><a class="button is-primary" v-bind:href="$parent.serverDomain + '/auth/github/authorize'">Log in in GitHub</a>
+			<footer class='modal-card-foot'>
+				<a class='button is-primary' @click='submitModal("login")'>Submit</a>
+				<a class='button is-primary' :href='$parent.serverDomain + "/auth/github/authorize"'>Log in in GitHub</a>
 			</footer>
 		</div>
 	</div>

frontend/components/Modals/Register.vue

@@ -1,29 +1,30 @@
 <template>
-	<div class="modal is-active">
-		<div class="modal-background"></div>
-		<div class="modal-card">
-			<header class="modal-card-head">
-				<p class="modal-card-title">Register</p>
-				<button class="delete" @click="toggleModal()"></button>
+	<div class='modal is-active'>
+		<div class='modal-background'></div>
+		<div class='modal-card'>
+			<header class='modal-card-head'>
+				<p class='modal-card-title'>Register</p>
+				<button class='delete' @click='toggleModal()'></button>
 			</header>
-			<section class="modal-card-body">
+			<section class='modal-card-body'>
 				<!-- validation to check if exists http://bulma.io/documentation/elements/form/ -->
-				<label class="label">Email</label>
-				<p class="control">
-					<input class="input" type="text" placeholder="Email..." v-model="$parent.register.email">
+				<label class='label'>Email</label>
+				<p class='control'>
+					<input class='input' type='text' placeholder='Email...' v-model='$parent.register.email'>
 				</p>
-				<label class="label">Username</label>
-				<p class="control">
-					<input class="input" type="text" placeholder="Username..." v-model="$parent.register.username">
+				<label class='label'>Username</label>
+				<p class='control'>
+					<input class='input' type='text' placeholder='Username...' v-model='$parent.register.username'>
 				</p>
-				<label class="label">Password</label>
-				<p class="control">
-					<input class="input" type="password" placeholder="Password..." v-model="$parent.register.password" v-on:keypress="$parent.submitOnEnter(submitModal, $event)">
+				<label class='label'>Password</label>
+				<p class='control'>
+					<input class='input' type='password' placeholder='Password...' v-model='$parent.register.password' v-on:keypress='$parent.submitOnEnter(submitModal, $event)'>
 				</p>
-				<div class="g-recaptcha" :data-sitekey="recaptcha.key"></div>
+				<div class='g-recaptcha' :data-sitekey='recaptcha.key'></div>
 			</section>
-			<footer class="modal-card-foot">
-				<a class="button is-primary" @click="submitModal()">Submit</a><a class="button is-primary" v-bind:href="$parent.serverDomain + '/auth/github/authorize'">Register in GitHub</a>
+			<footer class='modal-card-foot'>
+				<a class='button is-primary' @click='submitModal()'>Submit</a>
+				<a class='button is-primary' :href='$parent.serverDomain + "/auth/github/authorize"'>Register in GitHub</a>
 			</footer>
 		</div>
 	</div>