Fix for not redirecting to invitation

Author: oharsta

client/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>0.0.31</version>
+        <version>0.0.32-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>access-client</artifactId>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openconext</groupId>
     <artifactId>invite</artifactId>
-    <version>0.0.31</version>
+    <version>0.0.32-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>invite</name>
     <description>SURFconext Invite</description>

provisioning-mock/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>0.0.31</version>
+        <version>0.0.32-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>provisioning-mock</artifactId>

server/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>0.0.31</version>
+        <version>0.0.32-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>access-server</artifactId>

server/src/main/java/access/api/UserController.java

@@ -31,6 +31,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -95,6 +96,7 @@ public UserController(Config config,
     public ResponseEntity<Config> config(User user,
                                          @RequestParam(value = "guest", required = false, defaultValue = "false") boolean guest) {
         LOG.debug("GET /config");
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         Config result = new Config(this.config);
         result
                 .withAuthenticated(user != null && user.getId() != null)

server/src/main/resources/application.yml

@@ -195,8 +195,8 @@ email:
 # configure real users / passwords and test against those. See server/src/main/java/access/manage/ManageConf.java
 # and server/src/main/java/access/manage/LocalManage.java to see how it works.
 manage:
-#  enabled: True
-  enabled: False
+  enabled: True
+#  enabled: False
   url: "https://manage.test2.surfconext.nl"
   user: invite
   password: secret

welcome/package.json

@@ -12,8 +12,8 @@
     "react": "^19.1.0",
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^19.1.0",
-    "react-router": "^7.5.3",
-    "react-router-dom": "^7.5.3",
+    "react-router": "7.3.0",
+    "react-router-dom": "7.3.0",
     "react-tooltip": "^5.28.1",
     "timeago.js": "^4.0.2",
     "word-wrap": "^1.2.5",

welcome/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>invite</artifactId>
-        <version>0.0.31</version>
+        <version>0.0.32-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>access-welcome</artifactId>

welcome/src/pages/App.js

@@ -30,36 +30,40 @@ export const App = () => {
             configuration()
                 .then(res => {
                     useAppStore.setState(() => ({config: res}));
+
                     if (!res.authenticated) {
                         if (!res.name) {
                             const direction = window.location.pathname + window.location.search;
                             localStorage.setItem("location", direction);
                         } else if (!isEmpty(res.missingAttributes)) {
-                            setLoading(false);
                             navigate("/missingAttributes");
+                            setLoading(false);
                             return;
                         }
-                        setLoading(false);
                         const locationStored = localStorage.getItem("location");
                         const pathname = locationStored || window.location.pathname;
-                        const isInvitationAcceptFlow = window.location.pathname.startsWith("/invitation/accept");
+                        const isInvitationAcceptFlow = window.location.pathname.startsWith("/invitation/accept")
+                            || pathname.startsWith("/invitation/accept");
                         if (res.name && !pathname.startsWith("/invitation/accept") && !isInvitationAcceptFlow) {
                             navigate("/deadend");
-                        } else if (pathname === "/" || pathname.startsWith("/login") || pathname.startsWith("/invitation/accept") || isInvitationAcceptFlow) {
-                            navigate(isInvitationAcceptFlow ? (window.location.pathname + window.location.search) : pathname);
+                        } else if (pathname === "/" || pathname.startsWith("/login") || isInvitationAcceptFlow) {
+                            const route = isInvitationAcceptFlow ? pathname : (window.location.pathname + window.location.search);
+                            setTimeout(() => navigate(route), 15);
+                            navigate(route);
                         } else {
                             //Bookmarked URL's trigger a direct login and skip the landing page
                             login(res);
                         }
+                        setLoading(false);
                     } else {
                         me()
                             .then(res => {
                                 useAppStore.setState(() => ({user: res, authenticated: true}));
                                 const location = localStorage.getItem("location") || window.location.pathname + window.location.search;
                                 const newLocation = location.startsWith("/login") ? "/profile" : location;
                                 localStorage.removeItem("location");
-                                setLoading(false);
                                 navigate(newLocation);
+                                setLoading(false);
                             });
                     }
                 })
@@ -73,6 +77,7 @@ export const App = () => {
     if (loading) {
         return <Loader/>
     }
+
     return (
         <div className="access">
             <div className="container">
@@ -92,8 +97,7 @@ export const App = () => {
                     <Routes>
                         <Route path="/" element={<Navigate replace to="login"/>}/>
                         <Route path="proceed" element={<Proceed/>}/>
-                        <Route path="invitation/accept"
-                               element={<Invitation authenticated={false}/>}/>
+                        <Route path="invitation/accept" element={<Invitation authenticated={false}/>}/>
                         <Route path="login" element={<Login/>}/>
                         <Route path="deadend" element={<InviteOnly/>}/>
                         <Route path="missingAttributes" element={<MissingAttributes/>}/>

welcome/src/pages/Invitation.js

@@ -22,7 +22,7 @@ const HAS_LOGGED_IN_AGAIN = "hasLoggedInAgain"
 let runOnce = false;
 
 export const Invitation = ({authenticated}) => {
-
+    
     const navigate = useNavigate();
     const {user, config} = useAppStore(state => state);
 
@@ -34,12 +34,14 @@ export const Invitation = ({authenticated}) => {
 
     useEffect(() => {
         const hashParam = getParameterByName("hash", window.location.search);
+        
         if (runOnce) {
             return;
         }
         runOnce = true;
         invitationByHash(hashParam)
             .then(res => {
+                    
                     setInvitation(res);
                     useAppStore.setState(() => ({
                         invitation: res
@@ -65,6 +67,7 @@ export const Invitation = ({authenticated}) => {
                                     })
                             })
                             .catch(e => {
+                                    
                                     setLoading(false);
                                     if (e.response && e.response.status === 412) {
                                         setConfirmation({