come back to tokens

ludojmj · Mar 3, 2023 · 2f7643c · 2f7643c
1 parent d14c759
commit 2f7643c
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 548 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@axa-fr/vanilla-oidc": "^6.14.8",
+    "@axa-fr/vanilla-oidc": "^6.15.2",
     "@sveltejs/vite-plugin-svelte": "^2.0.2",
     "axios": "^1.2.2",
     "bootstrap": "^5.2.3",

diff --git a/client/public/OidcServiceWorker.js b/client/public/OidcServiceWorker.js
diff --git a/client/src/App.svelte b/client/src/App.svelte
@@ -2,6 +2,7 @@
   import "./variables.scss";
   import { Router, Route } from "svelte-navigator";
   import { crud } from "./lib/const.js";
+  import { userInfo } from "./lib/store.js";
   import AuthWrapper from "./components/oidc/AuthWrapper.svelte";
   import CrudManager from "./components/CrudManager.svelte";
   import StuffCreate from "./components/StuffCreate.svelte";
@@ -32,4 +33,5 @@
       <Error msgErr="I got lost." hasReset={true} />
     </Route>
   </Router>
+  <pre>{JSON.stringify($userInfo, null, "\t")}</pre>
 </AuthWrapper>
diff --git a/client/src/components/StuffList.svelte b/client/src/components/StuffList.svelte
@@ -2,7 +2,7 @@
   // StuffList.svelte
   import { navigate } from "svelte-navigator";
   import { crud } from "../lib/const.js";
-  import { selectedItem, userInfo } from "../lib/store.js";
+  import { selectedItem, tokens } from "../lib/store.js";
   export let stuff;
 
   const handleRead = (stuffDatum) => {
@@ -36,7 +36,7 @@
     {#each stuff.datumList || [] as stuffDatum}
       <tr
         id={stuffDatum.id}
-        class={stuffDatum.user.id === $userInfo.sub
+        class={stuffDatum.user.id === $tokens.idTokenPayload.sub
           ? "table-success"
           : "table-danger"}
       >
@@ -68,7 +68,7 @@
             Read
           </button>
         </td>
-        {#if stuffDatum.user.id === $userInfo.sub}
+        {#if stuffDatum.user.id === $tokens.idTokenPayload.sub}
           <td>
             <button
               class="btn btn-warning"

diff --git a/client/src/components/oidc/AuthWrapper.svelte b/client/src/components/oidc/AuthWrapper.svelte
@@ -1,7 +1,7 @@
 <script>
   // AuthWrapper.svelte
   import { onMount } from "svelte";
-  import { isAuthLoading, userInfo } from "../../lib/store.js";
+  import { isAuthLoading, tokens } from "../../lib/store.js";
   import { getTokenAync, getUserAsync } from "../../lib/oidc.js";
   import Loading from "../common/Loading.svelte";
   import Login from "./Login.svelte";
@@ -16,9 +16,8 @@
   <Login />
   {#if $isAuthLoading}
     <Loading />
-  {:else if $userInfo}
+  {:else if $tokens}
     <slot />
-    <pre>{JSON.stringify($userInfo, null, "\t")}</pre>
   {:else}
     <div class="alert alert-warning">
       You need to login to access this site.

diff --git a/client/src/components/oidc/Login.svelte b/client/src/components/oidc/Login.svelte
@@ -1,11 +1,11 @@
 <script>
   // Login.svelte
-  import { userInfo } from "../../lib/store.js";
+  import { tokens } from "../../lib/store.js";
   import { loginAsync } from "../../lib/oidc.js";
   import Logo from "../common/Logo.svelte";
 </script>
 
-{#if !$userInfo}
+{#if !$tokens}
   <main class="container text-center">
     <div class="row">
       <div class="col">

diff --git a/client/src/components/oidc/Logout.svelte b/client/src/components/oidc/Logout.svelte
@@ -1,16 +1,16 @@
 <script>
   // Logout.svelte
-  import { userInfo } from "../../lib/store.js";
+  import { tokens } from "../../lib/store.js";
   import { logoutAsync } from "../../lib/oidc.js";
 </script>
 
-{#if $userInfo}
+{#if $tokens}
   <button class="btn btn-danger" on:click={async () => await logoutAsync()}>
     <span>
       Logout &nbsp;
 
       <span class="badge bg-primary">
-        {$userInfo.name}
+        {$tokens.accessTokenPayload.name}
       </span>
     </span>
   </button>