try to not make another request to authorize and rather use the response of the POST /session request

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>

Author: julien-nc

tests/integration/GithubOauthIntegrationTest.php

@@ -223,6 +223,13 @@ private function loginToGitHub(string $authorizeUrl): array {
 		$redirectHistory = $loginResponse->getHeader('X-Guzzle-Redirect-History');
 		if (!empty($redirectHistory)) {
 			$finalUrl = end($redirectHistory);
+			if (str_contains($finalUrl, 'code=')) {
+				return [
+					'status' => 'redirect_with_code',
+					'redirect_url' => $finalUrl,
+					'body' => $loginBody,
+				];
+			}
 			if (str_contains($finalUrl, 'oauth/authorize')) {
 				return [
 					'status' => 'authorize_page',
@@ -231,15 +238,24 @@ private function loginToGitHub(string $authorizeUrl): array {
 			}
 		}
 
+		if (str_contains($loginBody, 'oauth/authorize') || str_contains($loginBody, 'Authorize')) {
+			return [
+				'status' => 'authorize_page',
+				'body' => $loginBody,
+			];
+		}
+
 		return [
 			'status' => 'logged_in',
 			'body' => $loginBody,
 		];
 	}
 
-	private function handleAuthorizePage(string $authorizeUrl): string {
-		$response = $this->client->get($authorizeUrl);
-		$body = $response->getBody()->getContents();
+	private function handleAuthorizePage(string $authorizeUrl, ?string $body = null): string {
+		if ($body === null) {
+			$response = $this->client->get($authorizeUrl);
+			$body = $response->getBody()->getContents();
+		}
 
 		$doc = new DOMDocument();
 		libxml_use_internal_errors(true);
@@ -305,9 +321,12 @@ public function testOAuthLogin(): void {
 			$this->fail('Invalid GitHub credentials');
 		}
 
-		echo 'STATUS of login: ' . $loginResult['status'] . "\n\n";
 		$redirectUrl = null;
-		if ($loginResult['status'] === 'authorize_page' || $loginResult['status'] === 'logged_in') {
+		if ($loginResult['status'] === 'redirect_with_code') {
+			$redirectUrl = $loginResult['redirect_url'];
+		} elseif ($loginResult['status'] === 'authorize_page') {
+			$redirectUrl = $this->handleAuthorizePage($authorizeUrl, $loginResult['body']);
+		} elseif ($loginResult['status'] === 'logged_in') {
 			$redirectUrl = $this->handleAuthorizePage($authorizeUrl);
 		} else {
 			$this->fail('Unexpected login status: ' . $loginResult['status']);