From 1530dc662974c96f2488e7c6dbf9925e5436a02b Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Tue, 22 Nov 2022 23:41:00 +0100 Subject: [PATCH] webapp: Enforce login for config, firmware and reboot view --- webapp/src/views/ConfigAdminView.vue | 5 ++++- webapp/src/views/FirmwareUpgradeView.vue | 5 ++++- webapp/src/views/MaintenanceRebootView.vue | 6 +++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/webapp/src/views/ConfigAdminView.vue b/webapp/src/views/ConfigAdminView.vue index 7405cbe6..ce132bf2 100644 --- a/webapp/src/views/ConfigAdminView.vue +++ b/webapp/src/views/ConfigAdminView.vue @@ -112,7 +112,7 @@ import { } from 'bootstrap-icons-vue'; import * as bootstrap from 'bootstrap'; import BootstrapAlert from "@/components/BootstrapAlert.vue"; -import { handleResponse, authHeader } from '@/utils/authentication'; +import { handleResponse, authHeader, isLoggedIn } from '@/utils/authentication'; export default defineComponent({ components: { @@ -137,6 +137,9 @@ export default defineComponent({ }; }, mounted() { + if (!isLoggedIn()) { + this.$router.push({ path: "/login", query: { returnUrl: this.$router.currentRoute.value.fullPath } }); + } this.modalFactoryReset = new bootstrap.Modal('#factoryReset'); this.loading = false; }, diff --git a/webapp/src/views/FirmwareUpgradeView.vue b/webapp/src/views/FirmwareUpgradeView.vue index f9a7b42f..aed73036 100644 --- a/webapp/src/views/FirmwareUpgradeView.vue +++ b/webapp/src/views/FirmwareUpgradeView.vue @@ -77,7 +77,7 @@ import { BIconArrowRepeat, BIconCheckCircle } from 'bootstrap-icons-vue'; -import { authHeader } from '@/utils/authentication'; +import { authHeader, isLoggedIn } from '@/utils/authentication'; export default defineComponent({ components: { @@ -184,6 +184,9 @@ export default defineComponent({ }, }, mounted() { + if (!isLoggedIn()) { + this.$router.push({ path: "/login", query: { returnUrl: this.$router.currentRoute.value.fullPath } }); + } this.loading = false; }, }); diff --git a/webapp/src/views/MaintenanceRebootView.vue b/webapp/src/views/MaintenanceRebootView.vue index 5d8d415d..75de8b0d 100644 --- a/webapp/src/views/MaintenanceRebootView.vue +++ b/webapp/src/views/MaintenanceRebootView.vue @@ -47,7 +47,7 @@ import { defineComponent } from 'vue'; import * as bootstrap from 'bootstrap'; import BasePage from '@/components/BasePage.vue'; import BootstrapAlert from "@/components/BootstrapAlert.vue"; -import { handleResponse, authHeader } from '@/utils/authentication'; +import { handleResponse, authHeader, isLoggedIn } from '@/utils/authentication'; export default defineComponent({ components: { @@ -66,6 +66,10 @@ export default defineComponent({ }; }, mounted() { + if (!isLoggedIn()) { + this.$router.push({ path: "/login", query: { returnUrl: this.$router.currentRoute.value.fullPath } }); + } + this.performReboot = new bootstrap.Modal('#performReboot'); }, methods: {