Upgrade react-oidc to 6.16.14 & cleanup

client/jsconfig.json

@@ -8,7 +8,7 @@
      * a value or a type, so tell TypeScript to enforce using
      * `import type` instead of `import` for Types.
      */
-    "importsNotUsedAsValues": "error",
+    "verbatimModuleSyntax": true,
     "isolatedModules": true,
     "resolveJsonModule": true,
     /**

client/package.json

@@ -9,13 +9,13 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@axa-fr/vanilla-oidc": "^6.16.0",
-    "@sveltejs/vite-plugin-svelte": "^2.0.2",
-    "axios": "^1.2.2",
+    "@axa-fr/vanilla-oidc": "^6.16.14",
+    "@sveltejs/vite-plugin-svelte": "^2.0.4",
+    "axios": "^1.3.5",
     "bootstrap": "^5.2.3",
-    "sass": "^1.57.1",
-    "svelte": "^3.55.0",
+    "sass": "^1.61.0",
+    "svelte": "^3.58.0",
     "svelte-navigator": "^3.2.2",
-    "vite": "^4.0.4"
+    "vite": "^4.2.1"
   }
 }

client/src/App.svelte

@@ -2,7 +2,7 @@
   import "./variables.scss";
   import { Router, Route } from "svelte-navigator";
   import { crud } from "./lib/const.js";
-  import { userInfo } from "./lib/store.js";
+  import { tokens } from "./lib/store.js";
   import AuthWrapper from "./components/oidc/AuthWrapper.svelte";
   import CrudManager from "./components/CrudManager.svelte";
   import StuffCreate from "./components/StuffCreate.svelte";
@@ -33,5 +33,5 @@
       <Error msgErr="I got lost." hasReset={true} />
     </Route>
   </Router>
-  <pre>{JSON.stringify($userInfo, null, "\t")}</pre>
+  <pre>{JSON.stringify($tokens, null, "\t")}</pre>
 </AuthWrapper>

client/src/components/oidc/AuthWrapper.svelte

@@ -2,13 +2,12 @@
   // AuthWrapper.svelte
   import { onMount } from "svelte";
   import { isAuthLoading, tokens } from "../../lib/store.js";
-  import { getTokenAync, getUserAsync } from "../../lib/oidc.js";
+  import { getTokenAync } from "../../lib/oidc.js";
   import Loading from "../common/Loading.svelte";
   import Login from "./Login.svelte";
 
   onMount(async () => {
     await getTokenAync();
-    await getUserAsync();
   });
 </script>
 

client/src/lib/const.js

@@ -5,9 +5,10 @@ export const configuration = {
   silent_redirect_uri: window.location.origin + "/authentication/silent-callback",
   scope: "openid profile email api offline_access",
   authority: "https://demo.duendesoftware.com",
-  // service_worker_relative_url: "/OidcServiceWorker.js",
-  // service_worker_only: true,
-  // monitor_session: true
+  service_worker_relative_url: '/OidcServiceWorker.js',
+  service_worker_only: false,
+  silent_login_timeout: 1000,
+  monitor_session: true,
 };
 
 export const apiErrMsg = {

client/src/lib/oidc.js

@@ -1,6 +1,6 @@
 // oidc.js
 import { VanillaOidc } from "@axa-fr/vanilla-oidc";
-import { isAuthLoading, tokens, userInfo } from "./store.js";
+import { isAuthLoading, tokens } from "./store.js";
 import { configuration } from "./const.js";
 
 const href = window.location.href;
@@ -23,14 +23,6 @@ export let getTokenAync = async () => {
   });
 };
 
-export let getUserAsync = async () => {
-  vanillaOidc.getValidTokenAsync().then(() => {
-    vanillaOidc.userInfoAsync().then((result) => {
-      userInfo.set(result);
-    });
-  });
-};
-
 export const loginAsync = async () => {
   await vanillaOidc.loginAsync("/");
 };

client/src/lib/store.js

@@ -2,16 +2,6 @@
 import { writable } from "svelte/store";
 
 export const isAuthLoading = writable(false);
-isAuthLoading.subscribe(value => value);
-
 export const isLoading = writable(false);
-isLoading.subscribe(value => value);
-
 export const selectedItem = writable(JSON.parse(localStorage.getItem("selectedItem")) || {});
-selectedItem.subscribe(val => localStorage.setItem("selectedItem", JSON.stringify(val)));
-
 export const tokens = writable(null);
-tokens.subscribe(value => value);
-
-export const userInfo = writable(null);
-userInfo.subscribe(value => value);