From 203a438c7c91bc6cbc14d60f862de89941f067b9 Mon Sep 17 00:00:00 2001
From: Joseph Garrone <joseph.garrone.gj@gmail.com>
Date: Tue, 24 Oct 2023 13:42:23 +0200
Subject: [PATCH] Update oidc-spa

---
 package.json    |  2 +-
 src/App/App.tsx | 80 +++++++++++++++++++++----------------------------
 yarn.lock       |  8 ++---
 3 files changed, 39 insertions(+), 51 deletions(-)

diff --git a/package.json b/package.json
index a04241d..420da5f 100755
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "keywords": [],
     "dependencies": {
         "evt": "^2.4.15",
-        "oidc-spa": "^1.0.1",
+        "oidc-spa": "^2.0.2",
         "keycloakify": "^8.2.1",
         "powerhooks": "^0.26.8",
         "react": "18.1.0",
diff --git a/src/App/App.tsx b/src/App/App.tsx
index 8fd8a10..6a3975f 100644
--- a/src/App/App.tsx
+++ b/src/App/App.tsx
@@ -3,7 +3,6 @@ import logo from "./logo.svg";
 import myimg from "./myimg.png";
 import { useMemo } from "react";
 import { createOidcProvider, useOidc } from "oidc-spa/react";
-import { addQueryParamToUrl } from "oidc-spa/tools/urlQueryParams";
 import { decodeJwt } from "oidc-spa";
 import { assert } from "tsafe/assert";
 
@@ -16,31 +15,29 @@ const keycloakClientId= "starter";
 const { OidcProvider } = createOidcProvider({
     issuerUri: `${keycloakUrl}/realms/${keycloakRealm}`,
     clientId: keycloakClientId,
-    transformUrlBeforeRedirect: url => {
-
+    // NOTE: You can also pass queries params when calling oidc.login()
+    getExtraQueryParams: () => ({
         // This adding ui_locales to the url will ensure the consistency of the language between the app and the login pages
         // If your app implements a i18n system (like i18nifty.dev for example) you should use this and replace "en" by the 
         // current language of the app.
         // On the other side you will find kcContext.locale.currentLanguageTag to be whatever you set here.  
-        url = addQueryParamToUrl({
-            url,
-            "name": "ui_locales",
-            "value": "en",
-        }).newUrl;
-
-        // If you want to pass some custom state to the login pages...
-        // See in src/keycloak-theme/pages/Login.tsx how it's retrieved.
-        url = addQueryParamToUrl({
-            url,
-            "name": "my_custom_param",
-            "value": "value of foo transferred to login page",
-        }).newUrl;
-
-        return url;
-
-    },
-    // Uncomment if your app is not hosted at the origin and update /foo/bar/baz.
-    //silentSsoUrl: `${window.location.origin}/foo/bar/baz/silent-sso.html`,
+        "ui_locales": "en",
+        "my_custom_param": "value of foo transferred to login page"
+    }),
+    /*
+     * This parameter have to be provided provide if your App is not hosted at the origin of the subdomain.
+     * For example if your site is hosted by navigating to `https://www.example.com`
+     * you don't have to provide this parameter.
+     * On the other end if your site is hosted by navigating to `https://www.example.com/my-app`
+     * Then you want to set publicUrl to `/my-app`
+     *
+     * Be mindful that `${window.location.origin}${publicUrl}/silent-sso.html` must return the `silent-sso.html` that
+     * you are supposed to have created in your `public/` directory.
+     *
+     * If your are still using `create-react-app` (like we are for now) you can just set
+     * publicUrl to `process.env.PUBLIC_URL` and don't have to think about it further.
+     */
+    publicUrl: process.env.PUBLIC_URL
 });
 
 export default function App() {
@@ -63,7 +60,13 @@ function ContextualizedApp() {
                     oidc.isUserLoggedIn ?
                         <AuthenticatedRoute logout={() => oidc.logout({ redirectTo: "home" })} />
                         :
-                        <button onClick={() => oidc.login({ doesCurrentHrefRequiresAuth: false })}>Login</button>
+                        <button 
+                            onClick={() => oidc.login({ 
+                                doesCurrentHrefRequiresAuth: false,
+                                //extraQueryParams: { kc_idp_hint: "google" }
+                            })}>
+                                Login
+                        </button>
                 }
                 <img src={logo} className="App-logo" alt="logo" />
                 <img src={myimg} alt="test_image" />
@@ -126,32 +129,17 @@ function buildAccountUrl(
         locale: string;
     }
 ){
-
     const { locale } = params;
 
-    let accountUrl = `${keycloakUrl}/realms/${keycloakRealm}/account`;
+    const accountUrl = new URL(`${keycloakUrl}/realms/${keycloakRealm}/account`);
 
-    // Set the language the user will get on the account page
-    accountUrl = addQueryParamToUrl({
-        url: accountUrl,
-        name: "kc_locale",
-        value: locale
-    }).newUrl;
+    const searchParams = new URLSearchParams();
 
-    // Enable to redirect to the app from the account page we'll get the referrer_uri under kcContext.referrer.url
-    // It's useful to avoid hard coding the app url in the keycloak config
-    accountUrl = addQueryParamToUrl({
-        url: accountUrl,
-        name: "referrer",
-        value: keycloakClientId
-    }).newUrl;
+    searchParams.append("kc_locale", locale);
+    searchParams.append("referrer", keycloakClientId);
+    searchParams.append("referrer_uri", window.location.href);
 
-    accountUrl = addQueryParamToUrl({
-        url: accountUrl,
-        name: "referrer_uri",
-        value: window.location.href
-    }).newUrl;
+    accountUrl.search = searchParams.toString();
 
-    return accountUrl;
-
-}
+    return accountUrl.toString();
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 0747665..7851615 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10917,10 +10917,10 @@ oidc-client-ts@^2.3.0:
     crypto-js "^4.1.1"
     jwt-decode "^3.1.2"
 
-oidc-spa@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/oidc-spa/-/oidc-spa-1.0.1.tgz#205a7613def6b7aea9b4c2ad71e952180f8c3dcb"
-  integrity sha512-vrd0peFSSHphVNEvS1s76ZR21fQr1tPBuwQLK6MyReMN9r9HA+BfDOFEiYs1Q9nixrecMQVDQsF7nBxQfwSscA==
+oidc-spa@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/oidc-spa/-/oidc-spa-2.0.2.tgz#7a6c64f0e92c0f9349742974648627a85865a8b8"
+  integrity sha512-PILedvHPxy5U1Kwkpukdw5DW3adST/Bo6vZz70o7hwe59kwBVmVATBlAikZlscZn4x5pAeOyWuD1fir0N1WrJg==
   dependencies:
     jwt-decode "^3.1.2"
     oidc-client-ts "^2.3.0"