Fix for undefined name institution

edubadges · Feb 19, 2025 · 1211173 · 1211173
1 parent 2a8e5d1
commit 1211173
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/src/App.svelte b/src/App.svelte
@@ -62,8 +62,8 @@
     onMount(() => {
         //if we are heading to any of the public path we don't fetch the profile
         const path = window.location.pathname;
-        const publicPaths = ["public", "/auth/login", "signup", "validate", "version/info", "launch/lti"]
-        if (!publicPaths.some(p => path.indexOf(p) > -1)) {
+        const publicPaths = ["public", "auth/login", "signup", "validate", "version/info", "launch/lti"]
+        if (path === "/" || !publicPaths.some(p => path.indexOf(p) > -1)) {
             getSocialAccounts()
                 .then(res => {
                     loaded = true;
@@ -78,7 +78,7 @@
                              })
                     }
                 })
-                .catch(e => {
+                .catch(() => {
                     $redirectPath = path;
                     if (path.indexOf("catalog") === -1) {
                         navigate("/login");

diff --git a/src/routes/ProcessToken.svelte b/src/routes/ProcessToken.svelte
@@ -1,15 +1,16 @@
 <script>
     import I18n from "i18n-js";
-    import {authToken, redirectPath, userLoggedIn, userRole} from "../stores/user";
+    import {authToken, redirectPath, userLoggedIn, userRole, currentInstitution} from "../stores/user";
     import {navigate} from "svelte-routing";
     import {onMount} from "svelte";
     import tip from "../icons/tip.svg";
     import Spinner from "../components/Spinner.svelte";
     import Modal from "../components/forms/Modal.svelte";
     import {role} from "../util/role";
     import {getService} from "../util/getService";
-    import {requestLoginToken} from "../api";
-import DOMPurify from "dompurify";
+    import {fetchRawCurrentInstitution, requestLoginToken} from "../api";
+    import DOMPurify from "dompurify";
+    import {translatePropertiesRawQueries} from "../util/utils";
 
     let authError;
     let code = 1;
@@ -37,16 +38,22 @@ import DOMPurify from "dompurify";
             $authToken = token;
             $userLoggedIn = true;
             redirectTo = $redirectPath || "/";
-            if (redirectTo === "/login") {
-                redirectTo = "/";
-            }
-            let revalidateName = urlSearchParams.get("revalidate-name");
-            if (revalidateName) {
-                //server side signal that the eduID account is not linked anymore
-                showNoValidatedName = true;
-            } else {
-                navigate(redirectTo);
-            }
+            fetchRawCurrentInstitution()
+                .then(res => {
+                    const institution = res.current_institution;
+                    institution.permissions = res.permissions;
+                    $currentInstitution = translatePropertiesRawQueries(institution);
+                    if (redirectTo === "/login") {
+                        redirectTo = "/";
+                    }
+                    let revalidateName = urlSearchParams.get("revalidate-name");
+                    if (revalidateName) {
+                        //server side signal that the eduID account is not linked anymore
+                        showNoValidatedName = true;
+                    } else {
+                        navigate(redirectTo);
+                    }
+                })
         } else {
             $userLoggedIn = "";
             code = urlSearchParams.get("code") || "1";