Bugfix for accepting invitation in client

Author: oharsta

client/src/pages/App.js

@@ -51,17 +51,22 @@ export const App = () => {
                             return;
                         }
                         const pathname = localStorage.getItem("location") || window.location.pathname;
-                        const isInvitationAcceptFlow = window.location.pathname.startsWith("/invitation/accept");
+                        const isInvitationAcceptFlow = window.location.pathname.startsWith("/invitation/accept")
+                            || pathname.startsWith("/invitation/accept");
+                        let route = null;
                         if (res.name && !pathname.startsWith("/invitation/accept") && !isInvitationAcceptFlow) {
-                            setLoading(false);
-                            navigate("/deadend");
+                            route = "/deadend"
                         } else if (pathname === "/" || pathname.startsWith("/login") || pathname.startsWith("/invitation/accept") || isInvitationAcceptFlow) {
                             setLoading(false);
-                            navigate(isInvitationAcceptFlow ? (window.location.pathname + window.location.search) : pathname);
+                            route = isInvitationAcceptFlow ? pathname : window.location.pathname + window.location.search;
                         } else {
                             //Bookmarked URL's trigger a direct login and skip the landing page
                             login(res);
                         }
+                        if (!isEmpty(route)) {
+                            setLoading(false);
+                            setTimeout(() => navigate(route), 50);
+                        }
                     } else {
                         me()
                             .then(res => {

server/src/main/resources/application.yml

@@ -195,7 +195,7 @@ 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: False
   url: "https://manage.test2.surfconext.nl"
   user: invite