Forráskód Böngészése

Minor improvements with auth

theflametrooper 8 éve
szülő
commit
470d63ccd0

+ 0 - 7
backend/logic/actions/users.js

@@ -75,7 +75,6 @@ module.exports = {
 			// check if the response from Google recaptcha is successful
 			// if it is, we check if a user with the requested username already exists
 			(response, body, next) => {
-				console.log(456);
 				let json = JSON.parse(body);
 				console.log(json);
 				//if (json.success !== true) return next('Response from recaptcha was not successful');
@@ -85,7 +84,6 @@ module.exports = {
 			// if the user already exists, respond with that
 			// otherwise check if a user with the requested email already exists
 			(user, next) => {
-				console.log(234);
 				if (user) return next(true, { status: 'failure', message: 'A user with that username already exists' });
 				db.models.user.findOne({ 'email.address': email }, next);
 			},
@@ -93,20 +91,17 @@ module.exports = {
 			// if the user already exists, respond with that
 			// otherwise, generate a salt to use with hashing the new users password
 			(user, next) => {
-				console.log(853);
 				if (user) return next(true, { status: 'failure', message: 'A user with that email already exists' });
 				bcrypt.genSalt(10, next);
 			},
 
 			// hash the password
 			(salt, next) => {
-				console.log(4682);
 				bcrypt.hash(password, salt, next)
 			},
 
 			// save the new user to the database
 			(hash, next) => {
-				console.log(6842);
 				db.models.user.create({
 					username: username,
 					email: {
@@ -123,12 +118,10 @@ module.exports = {
 
 			// respond with the new user
 			(newUser, next) => {
-				console.log(21465);
 				next(null, { status: 'success', user: newUser })
 			}
 
 		], (err, payload) => {
-			console.log(476123123);
 			// log this error somewhere
 			if (err && err !== true) {
 				console.error(err);

+ 4 - 3
frontend/App.vue

@@ -35,7 +35,7 @@
 			}
 		},
 		ready: function () {
-			lofig.get('socket.url', res => {
+			lofig.get('socket.url', function(res) {
 				let socket = this.socket = io(window.location.protocol + '//' + res);
 				socket.on("ready", status => this.loggedIn = status);
 				socket.emit("stations.index", data => {
@@ -50,8 +50,9 @@
 			'register': function () {
 				let { register: { email, username, password } } = this;
 				this.socket.emit('users.register', email, username, password, grecaptcha.getResponse(), (result) => {
-					console.log(result);
-					location.reload();
+					// Need to somehow execute this on Home.vue
+					// Toast.methods.addToast(`User ${username} has been registered`, 2000);
+					setTimeout(location.reload(), 2500);
 				});
 			},
 			'login': function () {

+ 3 - 3
frontend/components/User/Show.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script>
-	//import { Toast } from 'vue-roaster';
+	import { Toast } from 'vue-roaster';
 
 	export default {
 		data() {
@@ -43,7 +43,7 @@
 		methods: {
 			changeRank(newRank) {
 				console.log(rank);
-				//Toast.methods.addToast(`User ${this.$route.params.username} has been promoted to the rank of ${rank}`, 200000);
+				Toast.methods.addToast(`User ${this.$route.params.username} has been promoted to the rank of ${rank}`, 200000);
 			}
 		},
 		ready: function() {
@@ -57,7 +57,7 @@
 				local.requested = local.user.statistics.songsRequested;
 			});
 		},
-		//components: { Toast }
+		components: { Toast }
 	}
 </script>