From 890a9b6cc20a63785d684d7b488151827a1ecfcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 15 Nov 2019 09:50:52 +0100
Subject: [PATCH] Fix token refresh flow

---
 src/pages/login.vue              |  2 +-
 src/pages/oidcCallback.vue       |  8 +++--
 src/pages/oidcSilentRedirect.vue | 52 --------------------------------
 src/router/index.js              |  3 +-
 src/services/auth.js             |  2 +-
 5 files changed, 9 insertions(+), 58 deletions(-)
 delete mode 100644 src/pages/oidcSilentRedirect.vue

diff --git a/src/pages/login.vue b/src/pages/login.vue
index 7d44b913782..7ed3256a52b 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -12,7 +12,7 @@
                     Please click the button below to authenticate and get access to your data.
                 </p>
                 <oc-button size="large" variation="primary" class="oc-login-authorize-button" id="authenticate" @click.native="login()">
-                  <translate>Authorize</translate>
+                  <translate>Login</translate>
                 </oc-button>
             </div>
             <div class="oc-login-card-footer">
diff --git a/src/pages/oidcCallback.vue b/src/pages/oidcCallback.vue
index d958d7434f7..70e6f4223ca 100644
--- a/src/pages/oidcCallback.vue
+++ b/src/pages/oidcCallback.vue
@@ -40,7 +40,11 @@ export default {
         console.warn('OAuth error: ' + this.$route.query.error + ' - ' + this.$route.query.error_description)
         return
       }
-      this.callback()
+      if (this.$route.path === '/oidc-silent-redirect') {
+        this.signinSilentCallback()
+      } else {
+        this.callback()
+      }
     })
   },
   data () {
@@ -52,7 +56,7 @@ export default {
     ...mapGetters(['configuration'])
   },
   methods: {
-    ...mapActions(['callback'])
+    ...mapActions(['callback', 'signinSilentCallback'])
   }
 }
 </script>
diff --git a/src/pages/oidcSilentRedirect.vue b/src/pages/oidcSilentRedirect.vue
deleted file mode 100644
index b558c23670b..00000000000
--- a/src/pages/oidcSilentRedirect.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
-    <v-container pa-0 fill-height>
-      <v-layout
-        align-center
-      >
-        <v-flex>
-          <h2 class="accent--text">
-            <span v-translate>Redirecting…</span>
-          </h2>
-        </v-flex>
-      </v-layout>
-      <v-footer app>
-        <v-layout
-          justify-center
-          row
-          wrap
-        >
-          <v-flex
-            primary
-            lighten-2
-            py-3
-            text-xs-center
-            white--text
-            xs12
-          >
-            {{ configuration.theme.general.slogan }}
-          </v-flex>
-        </v-layout>
-      </v-footer>
-    </v-container>
-</template>
-
-<script>
-import { mapGetters, mapActions } from 'vuex'
-export default {
-  name: 'OidcCallbackPage',
-  mounted () {
-    this.$nextTick(() => {
-      this.signinSilentCallback()
-    })
-  },
-  data () {
-    return {}
-  },
-  computed: {
-    ...mapGetters(['configuration'])
-  },
-  methods: {
-    ...mapActions(['signinSilentCallback'])
-  }
-}
-</script>
diff --git a/src/router/index.js b/src/router/index.js
index ed09260502c..0d363c229a7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,6 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import LoginPage from '../pages/login.vue'
 import OidcCallbackPage from '../pages/oidcCallback.vue'
-import OidcSilentRedirectPage from '../pages/oidcSilentRedirect.vue'
 import AccessDeniedPage from '../pages/accessDenied.vue'
 import Account from '../pages/account.vue'
 
@@ -31,7 +30,7 @@ const router = new Router({
     {
       path: '/oidc-silent-redirect',
       components: {
-        fullscreen: OidcSilentRedirectPage
+        fullscreen: OidcCallbackPage
       },
       meta: { auth: false, hideHeadbar: true }
     },
diff --git a/src/services/auth.js b/src/services/auth.js
index 2172c10757e..ed5f7534d05 100644
--- a/src/services/auth.js
+++ b/src/services/auth.js
@@ -20,7 +20,7 @@ export function initVueAuthenticate (config) {
       post_logout_redirect_uri: baseUrl,
       silent_redirect_uri: baseUrl + 'oidc-silent-redirect.html',
       accessTokenExpiringNotificationTime: 10,
-      automaticSilentRenew: false,
+      automaticSilentRenew: true,
       filterProtocolClaims: true,
       loadUserInfo: true,
       logLevel: Log.INFO