From 8ca6784eec8d8f1e4a9c4f6875704f09aae1103a Mon Sep 17 00:00:00 2001
From: Pitu <7425261+Pitu@users.noreply.github.com>
Date: Tue, 18 Sep 2018 03:52:49 -0300
Subject: Better error handling on invalid links

---
 src/api/routes/albums/albumGET.js |  4 ++--
 src/site/views/PublicAlbum.vue    | 35 ++++++++++++++++++++++++++++-------
 2 files changed, 30 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/api/routes/albums/albumGET.js b/src/api/routes/albums/albumGET.js
index b63811c..f5e339f 100644
--- a/src/api/routes/albums/albumGET.js
+++ b/src/api/routes/albums/albumGET.js
@@ -16,13 +16,13 @@ class albumGET extends Route {
 			Make sure it exists and it's enabled
 		*/
 		const link = await db.table('links').where({ identifier, enabled: true }).first();
-		if (!link) return res.status(400).json({ message: 'The identifier supplied could not be found' });
+		if (!link) return res.status(404).json({ message: 'The identifier supplied could not be found' });
 
 		/*
 			Same with the album, just to make sure is not a deleted album and a leftover link
 		*/
 		const album = await db.table('albums').where('id', link.albumId).first();
-		if (!album) return res.status(400).json({ message: 'Album not found' });
+		if (!album) return res.status(404).json({ message: 'Album not found' });
 
 		/*
 			Grab the files in a very unoptimized way. (This should be a join between both tables)
diff --git a/src/site/views/PublicAlbum.vue b/src/site/views/PublicAlbum.vue
index e156698..f242957 100644
--- a/src/site/views/PublicAlbum.vue
+++ b/src/site/views/PublicAlbum.vue
@@ -19,7 +19,7 @@
 
 <template>
 	<section class="hero is-fullheight">
-		<template v-if="files.length">
+		<template v-if="files && files.length">
 			<div class="hero-body align-top">
 				<div class="container">
 					<h1 class="title">{{ name }}</h1>
@@ -67,6 +67,23 @@ export default {
 				downloadLink
 			};
 		} catch (error) {
+			return {
+				name: null,
+				downloadEnabled: false,
+				files: [],
+				downloadLink: null,
+				error: error.response.status
+			};
+			/*
+			if (error.response.status === 404) {
+
+				setTimeout(() => this.$router.push('/404'), 3000);
+			} else {
+				console.error(error);
+			}
+			return {};
+			*/
+			/*
 			console.error(error);
 			return {
 				name: null,
@@ -74,6 +91,7 @@ export default {
 				files: [],
 				downloadLink: null
 			};
+			*/
 		}
 	},
 	data() {
@@ -99,17 +117,20 @@ export default {
 		};
 	},
 	mounted() {
+		if (this.error) {
+			if (this.error === 404) {
+				this.$toast.open('Album not found', true, 3000);
+				setTimeout(() => this.$router.push('/404'), 3000);
+				return;
+			} else {
+				this.$toast.open(`Error code ${this.error}`, true, 3000);
+			}
+		}
 		this.$ga.page({
 			page: `/a/${this.$route.params.identifier}`,
 			title: `Album | ${this.name}`,
 			location: window.location.href
 		});
-	},
-	methods: {
-		async downloadAlbum() {
-			const response = await axios.get(`${config.baseURL}/album/${this.$route.params.identifier}/zip`);
-			console.log(response.data);
-		}
 	}
 };
 </script>
-- 
cgit v1.2.3