DefaultController: catch oauth exceptions during login (#580)

Author: agoujot

src/Controller/DefaultController.php

@@ -9,7 +9,7 @@
 use MediaWiki\OAuthClient\Client;
 use MediaWiki\OAuthClient\ClientConfig;
 use MediaWiki\OAuthClient\Consumer;
-use MediaWiki\OAuthClient\Exception;
+use MediaWiki\OAuthClient\Exception as OAuthException;
 use MediaWiki\OAuthClient\Token;
 use OpenApi\Attributes as OA;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -58,7 +58,7 @@ public function loginAction(
 		try {
 			[ $next, $token ] = $this->getOauthClient( $request, $projectRepo, $urlGenerator, $centralAuthProject )
 				->initiate();
-		} catch ( Exception $oauthException ) {
+		} catch ( OAuthException $oauthException ) {
 			$this->addFlashMessage( 'notice', 'error-login' );
 			return $this->redirectToRoute( 'homepage' );
 		}
@@ -95,19 +95,24 @@ public function oauthCallbackAction(
 			return $this->redirectToRoute( 'homepage' );
 		}
 
-		$verifier = $request->get( 'oauth_verifier' );
-		$accessToken = $client->complete( $token, $verifier );
+		try {
+			$verifier = $request->get( 'oauth_verifier' );
+			$accessToken = $client->complete( $token, $verifier );
 
-		// Store access token, and remove request token.
-		$session->set( 'oauth_access_token', $accessToken );
-		$session->remove( 'oauth_request_token' );
+			// Store access token, and remove request token.
+			$session->set( 'oauth_access_token', $accessToken );
+			$session->remove( 'oauth_request_token' );
 
-		// Store user identity.
-		$ident = $client->identify( $accessToken );
-		$session->set( 'logged_in_user', $ident );
+			// Store user identity.
+			$ident = $client->identify( $accessToken );
+			$session->set( 'logged_in_user', $ident );
 
-		// Store reference to the client.
-		$session->set( 'oauth_client', $this->oauthClient );
+			// Store reference to the client.
+			$session->set( 'oauth_client', $this->oauthClient );
+		} catch ( OAuthException $e ) {
+			$this->addFlashMessage( 'notice', 'error-login' );
+			// Redirect below
+		}
 
 		// Redirect to callback, if given.
 		if ( $request->query->get( 'redirect' ) ) {