Fixes #639

Author: oharsta

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Fix: remove trailing slash in `scim_url`
 - Fix: send PATCH request for change of displayName of Group (e.g. the name of the Role)
+- Fix: accept invitation in same window as where the invitation was send, now works
 
 ## 1.0.2
 

welcome/src/pages/App.jsx

@@ -46,7 +46,13 @@ export const App = () => {
                             if (res.name && !isInvitationAcceptFlow) {
                                 route = "/deadend";
                             } else if (pathname === "/" || pathname.startsWith("/login") || isInvitationAcceptFlow) {
-                                route = isInvitationAcceptFlow ? pathname : (window.location.pathname + window.location.search);
+                                //for an invitation accept flow we add the search parameters when the user is already logged in
+                                if (isInvitationAcceptFlow && pathname.indexOf("hash") === -1) {
+                                    route = (pathname + window.location.search);
+                                } else {
+                                    route = isInvitationAcceptFlow ? pathname : (window.location.pathname + window.location.search);
+                                }
+
                             }
                         }
                         if (!isEmpty(route)) {