Don't immediately signin on userUnload for #62.

soukoku · Feb 23, 2022 · d26136f · MisterFab1an · Feb 23, 2022 · soukoku
1 parent 9a59b83
commit d26136f
Show file tree

Hide file tree

Showing 22 changed files with 212 additions and 37 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-oidc-client",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.4",
   "description": "Wrapper around oidc-client-js to to better work in a Vue application with Vue Router integration.",
   "author": "Eugene Wang",
   "license": "MIT",

diff --git a/vue2/dist/vue-oidc-client.common.js b/vue2/dist/vue-oidc-client.common.js
diff --git a/vue2/dist/vue-oidc-client.common.js.map b/vue2/dist/vue-oidc-client.common.js.map
diff --git a/vue2/dist/vue-oidc-client.umd.js b/vue2/dist/vue-oidc-client.umd.js
diff --git a/vue2/dist/vue-oidc-client.umd.js.map b/vue2/dist/vue-oidc-client.umd.js.map
diff --git a/vue2/dist/vue-oidc-client.umd.min.js b/vue2/dist/vue-oidc-client.umd.min.js
diff --git a/vue2/dist/vue-oidc-client.umd.min.js.map b/vue2/dist/vue-oidc-client.umd.min.js.map
diff --git a/vue2/src/sample-app/App.vue b/vue2/src/sample-app/App.vue
@@ -3,7 +3,7 @@
     <div id="nav">
       <router-link to="/">Vue 2 Home</router-link> |
       <router-link to="/about">About (Protected) </router-link> |
-      <a href="#" @click="$oidc.signOut()" v-if="$oidc.isAuthenticated"
+      <a href="#" @click.prevent="$oidc.signOut()" v-if="$oidc.isAuthenticated"
         >Signout</a
       >
     </div>

diff --git a/vue2/src/vue-oidc-client.ts b/vue2/src/vue-oidc-client.ts
@@ -395,7 +395,7 @@ export function createOidcAuth(
 
       // redirect if on protected route (best method here?)
       Log.debug(`${auth.authName} auth user unloaded`)
-      signInIfNecessary()
+      // signInIfNecessary()
     })
 
     mgr.events.addAccessTokenExpired(() => {

diff --git a/vue3/dist/vue-oidc-client.common.js b/vue3/dist/vue-oidc-client.common.js
diff --git a/vue3/dist/vue-oidc-client.common.js.map b/vue3/dist/vue-oidc-client.common.js.map
diff --git a/vue3/dist/vue-oidc-client.umd.js b/vue3/dist/vue-oidc-client.umd.js
diff --git a/vue3/dist/vue-oidc-client.umd.js.map b/vue3/dist/vue-oidc-client.umd.js.map
diff --git a/vue3/dist/vue-oidc-client.umd.min.js b/vue3/dist/vue-oidc-client.umd.min.js
diff --git a/vue3/dist/vue-oidc-client.umd.min.js.map b/vue3/dist/vue-oidc-client.umd.min.js.map
diff --git a/vue3/package-lock.json b/vue3/package-lock.json
diff --git a/vue3/package.json b/vue3/package.json
@@ -27,6 +27,6 @@
     "eslint-plugin-vue": "^7.9.0",
     "typescript": "~4.2.4",
     "vue": "^3.0.11",
-    "vue-router": "^4.0.6"
+    "vue-router": "^4.0.12"
   }
 }
diff --git a/vue3/src/sample-app/App.vue b/vue3/src/sample-app/App.vue
@@ -1,14 +1,11 @@
 <template>
   <div id="nav">
-    <router-link to="/">Vue 3 Home</router-link> |
-    <router-link to="/about">About (Protected) </router-link> |
-    <a href="#" @click="$oidc.signOut()" v-if="$oidc.isAuthenticated"
-      >Signout</a
-    >
+    <router-link to="/">Vue 3 Home</router-link>|
+    <router-link to="/about">About (Protected)</router-link>|
+    <a href="#" @click.prevent="$oidc.signOut" v-if="$oidc.isAuthenticated">Signout</a>
   </div>
   <router-view />
 </template>
-
 <style>
 #app {
   font-family: Avenir, Helvetica, Arial, sans-serif;

diff --git a/vue3/src/sample-app/idsrvAuth.ts b/vue3/src/sample-app/idsrvAuth.ts
@@ -6,7 +6,7 @@ const appRootUrl = `${loco.protocol}//${loco.host}${process.env.BASE_URL}`
 
 const idsrvAuth = createOidcAuth(
   'main',
-  SignInType.Popup,
+  SignInType.Window,
   appRootUrl,
   {
     authority: 'https://demo.identityserver.io/',

diff --git a/vue3/src/sample-app/views/About.vue b/vue3/src/sample-app/views/About.vue
@@ -16,7 +16,6 @@ export default {
       return { ...this.$oidc.userProfile, accessToken: this.$oidc.accessToken }
     },
     claims() {
-      debugger
       if (this.user) {
         return Object.keys(this.user).map(key => ({
           key,

diff --git a/vue3/src/vue-oidc-client.ts b/vue3/src/vue-oidc-client.ts
@@ -212,6 +212,7 @@ export function createOidcAuth(
             redirectAfterSignout(myRouter)
           })
       }
+      mgr.stopSilentRenew()
       return mgr.signoutRedirect(args)
     },
     startSilentRenew() {
@@ -377,7 +378,7 @@ export function createOidcAuth(
 
       // redirect if on protected route (best method here?)
       Log.debug(`${authName} auth user unloaded`)
-      signInIfNecessary()
+      // signInIfNecessary()
     })
 
     mgr.events.addAccessTokenExpired(() => {