Fix for cyclic fetching user data

Author: oharsta

client/src/App.jsx

@@ -24,7 +24,7 @@ import Landing from "./pages/Landing.jsx";
 import JoinRequest from "./pages/JoinRequest.jsx";
 import UserHome from "./pages/UserHome.jsx";
 import {LoginRedirect} from "./pages/LoginRedirect.jsx";
-import {LOCAL_STORAGE_LOCATION} from "./utils/Login.js";
+import {SESSION_STORAGE_LOCATION} from "./utils/Login.js";
 import {Impersonating} from "./components/Impersonating.jsx";
 import System from "./pages/System.jsx";
 import {InvitationForm} from "./pages/InvitationForm.jsx";
@@ -87,9 +87,9 @@ const App = () => {
                                     menuItems: ["allApps"]
                                 }));
                             }
-                            let storedLocation = localStorage.getItem(LOCAL_STORAGE_LOCATION);
+                            let storedLocation = sessionStorage.getItem(SESSION_STORAGE_LOCATION);
                             if (!isEmpty(storedLocation)) {
-                                // Do not remove the LOCAL_STORAGE_LOCATION because in development mode this is called twice
+                                // Do not remove the SESSION_STORAGE_LOCATION because in development mode this is called twice
                                 if (!storedLocation.startsWith("/accept") && !hasOrganizationMemberships) {
                                     storedLocation = "/landing";
                                 }
@@ -111,7 +111,7 @@ const App = () => {
                     navigate("/home");
                 });
         })
-    }, [impersonator, navigate]);
+    }, [impersonator]); // eslint-disable-line react-hooks/exhaustive-deps
 
     if (loading) {
         return <Loader/>

client/src/organization/UserManagement.jsx

@@ -51,8 +51,12 @@ export const UserManagement = () => {
         setCurrentTab(name);
         useAppStore.setState({
             breadcrumbPaths: [
-                {path: "/home", value: I18n.t("breadCrumb.access"),menuItemName: "yourApps"},
-                {path: `/organization/${organizationId}`, value: res ? res.name : organization.name, menuItemName: "yourApps"},
+                {path: "/home", value: I18n.t("breadCrumb.access"), menuItemName: "yourApps"},
+                {
+                    path: `/organization/${organizationId}`,
+                    value: res ? res.name : organization.name,
+                    menuItemName: "yourApps"
+                },
                 {value: I18n.t(`breadCrumb.${name}`)}
             ]
         });

client/src/pages/ApplicationDetail.jsx

@@ -26,7 +26,7 @@ const ApplicationDetail = () => {
                     setServiceProvider(res);
                     setLoading(false);
                 })
-                .catch(e => {
+                .catch(() => {
                     navigate("/404");
                 });
         }, []);// eslint-disable-line react-hooks/exhaustive-deps

client/src/pages/Applications.jsx

@@ -87,7 +87,7 @@ const Applications = () => {
                     setSourceOptions(newSourceOptions);
                     setLoading(false);
                 })
-                .catch(e => {
+                .catch(() => {
                     navigate("/404");
                 });
         }, []);// eslint-disable-line react-hooks/exhaustive-deps

client/src/pages/Invitation.jsx

@@ -7,7 +7,7 @@ import {getParameterByName} from "../utils/QueryParameters.js";
 import {Loader} from "@surfnet/sds";
 import ConfirmationDialog from "../components/ConfirmationDialog.jsx";
 import Welcome from "../icons/undraw/welcome.svg";
-import {LOCAL_STORAGE_LOCATION} from "../utils/Login.js";
+import {SESSION_STORAGE_LOCATION} from "../utils/Login.js";
 
 export const Invitation = () => {
 
@@ -21,7 +21,7 @@ export const Invitation = () => {
         getInvitationByHash(hash)
             .then(res => {
                 setInvitation(res);
-                localStorage.removeItem(LOCAL_STORAGE_LOCATION);
+                sessionStorage.removeItem(SESSION_STORAGE_LOCATION);
                 useAppStore.setState({
                     breadcrumbPaths: [
                         {path: "/home", value: I18n.t("breadCrumb.access"), menuItemName: "yourApps"},
@@ -31,7 +31,7 @@ export const Invitation = () => {
                 });
                 setLoading(false);
             })
-            .catch(e => {
+            .catch(() => {
                 navigate("/404")
             });
     }, []);// eslint-disable-line react-hooks/exhaustive-deps

client/src/pages/LoginRedirect.jsx

@@ -1,7 +1,7 @@
 import {useEffect} from "react";
 import {Loader} from "@surfnet/sds";
 import {useAppStore} from "../stores/AppStore.js";
-import {LOCAL_STORAGE_LOCATION, login} from "../utils/Login.js";
+import {SESSION_STORAGE_LOCATION, login} from "../utils/Login.js";
 import {useLocation} from "react-router";
 
 export const LoginRedirect = () => {
@@ -11,7 +11,7 @@ export const LoginRedirect = () => {
 
     useEffect(() => {
         const locationUrl = currentLocation.pathname + currentLocation.search;
-        localStorage.setItem(LOCAL_STORAGE_LOCATION, locationUrl);
+        sessionStorage.setItem(SESSION_STORAGE_LOCATION, locationUrl);
         login(config);
     }, []);
 

client/src/pages/NotFound.jsx

@@ -3,9 +3,11 @@ import React from "react";
 import NotFoundLogo from "../icons/undraw_page_not_found_re_e9o6.svg";
 import I18n from "../locale/I18n";
 
-const NotFound = () => (
-    <div className={"not-found"}>
-        <NotFoundLogo/>
-    </div>
-);
+const NotFound = () => {
+    return (
+        <div className={"not-found"}>
+            <NotFoundLogo/>
+        </div>
+    );
+}
 export default NotFound;

client/src/utils/Login.js

@@ -1,6 +1,6 @@
 import {isEmpty, sanitizeURL} from "./Utils.js";
 
-export const LOCAL_STORAGE_LOCATION = "local_storage_location";
+export const SESSION_STORAGE_LOCATION = "session_storage_location";
 
 export const login = (config, force = true, useEduID = false) => {
     let params = force ? "?force=true" : "";

server/src/main/java/access/model/ApplicationMembership.java

@@ -31,6 +31,7 @@ public class ApplicationMembership implements NameHolder {
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "organization_membership_id")
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private OrganizationMembership organizationMembership;
 
     @Enumerated(EnumType.STRING)

server/src/test/java/access/api/ConnectionControllerTest.java

@@ -8,7 +8,6 @@
 import io.restassured.http.ContentType;
 import lombok.SneakyThrows;
 import org.apache.commons.io.IOUtils;
-import org.junit.Ignore;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;