respect redirect_url

This makes OIDC work with the login flow

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Author: rullzer

lib/AppInfo/Application.php

@@ -29,6 +29,7 @@
 use OCA\UserOIDC\User\Backend;
 use OCP\AppFramework\App;
 use OCP\IL10N;
+use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\IUserSession;
@@ -63,10 +64,23 @@ public function register() {
 			/** @var IL10N $l10n */
 			$l10n = $this->getContainer()->query(IL10N::class);
 
+			/** @var IRequest $request */
+			$request = $this->getContainer()->query(IRequest::class);
+			$requestParams = $request->getParams();
+
+			$redirectUrl = '';
+			if(isset($requestParams['redirect_url'])) {
+				$redirectUrl = $requestParams['redirect_url'];
+			}
+
 			foreach ($providers as $provider) {
 				\OC_App::registerLogIn([
 					'name' => $l10n->t('Login with %1s', [$provider->getIdentifier()]),
-					'href' => $urlGenerator->linkToRoute(self::APP_ID . '.login.login', ['providerId' => $provider->getId()]),
+					'href' => $urlGenerator->linkToRoute(self::APP_ID . '.login.login',
+						[
+							'providerId' => $provider->getId(),
+							'redirectUrl' => $redirectUrl,
+						]),
 				]);
 			}
 

lib/Controller/LoginController.php

@@ -48,6 +48,7 @@ class LoginController extends Controller {
 	private const STATE = 'oidc.state';
 	private const NONCE = 'oidc.nonce';
 	private const PROVIDERID = 'oidc.providerid';
+	private const REDIRECTURL = 'oidc.redirecturl';
 
 	/** @var ISecureRandom */
 	private $random;
@@ -112,7 +113,7 @@ public function __construct(
 	 * @NoCSRFRequired
 	 * @UseSession
 	 */
-	public function login(int $providerId) {
+	public function login(int $providerId, string $redirectUrl = '') {
 		$this->logger->debug('Initiating login for provider with id: ' . $providerId);
 
 		//TODO: handle exceptions
@@ -125,6 +126,9 @@ public function login(int $providerId) {
 		$this->session->set(self::NONCE, $nonce);
 
 		$this->session->set(self::PROVIDERID, $providerId);
+
+		$this->session->set(self::REDIRECTURL, $redirectUrl);
+
 		$this->session->close();
 
 		$data = [
@@ -252,9 +256,12 @@ public function code($state = '', $code = '', $scope = '') {
 
 		$this->logger->debug('Redirecting user');
 
-		// TODO: user proper redirect url
+		$redirectUrl = $this->session->get(self::REDIRECTURL);
+		if ($redirectUrl === '') {
+			$redirectUrl = \OC_Util::getDefaultPageUrl();
+		}
 
-		return new RedirectResponse(\OC_Util::getDefaultPageUrl());
+		return new RedirectResponse($redirectUrl);
 	}
 
 	private function obtainDiscovery(string $url) {