Fix conflicts

package.json

@@ -17,7 +17,8 @@
 		"seed": "yarn knex seed:run",
 		"api": "node src/api/structures/Server",
 		"site": "cross-env NODE_ENV=production nuxt start",
-		"update": "git pull && yarn install && yarn migrate && yarn build"
+		"update": "git pull && yarn install && yarn migrate && yarn build && yarn restart",
+		"restart": "pm2 restart lolisafe-api && pm2 restart lolisafe-website"
 	},
 	"repository": {
 		"type": "git",

src/api/database/seeds/initial.js

@@ -11,9 +11,7 @@ exports.seed = async db => {
 		await db.table('users').insert({
 			username: process.env.ADMIN_ACCOUNT,
 			password: hash,
-			apiKey: randomstring.generate(64),
 			passwordEditedAt: now,
-			apiKeyEditedAt: now,
 			createdAt: now,
 			editedAt: now,
 			enabled: true,

src/api/routes/auth/registerPOST.js

@@ -1,7 +1,6 @@
 const Route = require('../../structures/Route');
 const log = require('../../utils/Log');
 const bcrypt = require('bcrypt');
-const randomstring = require('randomstring');
 const moment = require('moment');
 
 class registerPOST extends Route {
@@ -48,8 +47,6 @@ class registerPOST extends Route {
 			username,
 			password: hash,
 			passwordEditedAt: now,
-			apiKey: randomstring.generate(64),
-			apiKeyEditedAt: now,
 			createdAt: now,
 			editedAt: now,
 			enabled: true,

src/api/structures/Route.js

@@ -28,8 +28,8 @@ class Route {
 	authorize(req, res) {
 		if (this.options.bypassAuth) return this.run(req, res, db);
 		if (req.headers.apiKey) return this.authorizeApiKey(req, res, req.headers.apiKey);
-
 		if (!req.headers.authorization) return res.status(401).json({ message: 'No authorization header provided' });
+
 		const token = req.headers.authorization.split(' ')[1];
 		if (!token) return res.status(401).json({ message: 'No authorization header provided' });
 

src/site/pages/dashboard/account.vue

@@ -132,7 +132,8 @@ export default {
 		},
 		promptNewAPIKey() {
 			this.$dialog.confirm({
-				message: 'Are you sure you want to regenerate your API key?',
+				type: 'is-danger',
+				message: 'Are you sure you want to regenerate your API key? Previously generated API keys will stop working. Make sure to write the new key down as this is the only time it will be displayed to you.',
 				onConfirm: () => this.requestNewAPIKey()
 			});
 		},

src/site/pages/login.vue

@@ -109,7 +109,9 @@ export default {
 					password: this.password
 				});
 				this.$axios.setToken(data.token, 'Bearer');
+				document.cookie = `token=${encodeURIComponent(data.token)}`;
 				this.$store.dispatch('login', { token: data.token, user: data.user });
+
 				this.redirect();
 			} catch (error) {
 				this.$onPromiseError(error);

src/site/store/index.js

@@ -54,6 +54,7 @@ export const actions = {
 		if (req.headers.cookie) {
 			try {
 				token = cookieparser.parse(req.headers.cookie).token;
+				console.log(token);
 				commit('loggedIn', true);
 				commit('token', token);