X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fauth%2FCreateFromLoginAuthenticationRequest.php;h=ddeb13d9d6f54aed06714e5b7f625fd7cfee6abc;hb=c6adf0408cee1c0be97c222aa2689ec5800a84a4;hp=949302d8bc402c716af1a82004bd1802f92d1092;hpb=ff244610658099d90283a819b167baa824d90e93;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/auth/CreateFromLoginAuthenticationRequest.php b/includes/auth/CreateFromLoginAuthenticationRequest.php
index 949302d8bc..ddeb13d9d6 100644
--- a/includes/auth/CreateFromLoginAuthenticationRequest.php
+++ b/includes/auth/CreateFromLoginAuthenticationRequest.php
@@ -25,7 +25,8 @@ namespace MediaWiki\Auth;
  * This transfers state between the login and account creation flows.
  *
  * AuthManager::getAuthenticationRequests() won't return this type, but it
- * may be passed to AuthManager::beginAccountCreation() anyway.
+ * may be passed to AuthManager::beginAuthentication() or
+ * AuthManager::beginAccountCreation() anyway.
  *
  * @ingroup Auth
  * @since 1.27
@@ -50,6 +51,7 @@ class CreateFromLoginAuthenticationRequest extends AuthenticationRequest {
 	) {
 		$this->createRequest = $createRequest;
 		$this->maybeLink = $maybeLink;
+		$this->username = $createRequest ? $createRequest->username : null;
 	}
 
 	public function getFieldInfo() {
@@ -59,4 +61,36 @@ class CreateFromLoginAuthenticationRequest extends AuthenticationRequest {
 	public function loadFromSubmission( array $data ) {
 		return true;
 	}
+
+	/**
+	 * Indicate whether this request contains any state for the specified
+	 * action.
+	 * @param string $action One of the AuthManager::ACTION_* constants
+	 * @return boolean
+	 */
+	public function hasStateForAction( $action ) {
+		switch ( $action ) {
+			case AuthManager::ACTION_LOGIN:
+				return (bool)$this->maybeLink;
+			case AuthManager::ACTION_CREATE:
+				return $this->maybeLink || $this->createRequest;
+			default:
+				return false;
+		}
+	}
+
+	/**
+	 * Indicate whether this request contains state for the specified
+	 * action sufficient to replace other primary-required requests.
+	 * @param string $action One of the AuthManager::ACTION_* constants
+	 * @return boolean
+	 */
+	public function hasPrimaryStateForAction( $action ) {
+		switch ( $action ) {
+			case AuthManager::ACTION_CREATE:
+				return (bool)$this->createRequest;
+			default:
+				return false;
+		}
+	}
 }