Fix access denied (403) when accepting/declining invitation (#575)

apigee · Apr 23, 2021 · 8c8d803 · 8c8d803
1 parent 3829644
commit 8c8d803
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/modules/apigee_edge_teams/apigee_edge_teams.tokens.inc b/modules/apigee_edge_teams/apigee_edge_teams.tokens.inc
@@ -79,11 +79,13 @@ function apigee_edge_teams_tokens($type, $tokens, array $data, array $options, B
         break;
 
       case "url_accept":
-        $replacements[$original] = $team_invitation->toUrl('accept-form', ['absolute' => TRUE])->setRouteParameter('team', $team->id())->toString();
+        $query = ['destination' => $team_invitation->toUrl('accept-form')->setRouteParameter('team', $team->id())->toString()];
+        $replacements[$original] = Url::fromRoute('user.login', [], ['query' => $query, 'absolute' => TRUE])->toString();
         break;
 
       case "url_decline":
-        $replacements[$original] = $team_invitation->toUrl('decline-form', ['absolute' => TRUE])->setRouteParameter('team', $team->id())->toString();
+        $query = ['destination' => $team_invitation->toUrl('decline-form')->setRouteParameter('team', $team->id())->toString()];
+        $replacements[$original] = Url::fromRoute('user.login', [], ['query' => $query, 'absolute' => TRUE])->toString();
         break;
 
       case "url_register":