symfony
diff --git a/‎src/Symfony/Bridge/Twig/Extension/SecurityExtension.php
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/Extension/SecurityExtension.php
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Security/Http/Impersonate/ImpersonateUrlGenerator.php
Lines changed: 16 additions & 7 deletions b/‎src/Symfony/Component/Security/Http/Impersonate/ImpersonateUrlGenerator.php
Lines changed: 16 additions & 7 deletions
@@ -69,12 +69,22 @@ public function getImpersonateExitPath(string $exitTo = null): string
         return $this->impersonateUrlGenerator->generateExitPath($exitTo);
     }
 
+    public function getImpersonatePath(string $identifier = null): string
+    {
+        if (null === $this->impersonateUrlGenerator) {
+            return '';
+        }
+
+        return $this->impersonateUrlGenerator->generateImpersonationPath($identifier);
+    }
+
     public function getFunctions(): array
     {
         return [
             new TwigFunction('is_granted', $this->isGranted(...)),
             new TwigFunction('impersonation_exit_url', $this->getImpersonateExitUrl(...)),
             new TwigFunction('impersonation_exit_path', $this->getImpersonateExitPath(...)),
+            new TwigFunction('impersonation_path', $this->getImpersonatePath(...)),
         ];
     }
 }
@@ -18,7 +18,7 @@
 use Symfony\Component\Security\Http\Firewall\SwitchUserListener;
 
 /**
- * Provides generator functions for the impersonate url exit.
+ * Provides generator functions for the impersonation urls.
  *
  * @author Amrouche Hamza <hamza.simperfit@gmail.com>
  * @author Damien Fayet <damienf1521@gmail.com>
@@ -36,9 +36,14 @@ public function __construct(RequestStack $requestStack, FirewallMap $firewallMap
         $this->firewallMap = $firewallMap;
     }
 
+    public function generateImpersonationPath(string $identifier = null): string
+    {
+        return $this->buildPath(null, $identifier);
+    }
+
     public function generateExitPath(string $targetUri = null): string
     {
-        return $this->buildExitPath($targetUri);
+        return $this->buildPath($targetUri);
     }
 
     public function generateExitUrl(string $targetUri = null): string
@@ -47,27 +52,31 @@ public function generateExitUrl(string $targetUri = null): string
             return '';
         }
 
-        return $request->getUriForPath($this->buildExitPath($targetUri));
+        return $request->getUriForPath($this->buildPath($targetUri));
     }
 
     private function isImpersonatedUser(): bool
     {
         return $this->tokenStorage->getToken() instanceof SwitchUserToken;
     }
 
-    private function buildExitPath(string $targetUri = null): string
+    private function buildPath(string $targetUri = null, string $identifier = SwitchUserListener::EXIT_VALUE): string
     {
-        if (null === ($request = $this->requestStack->getCurrentRequest()) || !$this->isImpersonatedUser()) {
+        if (null === ($request = $this->requestStack->getCurrentRequest())) {
+            return '';
+        }
+
+        if (!$this->isImpersonatedUser() && $identifier == SwitchUserListener::EXIT_VALUE){
             return '';
         }
 
         if (null === $switchUserConfig = $this->firewallMap->getFirewallConfig($request)->getSwitchUser()) {
-            throw new \LogicException('Unable to generate the impersonate exit URL without a firewall configured for the user switch.');
+            throw new \LogicException('Unable to generate the impersonate URLs without a firewall configured for the user switch.');
         }
 
         $targetUri ??= $request->getRequestUri();
 
-        $targetUri .= (parse_url($targetUri, \PHP_URL_QUERY) ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => SwitchUserListener::EXIT_VALUE], '', '&');
+        $targetUri .= (parse_url($targetUri, \PHP_URL_QUERY) ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => $identifier], '', '&');
 
         return $targetUri;
     }
Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,22 @@ public function getImpersonateExitPath(string $exitTo = null): string`
`69`	`69`	`return $this->impersonateUrlGenerator->generateExitPath($exitTo);`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ public function getImpersonatePath(string $identifier = null): string`
	`73`	`+ {`
	`74`	`+ if (null === $this->impersonateUrlGenerator) {`
	`75`	`+ return '';`
	`76`	`+ }`
	`77`	`+`
	`78`	`+ return $this->impersonateUrlGenerator->generateImpersonationPath($identifier);`
	`79`	`+ }`
	`80`	`+`
`72`	`81`	`public function getFunctions(): array`
`73`	`82`	`{`
`74`	`83`	`return [`
`75`	`84`	`new TwigFunction('is_granted', $this->isGranted(...)),`
`76`	`85`	`new TwigFunction('impersonation_exit_url', $this->getImpersonateExitUrl(...)),`
`77`	`86`	`new TwigFunction('impersonation_exit_path', $this->getImpersonateExitPath(...)),`
	`87`	`+ new TwigFunction('impersonation_path', $this->getImpersonatePath(...)),`
`78`	`88`	`];`
`79`	`89`	`}`
`80`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`use Symfony\Component\Security\Http\Firewall\SwitchUserListener;`
`19`	`19`
`20`	`20`	`/**`
`21`		`- * Provides generator functions for the impersonate url exit.`
	`21`	`+ * Provides generator functions for the impersonation urls.`
`22`	`22`	`*`
`23`	`23`	`* @author Amrouche Hamza <hamza.simperfit@gmail.com>`
`24`	`24`	`* @author Damien Fayet <damienf1521@gmail.com>`
`@@ -36,9 +36,14 @@ public function __construct(RequestStack $requestStack, FirewallMap $firewallMap`
`36`	`36`	`$this->firewallMap = $firewallMap;`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ public function generateImpersonationPath(string $identifier = null): string`
	`40`	`+ {`
	`41`	`+ return $this->buildPath(null, $identifier);`
	`42`	`+ }`
	`43`	`+`
`39`	`44`	`public function generateExitPath(string $targetUri = null): string`
`40`	`45`	`{`
`41`		`- return $this->buildExitPath($targetUri);`
	`46`	`+ return $this->buildPath($targetUri);`
`42`	`47`	`}`
`43`	`48`
`44`	`49`	`public function generateExitUrl(string $targetUri = null): string`
`@@ -47,27 +52,31 @@ public function generateExitUrl(string $targetUri = null): string`
`47`	`52`	`return '';`
`48`	`53`	`}`
`49`	`54`
`50`		`- return $request->getUriForPath($this->buildExitPath($targetUri));`
	`55`	`+ return $request->getUriForPath($this->buildPath($targetUri));`
`51`	`}`
`52`	`57`
`53`	`58`	`private function isImpersonatedUser(): bool`
`54`	`59`	`{`
`55`	`60`	`return $this->tokenStorage->getToken() instanceof SwitchUserToken;`
`56`	`61`	`}`
`57`	`62`
`58`		`- private function buildExitPath(string $targetUri = null): string`
	`63`	`+ private function buildPath(string $targetUri = null, string $identifier = SwitchUserListener::EXIT_VALUE): string`
`59`	`64`	`{`
`60`		`- if (null === ($request = $this->requestStack->getCurrentRequest()) \|\| !$this->isImpersonatedUser()) {`
	`65`	`+ if (null === ($request = $this->requestStack->getCurrentRequest())) {`
	`66`	`+ return '';`
	`67`	`+ }`
	`68`	`+`
	`69`	`+ if (!$this->isImpersonatedUser() && $identifier == SwitchUserListener::EXIT_VALUE){`
`61`	`70`	`return '';`
`62`	`71`	`}`
`63`	`72`
`64`	`73`	`if (null === $switchUserConfig = $this->firewallMap->getFirewallConfig($request)->getSwitchUser()) {`
`65`		`- throw new \LogicException('Unable to generate the impersonate exit URL without a firewall configured for the user switch.');`
	`74`	`+ throw new \LogicException('Unable to generate the impersonate URLs without a firewall configured for the user switch.');`
`66`	`75`	`}`
`67`	`76`
`68`	`77`	`$targetUri ??= $request->getRequestUri();`
`69`	`78`
`70`		`- $targetUri .= (parse_url($targetUri, \PHP_URL_QUERY) ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => SwitchUserListener::EXIT_VALUE], '', '&');`
	`79`	`+ $targetUri .= (parse_url($targetUri, \PHP_URL_QUERY) ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => $identifier], '', '&');`
`71`	`80`
`72`	`81`	`return $targetUri;`
`73`	`82`	`}`