From f61723dac251c9d85102beae73c6a03df10bd4bf Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 23 Oct 2022 13:12:04 +0200
Subject: [PATCH] fix: redirect with query parameters

---
 src/composables/useRedirectToLastVisited.ts | 26 +++++++++++++++++++++
 src/helpers/saveLastVisited.ts              |  4 ++--
 src/router/index.ts                         |  2 +-
 src/views/user/Login.vue                    | 16 +++----------
 src/views/user/OpenIdAuth.vue               | 17 ++++----------
 5 files changed, 36 insertions(+), 29 deletions(-)
 create mode 100644 src/composables/useRedirectToLastVisited.ts

diff --git a/src/composables/useRedirectToLastVisited.ts b/src/composables/useRedirectToLastVisited.ts
new file mode 100644
index 000000000..838028cb6
--- /dev/null
+++ b/src/composables/useRedirectToLastVisited.ts
@@ -0,0 +1,26 @@
+import {useRouter} from 'vue-router'
+import {getLastVisited, clearLastVisited} from '@/helpers/saveLastVisited'
+
+export function useRedirectToLastVisited() {
+
+	const router = useRouter()
+
+	function redirectIfSaved() {
+		const last = getLastVisited()
+		if (last !== null) {
+			router.push({
+				name: last.name,
+				params: last.params,
+				query: last.query,
+			})
+			clearLastVisited()
+			return
+		}
+
+		router.push({name: 'home'})
+	}
+
+	return {
+		redirectIfSaved,
+	}
+}
\ No newline at end of file
diff --git a/src/helpers/saveLastVisited.ts b/src/helpers/saveLastVisited.ts
index fc731d269..a7043ce93 100644
--- a/src/helpers/saveLastVisited.ts
+++ b/src/helpers/saveLastVisited.ts
@@ -1,7 +1,7 @@
 const LAST_VISITED_KEY = 'lastVisited'
 
-export const saveLastVisited = (name: string, params: object) => {
-	localStorage.setItem(LAST_VISITED_KEY, JSON.stringify({name, params}))
+export const saveLastVisited = (name: string, params: object, query: object) => {
+	localStorage.setItem(LAST_VISITED_KEY, JSON.stringify({name, params, query}))
 }
 
 export const getLastVisited = () => {
diff --git a/src/router/index.ts b/src/router/index.ts
index 2a10fa4b3..d836fc6b4 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -484,7 +484,7 @@ export function getAuthForRoute(route: RouteLocation) {
 		localStorage.getItem('emailConfirmToken') === null &&
 		!(route.name === 'home' && (typeof route.query.userPasswordReset !== 'undefined' || typeof route.query.userEmailConfirm !== 'undefined'))
 	) {
-		saveLastVisited(route.name as string, route.params)
+		saveLastVisited(route.name as string, route.params, route.query)
 		return {name: 'user.login'}
 	}
 	
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 133604848..82714ebee 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -104,7 +104,6 @@
 <script setup lang="ts">
 import {computed, onBeforeMount, ref} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {useRouter} from 'vue-router'
 import {useDebounceFn} from '@vueuse/core'
 
 import Message from '@/components/misc/message.vue'
@@ -112,19 +111,19 @@ import Password from '@/components/input/password.vue'
 
 import {getErrorText} from '@/message'
 import {redirectToProvider} from '@/helpers/redirectToProvider'
-import {getLastVisited, clearLastVisited} from '@/helpers/saveLastVisited'
+import {useRedirectToLastVisited} from '@/composables/useRedirectToLastVisited'
 
 import {useAuthStore} from '@/stores/auth'
 import {useConfigStore} from '@/stores/config'
 
 import {useTitle} from '@/composables/useTitle'
 
-const router = useRouter()
 const {t} = useI18n({useScope: 'global'})
 useTitle(() => t('user.auth.login'))
 
 const authStore = useAuthStore()
 const configStore = useConfigStore()
+const {redirectIfSaved} = useRedirectToLastVisited()
 
 const registrationEnabled = computed(() => configStore.registrationEnabled)
 const localAuthEnabled = computed(() => configStore.auth.local.enabled)
@@ -151,16 +150,7 @@ onBeforeMount(() => {
 
 	// Check if the user is already logged in, if so, redirect them to the homepage
 	if (authenticated.value) {
-		const last = getLastVisited()
-		if (last !== null) {
-			router.push({
-				name: last.name,
-				params: last.params,
-			})
-			clearLastVisited()
-		} else {
-			router.push({name: 'home'})
-		}
+		redirectIfSaved()
 	}
 })
 
diff --git a/src/views/user/OpenIdAuth.vue b/src/views/user/OpenIdAuth.vue
index 3d9a1e254..0d4b6cb8d 100644
--- a/src/views/user/OpenIdAuth.vue
+++ b/src/views/user/OpenIdAuth.vue
@@ -18,19 +18,19 @@ export default { name: 'Auth' }
 
 <script setup lang="ts">
 import {ref, computed, onMounted} from 'vue'
-import {useRoute, useRouter} from 'vue-router'
+import {useRoute} from 'vue-router'
 import {useI18n} from 'vue-i18n'
 
 import {getErrorText} from '@/message'
 import Message from '@/components/misc/message.vue'
-import {clearLastVisited, getLastVisited} from '@/helpers/saveLastVisited'
+import {useRedirectToLastVisited} from '@/composables/useRedirectToLastVisited'
 
 import {useAuthStore} from '@/stores/auth'
 
 const {t} = useI18n({useScope: 'global'})
 
-const router = useRouter()
 const route = useRoute()
+const {redirectIfSaved} = useRedirectToLastVisited()
 
 const authStore = useAuthStore()
 
@@ -74,16 +74,7 @@ async function authenticateWithCode() {
 			provider: route.params.provider,
 			code: route.query.code,
 		})
-		const last = getLastVisited()
-		if (last !== null) {
-			router.push({
-				name: last.name,
-				params: last.params,
-			})
-			clearLastVisited()
-		} else {
-			router.push({name: 'home'})
-		}
+		redirectIfSaved()
 	} catch(e) {
 		const err = getErrorText(e)
 		errorMessage.value = typeof err[1] !== 'undefined' ? err[1] : err[0]