keycloakify · garronej · Jan 19, 2025 · Jan 22, 2025 · Jan 22, 2025 · Jan 22, 2025
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -4,7 +4,6 @@
     "useTabs": false,
     "semi": true,
     "singleQuote": false,
-    "quoteProps": "preserve",
     "trailingComma": "none",
     "bracketSpacing": true,
     "arrowParens": "avoid"

diff --git a/examples/tanstack-router-file-based/public/oidc-callback.htm b/examples/tanstack-router-file-based/public/oidc-callback.htm
@@ -0,0 +1,32 @@
+<!doctype html>
+<html>
+
+<body>
+    <!-- oidc-spa file. Do not remove, do not edit -->
+    <script>
+
+        const authResponse = {};
+
+        for (const [key, value] of new URL(location.href).searchParams) {
+            authResponse[key] = value;
+        }
+
+        const stateData = JSON.parse(localStorage.getItem(`oidc.${authResponse.state}`)).data;
+
+        if (stateData.isSilentSso) {
+            console.log("Posting message to parent window");
+            parent.postMessage(authResponse, location.origin);
+        } else {
+            const redirectUrl = new URL(stateData.redirectUrl);
+
+            for (const [key, value] of Object.entries(authResponse)) {
+                redirectUrl.searchParams.set(`oidc-spa.${key}`, value);
+            }
+
+            location.replace(redirectUrl.href);
+        }
+
+    </script>
+</body>
+
+</html>
diff --git a/examples/tanstack-router-file-based/public/silent-sso.htm b/examples/tanstack-router-file-based/public/silent-sso.htm
diff --git a/examples/tanstack-router-file-based/src/oidc.tsx b/examples/tanstack-router-file-based/src/oidc.tsx
@@ -23,7 +23,7 @@ export const {
 
     issuerUri: import.meta.env.VITE_OIDC_ISSUER,
     clientId: import.meta.env.VITE_OIDC_CLIENT_ID,
-    publicUrl: import.meta.env.BASE_URL,
+    BASE_URL: import.meta.env.BASE_URL,
     /**
      * This parameter is optional.
      *

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "oidc-spa",
-    "version": "5.7.0",
+    "version": "6.0.0-rc.1",
     "description": "Openidconnect client for Single Page Applications",
     "repository": {
         "type": "git",
@@ -63,7 +63,7 @@
         "prettier": "^2.8.8",
         "react": "^18.2.0",
         "ts-node": "^10.9.1",
-        "tsafe": "^1.7.5",
+        "tsafe": "^1.8.5",
         "tsx": "^4.15.5",
         "typescript": "^5.5.4",
         "webpack": "5.93.0",

diff --git a/scripts/build.ts b/scripts/build.ts
@@ -13,7 +13,7 @@ const startTime = Date.now();
 const distDirPath = pathJoin(__dirname, "..", "dist");
 
 if (fs.existsSync(distDirPath)) {
-    fs.rmSync(distDirPath, { "recursive": true });
+    fs.rmSync(distDirPath, { recursive: true });
 }
 
 run("npx tsc");
@@ -25,7 +25,7 @@ run("npx tsc");
 
     assert(typeof version === "string");
 
-    const filePath = pathJoin(distDirPath, "oidc.js");
+    const filePath = pathJoin(distDirPath, "oidc", "createOidc.js");
 
     const content = fs.readFileSync(filePath).toString("utf8");
 
@@ -40,7 +40,7 @@ const extraBundleFileBasenames = new Set<string>();
 
 (["backend", "frontend"] as const)
     .map(backendOrFrontend => ({
-        "vendorDirPath": pathJoin(distDirPath, "vendor", backendOrFrontend),
+        vendorDirPath: pathJoin(distDirPath, "vendor", backendOrFrontend),
         backendOrFrontend
     }))
     .forEach(({ backendOrFrontend, vendorDirPath }) =>
@@ -60,7 +60,7 @@ const extraBundleFileBasenames = new Set<string>();
                 const cacheDirPath = pathJoin(__dirname, "..", "node_modules", ".cache", "scripts");
 
                 if (!fs.existsSync(cacheDirPath)) {
-                    fs.mkdirSync(cacheDirPath, { "recursive": true });
+                    fs.mkdirSync(cacheDirPath, { recursive: true });
                 }
 
                 const webpackConfigJsFilePath = pathJoin(cacheDirPath, "webpack.config.js");
@@ -130,7 +130,7 @@ const extraBundleFileBasenames = new Set<string>();
                         }
                     });
 
-                fs.rmSync(webpackOutputDirPath, { "recursive": true });
+                fs.rmSync(webpackOutputDirPath, { recursive: true });
 
                 fs.writeFileSync(
                     filePath,
@@ -148,5 +148,5 @@ console.log(`✓ built in ${((Date.now() - startTime) / 1000).toFixed(2)}s`);
 
 function run(command: string) {
     console.log(`$ ${command}`);
-    child_process.execSync(command, { "stdio": "inherit" });
+    child_process.execSync(command, { stdio: "inherit" });
 }
diff --git a/scripts/link-in-app.ts b/scripts/link-in-app.ts
@@ -18,18 +18,18 @@ fs.writeFileSync(
 
                 return {
                     ...packageJsonParsed,
-                    "main": packageJsonParsed["main"]?.replace(/^dist\//, ""),
-                    "types": packageJsonParsed["types"]?.replace(/^dist\//, ""),
-                    "module": packageJsonParsed["module"]?.replace(/^dist\//, ""),
-                    "bin": !("bin" in packageJsonParsed)
+                    main: packageJsonParsed["main"]?.replace(/^dist\//, ""),
+                    types: packageJsonParsed["types"]?.replace(/^dist\//, ""),
+                    module: packageJsonParsed["module"]?.replace(/^dist\//, ""),
+                    bin: !("bin" in packageJsonParsed)
                         ? undefined
                         : Object.fromEntries(
                               Object.entries(packageJsonParsed["bin"]).map(([key, value]) => [
                                   key,
                                   (value as string).replace(/^dist\//, "")
                               ])
                           ),
-                    "exports": !("exports" in packageJsonParsed)
+                    exports: !("exports" in packageJsonParsed)
                         ? undefined
                         : Object.fromEntries(
                               Object.entries(packageJsonParsed["exports"]).map(([key, value]) => [
@@ -66,7 +66,7 @@ const commonThirdPartyDeps = (() => {
 
 const yarnGlobalDirPath = pathJoin(rootDirPath, ".yarn_home");
 
-fs.rmSync(yarnGlobalDirPath, { "recursive": true, "force": true });
+fs.rmSync(yarnGlobalDirPath, { recursive: true, force: true });
 fs.mkdirSync(yarnGlobalDirPath);
 
 const execYarnLink = (params: { targetModuleName?: string; cwd: string }) => {
@@ -82,9 +82,9 @@ const execYarnLink = (params: { targetModuleName?: string; cwd: string }) => {
 
     execSync(cmd, {
         cwd,
-        "env": {
+        env: {
             ...process.env,
-            "HOME": yarnGlobalDirPath
+            HOME: yarnGlobalDirPath
         }
     });
 };
@@ -112,7 +112,7 @@ if (testAppPaths.length === 0) {
     process.exit(-1);
 }
 
-testAppPaths.forEach(testAppPath => execSync("yarn install", { "cwd": testAppPath }));
+testAppPaths.forEach(testAppPath => execSync("yarn install", { cwd: testAppPath }));
 
 console.log("=== Linking common dependencies ===");
 
@@ -134,26 +134,26 @@ commonThirdPartyDeps.forEach(commonThirdPartyDep => {
         ]
     );
 
-    execYarnLink({ "cwd": localInstallPath });
+    execYarnLink({ cwd: localInstallPath });
 });
 
 commonThirdPartyDeps.forEach(commonThirdPartyDep =>
     testAppPaths.forEach(testAppPath =>
         execYarnLink({
-            "cwd": testAppPath,
-            "targetModuleName": commonThirdPartyDep
+            cwd: testAppPath,
+            targetModuleName: commonThirdPartyDep
         })
     )
 );
 
 console.log("=== Linking in house dependencies ===");
 
-execYarnLink({ "cwd": pathJoin(rootDirPath, "dist") });
+execYarnLink({ cwd: pathJoin(rootDirPath, "dist") });
 
 testAppPaths.forEach(testAppPath =>
     execYarnLink({
-        "cwd": testAppPath,
-        "targetModuleName": JSON.parse(
+        cwd: testAppPath,
+        targetModuleName: JSON.parse(
             fs.readFileSync(pathJoin(rootDirPath, "package.json")).toString("utf8")
         )["name"]
     })

diff --git a/scripts/link-in-examples.ts b/scripts/link-in-examples.ts
@@ -18,18 +18,18 @@ fs.writeFileSync(
 
                 return {
                     ...packageJsonParsed,
-                    "main": packageJsonParsed["main"]?.replace(/^dist\//, ""),
-                    "types": packageJsonParsed["types"]?.replace(/^dist\//, ""),
-                    "module": packageJsonParsed["module"]?.replace(/^dist\//, ""),
-                    "bin": !("bin" in packageJsonParsed)
+                    main: packageJsonParsed["main"]?.replace(/^dist\//, ""),
+                    types: packageJsonParsed["types"]?.replace(/^dist\//, ""),
+                    module: packageJsonParsed["module"]?.replace(/^dist\//, ""),
+                    bin: !("bin" in packageJsonParsed)
                         ? undefined
                         : Object.fromEntries(
                               Object.entries(packageJsonParsed["bin"]).map(([key, value]) => [
                                   key,
                                   (value as string).replace(/^dist\//, "")
                               ])
                           ),
-                    "exports": !("exports" in packageJsonParsed)
+                    exports: !("exports" in packageJsonParsed)
                         ? undefined
                         : Object.fromEntries(
                               Object.entries(packageJsonParsed["exports"]).map(([key, value]) => [
@@ -64,7 +64,7 @@ const commonThirdPartyDeps = (() => {
 
 const yarnHomeDirPath = pathJoin(projectDirPath, ".yarn_home");
 
-fs.rmSync(yarnHomeDirPath, { "recursive": true, "force": true });
+fs.rmSync(yarnHomeDirPath, { recursive: true, force: true });
 
 fs.mkdirSync(yarnHomeDirPath);
 
@@ -79,9 +79,9 @@ const execYarnLink = (params: { targetModuleName?: string; cwd: string }) => {
 
     execSync(cmd, {
         cwd,
-        "env": {
+        env: {
             ...process.env,
-            "HOME": yarnHomeDirPath
+            HOME: yarnHomeDirPath
         }
     });
 };
@@ -125,24 +125,24 @@ commonThirdPartyDeps.forEach(commonThirdPartyDep => {
         ]
     );
 
-    execYarnLink({ "cwd": localInstallPath });
+    execYarnLink({ cwd: localInstallPath });
 
     testAppNames.forEach(testAppName =>
         execYarnLink({
-            "cwd": getTestAppPath(testAppName),
-            "targetModuleName": commonThirdPartyDep
+            cwd: getTestAppPath(testAppName),
+            targetModuleName: commonThirdPartyDep
         })
     );
 });
 
 console.log("=== Linking in house dependencies ===");
 
-execYarnLink({ "cwd": pathJoin(projectDirPath, "dist") });
+execYarnLink({ cwd: pathJoin(projectDirPath, "dist") });
 
 testAppNames.forEach(testAppName =>
     execYarnLink({
-        "cwd": getTestAppPath(testAppName),
-        "targetModuleName": JSON.parse(
+        cwd: getTestAppPath(testAppName),
+        targetModuleName: JSON.parse(
             fs.readFileSync(pathJoin(projectDirPath, "package.json")).toString("utf8")
         )["name"]
     })