From 6c0837deaeb2dd7d2ff7b05de1c79413f71d849b Mon Sep 17 00:00:00 2001
From: James Lyne <jim+github@not-null.co.uk>
Date: Thu, 30 Sep 2021 20:13:23 +0100
Subject: [PATCH] Improve session expiry handling

- Reload configuration and show login dialog when any request fails with "login required"
- Current map position etc is lost, more work needed here
---
 src/components/login/LoginForm.vue | 22 +++++++++++++---------
 src/providers/DynmapMapProvider.ts | 21 ++++++++++++++-------
 src/store/mutations.ts             |  4 ++++
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/components/login/LoginForm.vue b/src/components/login/LoginForm.vue
index 31105f8..a326e6d 100644
--- a/src/components/login/LoginForm.vue
+++ b/src/components/login/LoginForm.vue
@@ -39,9 +39,9 @@
 </template>
 
 <script lang="ts">
-import {defineComponent} from "@vue/runtime-core";
+import {defineComponent, onMounted} from "@vue/runtime-core";
 import {useStore} from "@/store";
-import {computed, ref, watch} from "vue";
+import {computed, nextTick, ref, watchEffect} from "vue";
 import {ActionTypes} from "@/store/action-types";
 import {MutationTypes} from "@/store/mutation-types";
 import {notify} from "@kyvg/vue3-notification";
@@ -68,13 +68,17 @@ export default defineComponent({
 			invalid = ref(false),
 			error = ref(null);
 
-		watch(loginModalVisible, (newValue) => {
-			if(newValue) {
-				requestAnimationFrame(() => usernameField.value!.focus());
-			} else {
-				loginUsername.value = '';
-				loginPassword.value = '';
-			}
+		onMounted(() => {
+			watchEffect(async () => {
+				await nextTick();
+
+				if(loginModalVisible.value) {
+					usernameField.value!.focus();
+				} else {
+					loginUsername.value = '';
+					loginPassword.value = '';
+				}
+			});
 		});
 
 		const login = async () => {
diff --git a/src/providers/DynmapMapProvider.ts b/src/providers/DynmapMapProvider.ts
index 29ccb1c..e24c994 100644
--- a/src/providers/DynmapMapProvider.ts
+++ b/src/providers/DynmapMapProvider.ts
@@ -59,7 +59,7 @@ export default class DynmapMapProvider extends MapProvider {
 
 		this.markersAbort = new AbortController();
 
-		const response = await DynmapMapProvider.getJSON(url, this.markersAbort.signal);
+		const response = await this.getJSON(url, this.markersAbort.signal);
 		const sets: Map<string, LiveAtlasMarkerSet> = new Map();
 
 		response.sets = response.sets || {};
@@ -94,11 +94,7 @@ export default class DynmapMapProvider extends MapProvider {
 
 		this.configurationAbort = new AbortController();
 
-		const response = await DynmapMapProvider.getJSON(this.config.dynmap!.configuration, this.configurationAbort.signal);
-
-		if(response.error === 'login-required') {
-			this.store.commit(MutationTypes.SET_LOGIN_REQUIRED, true);
-		}
+		const response = await this.getJSON(this.config.dynmap!.configuration, this.configurationAbort.signal);
 
 		if (response.error) {
 			throw new Error(response.error);
@@ -134,7 +130,7 @@ export default class DynmapMapProvider extends MapProvider {
 
 		this.updateAbort = new AbortController();
 
-		const response = await DynmapMapProvider.getJSON(url, this.updateAbort.signal);
+		const response = await this.getJSON(url, this.updateAbort.signal);
 		const players: Set<LiveAtlasPlayer> = new Set(),
 			updates = buildUpdates(response.updates || [], this.updateTimestamp),
 			worldState = {
@@ -389,4 +385,15 @@ export default class DynmapMapProvider extends MapProvider {
 			this.markersAbort.abort();
 		}
 	}
+
+	protected async getJSON(url: string, signal: AbortSignal) {
+		return MapProvider.fetchJSON(url, {signal, credentials: 'include'}).then(response => {
+			if(response.error === 'login-required') {
+				this.store.commit(MutationTypes.SET_LOGIN_REQUIRED, true);
+				throw new Error("Login required");
+			}
+
+			return response;
+		});
+	}
 }
diff --git a/src/store/mutations.ts b/src/store/mutations.ts
index 3bed1dd..925dda7 100644
--- a/src/store/mutations.ts
+++ b/src/store/mutations.ts
@@ -616,6 +616,10 @@ export const mutations: MutationTree<State> & Mutations = {
 	},
 
 	[MutationTypes.SET_LOGIN_REQUIRED](state: State, payload: boolean): void {
+		if(payload) {
+			state.loggedIn = false;
+		}
+
 		state.loginRequired = payload;
 	},