From e2b759952d8d664311f2ee8d86e2973a38369029 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gerg=C5=91=20Tisza?= <tgr.huwiki@gmail.com>
Date: Wed, 24 Aug 2016 19:24:51 -0700
Subject: [PATCH] Fix AuthManagerSpecialPage submit button logic

Bug: T143840
Change-Id: I7fe442f5044c3dce27f89d83b8003dc6e4170296
---
 .../specialpage/AuthManagerSpecialPage.php    | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/includes/specialpage/AuthManagerSpecialPage.php b/includes/specialpage/AuthManagerSpecialPage.php
index 68f0d00ddb..3adf5a6fa2 100644
--- a/includes/specialpage/AuthManagerSpecialPage.php
+++ b/includes/specialpage/AuthManagerSpecialPage.php
@@ -554,38 +554,46 @@ abstract class AuthManagerSpecialPage extends SpecialPage {
 	}
 
 	/**
-	 * Returns true if the form built from the given AuthenticationRequests has fields which take
-	 * values. If all available providers use the redirect flow, the form might contain nothing
-	 * but submit buttons, in which case we should not add an extra submit button which does nothing.
+	 * Returns true if the form built from the given AuthenticationRequests needs a submit button.
+	 * Providers using redirect flow (e.g. Google login) need their own submit buttons; if using
+	 * one of those custom buttons is the only way to proceed, there is no point in displaying the
+	 * default button which won't do anything useful.
 	 *
 	 * @param AuthenticationRequest[] $requests An array of AuthenticationRequests from which the
 	 *  form will be built
 	 * @return bool
 	 */
 	protected function needsSubmitButton( array $requests ) {
+		$customSubmitButtonPresent = false;
+
+		// Secondary and preauth providers always need their data; they will not care what button
+		// is used, so they can be ignored. So can OPTIONAL buttons createdby primary providers;
+		// that's the point in being optional. Se we need to check whether all primary providers
+		// have their own buttons and whether there is at least one button present.
 		foreach ( $requests as $req ) {
-			if ( $req->required === AuthenticationRequest::PRIMARY_REQUIRED &&
-				$this->doesRequestNeedsSubmitButton( $req )
-			) {
-				return true;
+			if ( $req->required === AuthenticationRequest::PRIMARY_REQUIRED ) {
+				if ( $this->hasOwnSubmitButton( $req ) ) {
+					$customSubmitButtonPresent = true;
+				} else {
+					return true;
+				}
 			}
 		}
-		return false;
+		return !$customSubmitButtonPresent;
 	}
 
 	/**
-	 * Checks if the given AuthenticationRequest needs a submit button or not.
-	 *
-	 * @param AuthenticationRequest $req The request to check
+	 * Checks whether the given AuthenticationRequest has its own submit button.
+	 * @param AuthenticationRequest $req
 	 * @return bool
 	 */
-	protected function doesRequestNeedsSubmitButton( AuthenticationRequest $req ) {
+	protected function hasOwnSubmitButton( AuthenticationRequest $req ) {
 		foreach ( $req->getFieldInfo() as $field => $info ) {
 			if ( $info['type'] === 'button' ) {
-				return false;
+				return true;
 			}
 		}
-		return true;
+		return false;
 	}
 
 	/**
-- 
2.20.1