Set restart url for authorize commands incase authprocs need to restart a login (#180)

Author: pradtke

lib/Services/AuthenticationService.php

@@ -17,6 +17,7 @@
 use Exception;
 use Psr\Http\Message\ServerRequestInterface;
 use SimpleSAML\Auth\Simple;
+use SimpleSAML\Auth\State;
 use SimpleSAML\Error;
 use SimpleSAML\Module\oidc\ClaimTranslatorExtractor;
 use SimpleSAML\Module\oidc\Controller\LogoutController;
@@ -164,6 +165,8 @@ private function prepareStateArray(
         $state['Source'] = ['entityid' => $state['Oidc']['OpenIdProviderMetadata']['issuer']];
         $state['Destination'] = ['entityid' => $state['Oidc']['RelyingPartyMetadata']['id']];
 
+        $state[State::RESTART] = $request->getUri()->__toString();
+
         return $state;
     }
 

spec/Services/AuthenticationServiceSpec.php

@@ -15,6 +15,7 @@
 namespace spec\SimpleSAML\Module\oidc\Services;
 
 use Laminas\Diactoros\ServerRequest;
+use Laminas\Diactoros\Uri;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use SimpleSAML\Auth\Simple;
@@ -56,6 +57,10 @@ class AuthenticationServiceSpec extends ObjectBehavior
         ],
     ];
 
+    public static $uri = 'https://some-server/authorize.php?abc=efg';
+
+
+
     /**
      * @param ServerRequest $request
      * @param ClientEntity $clientEntity
@@ -81,6 +86,7 @@ public function let(
         ClaimTranslatorExtractor $claimTranslatorExtractor
     ): void {
         $request->getQueryParams()->willReturn(self::AUTHZ_REQUEST_PARAMS);
+        $request->getUri()->willReturn(new Uri(self::$uri));
         $clientEntity->getAuthSourceId()->willReturn(self::AUTH_SOURCE);
         $clientEntity->toArray()->willReturn(self::CLIENT_ENTITY);
         $clientRepository->findById(self::CLIENT_ENTITY['id'])->willReturn($clientEntity);