Merge pull request #9364 from owncloud/remember-location-after-token-…

…invalidation fix: remember location after token invalidation
owncloud · Jul 7, 2023 · a7e6126 · a7e6126
2 parents 850a14e + 9ebf5c3
commit a7e6126
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/changelog/unreleased/bugfix-remember-location-after-token-invalidation b/changelog/unreleased/bugfix-remember-location-after-token-invalidation
@@ -0,0 +1,6 @@
+Bugfix: Remember location after token invalidation
+
+Fixed an issue where token invalidation in the IDP would result in losing the current location. So logging in after token invalidation now correctly redirects to the page the user was before.
+
+https://github.com/owncloud/web/issues/9261
+https://github.com/owncloud/web/pull/9364
diff --git a/packages/web-runtime/src/pages/accessDenied.vue b/packages/web-runtime/src/pages/accessDenied.vue
@@ -24,7 +24,7 @@
       id="exitAnchor"
       type="router-link"
       class="oc-mt-m oc-width-medium"
-      :to="{ name: 'login' }"
+      :to="logoutLink"
       size="large"
       appearance="filled"
       variation="primary"
@@ -34,14 +34,15 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from 'vue'
-import { useStore } from 'web-pkg'
+import { computed, defineComponent, unref } from 'vue'
+import { useRoute, useStore } from 'web-pkg'
 import { useGettext } from 'vue3-gettext'
 
 export default defineComponent({
   name: 'AccessDeniedPage',
   setup() {
     const store = useStore()
+    const route = useRoute()
     const { $gettext } = useGettext()
 
     const logoImg = computed(() => {
@@ -68,14 +69,24 @@ export default defineComponent({
     const navigateToLoginText = computed(() => {
       return $gettext('Log in again')
     })
+    const logoutLink = computed(() => {
+      const redirectUrl = unref(route).query?.redirectUrl
+      return {
+        name: 'login',
+        query: {
+          ...(redirectUrl && { redirectUrl })
+        }
+      }
+    })
 
     return {
       logoImg,
       cardTitle,
       cardHint,
       footerSlogan,
       navigateToLoginText,
-      accessDeniedHelpUrl
+      accessDeniedHelpUrl,
+      logoutLink
     }
   }
 })

diff --git a/packages/web-runtime/src/services/auth/authService.ts b/packages/web-runtime/src/services/auth/authService.ts
@@ -134,7 +134,10 @@ export class AuthService {
 
           if (this.userManager.unloadReason === 'authError') {
             this.hasAuthErrorOccurred = true
-            return this.router.push({ name: 'accessDenied' })
+            return this.router.push({
+              name: 'accessDenied',
+              query: { redirectUrl: unref(this.router.currentRoute)?.fullPath }
+            })
           }
 
           // handle redirect after logout