Prechádzať zdrojové kódy

When logging in, logging out, or registering, user is redirected to previous page

theflametrooper 8 rokov pred
rodič
commit
5650708e88
2 zmenil súbory, kde vykonal 2 pridanie a 6 odobranie
  1. 1 1
      backend/logic/app.js
  2. 1 5
      frontend/App.vue

+ 1 - 1
backend/logic/app.js

@@ -134,7 +134,7 @@ const lib = {
 							next(true, user._id);
 						});
 					}
-					db.models.user.findOne({username: new RegExp(`^${body.login}$`, 'i')}, (err, user) => {
+					db.models.user.findOne({ username: new RegExp(`^${body.login}$`, 'i' )}, (err, user) => {
 						next(err, user);
 					});
 				},

+ 1 - 5
frontend/App.vue

@@ -48,7 +48,6 @@
 				_this.socket.emit('users.logout', result => {
 					if (result.status === 'success') {
 						document.cookie = 'SID=;expires=Thu, 01 Jan 1970 00:00:01 GMT;';
-						_this.$router.go('/');
 						location.reload();
 					} else Toast.methods.addToast(result.message, 4000);
 				});
@@ -127,12 +126,9 @@
 							date.setTime(new Date().getTime() + (2 * 365 * 24 * 60 * 60 * 1000));
 							let secure = (cookie.secure) ? 'secure=true; ' : '';
 							let domain = '';
-							if (cookie.domain !== 'localhost') {
-								domain = ` domain=${cookie.domain};`;
-							}
+							if (cookie.domain !== 'localhost') domain = ` domain=${cookie.domain};`;
 							document.cookie = `SID=${result.SID}; expires=${date.toGMTString()}; ${domain}${secure}path=/`;
 							Toast.methods.addToast(`You have been successfully logged in`, 2000);
-							_this.$router.go('/');
 							location.reload();
 						});
 					} else Toast.methods.addToast(result.message, 2000);