Load auth options from API

GeoWerkstatt · Nov 30, 2023 · 7fb1d3d · 7fb1d3d
1 parent aec0635
commit 7fb1d3d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/src/GeoCop.Frontend/public/client-settings.json b/src/GeoCop.Frontend/public/client-settings.json
@@ -1,16 +1,7 @@
 {
-  "oauth": {
-    "auth": {
-      "clientId": "ac09549e-6cf8-40fe-91a9-25515ec71954",
-      "authority": "https://login.microsoftonline.com/16e916d3-12c9-4353-ad04-5a4319422e03/",
-      "redirectUri": "/",
-      "postLogoutRedirectUri": "/",
-      "navigateToLoginRequestUrl": false
-    },
-    "cache": {
-      "cacheLocation": "localStorage",
-      "storeAuthStateInCookie": false
-    }
+  "authCache": {
+    "cacheLocation": "localStorage",
+    "storeAuthStateInCookie": false
   },
   "authScopes": ["user.read", "openid", "profile", "email"],
   "application": {

diff --git a/src/GeoCop.Frontend/src/App.jsx b/src/GeoCop.Frontend/src/App.jsx
@@ -21,6 +21,7 @@ export const App = () => {
   const [showModalContent, setShowModalContent] = useState(false);
   const [showBannerContent, setShowBannerContent] = useState(false);
   const [clientSettings, setClientSettings] = useState({});
+  const [auth, setAuth] = useState(undefined);
   const [backendVersion, setBackendVersion] = useState("");
   const [datenschutzContent, setDatenschutzContent] = useState(null);
   const [impressumContent, setImpressumContent] = useState(null);
@@ -44,6 +45,12 @@ export const App = () => {
       .then(setClientSettings);
   }, []);
 
+  useEffect(() => {
+    fetch("/api/v1/user/auth")
+      .then((res) => res.headers.get("content-type")?.includes("application/json") && res.json())
+      .then(setAuth);
+  }, []);
+
   useEffect(() => {
     fetch("api/v1/version")
       .then((res) => res.headers.get("content-type")?.includes("text/plain") && res.text())
@@ -88,10 +95,13 @@ export const App = () => {
   const openModalContent = (content, type) =>
     setModalContent(content) & setModalContentType(type) & setShowModalContent(true);
 
-  const oauth = clientSettings?.oauth;
+  const authCache = clientSettings?.authCache;
   const msalInstance = useMemo(() => {
-    return new PublicClientApplication(oauth ?? {});
-  }, [oauth]);
+    return new PublicClientApplication({
+      auth,
+      cache: authCache,
+    });
+  }, [auth, authCache]);
 
   return (
     <MsalProvider instance={msalInstance}>