X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryAuthManagerInfo.php;h=661ec5ab647c589b1e6536e7f6ef1c6e08cd5c71;hb=9012dfe523854a125e781d6fb7d255431615d95a;hp=b591f9c00a5d099c446074c90ad6d7900991b938;hpb=5fd224c00b940f75c1f83e56b99961be94bde70a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryAuthManagerInfo.php b/includes/api/ApiQueryAuthManagerInfo.php
index b591f9c00a..661ec5ab64 100644
--- a/includes/api/ApiQueryAuthManagerInfo.php
+++ b/includes/api/ApiQueryAuthManagerInfo.php
@@ -43,7 +43,6 @@ class ApiQueryAuthManagerInfo extends ApiQueryBase {
 			'canauthenticatenow' => $manager->canAuthenticateNow(),
 			'cancreateaccounts' => $manager->canCreateAccounts(),
 			'canlinkaccounts' => $manager->canLinkAccounts(),
-			'haspreservedstate' => $helper->getPreservedRequest() !== null,
 		];
 
 		if ( $params['securitysensitiveoperation'] !== null ) {
@@ -53,10 +52,27 @@ class ApiQueryAuthManagerInfo extends ApiQueryBase {
 		}
 
 		if ( $params['requestsfor'] ) {
-			$reqs = $manager->getAuthenticationRequests( $params['requestsfor'], $this->getUser() );
+			$action = $params['requestsfor'];
+
+			$preservedReq = $helper->getPreservedRequest();
+			if ( $preservedReq ) {
+				$ret += [
+					'haspreservedstate' => $preservedReq->hasStateForAction( $action ),
+					'hasprimarypreservedstate' => $preservedReq->hasPrimaryStateForAction( $action ),
+					'preservedusername' => (string)$preservedReq->username,
+				];
+			} else {
+				$ret += [
+					'haspreservedstate' => false,
+					'hasprimarypreservedstate' => false,
+					'preservedusername' => '',
+				];
+			}
+
+			$reqs = $manager->getAuthenticationRequests( $action, $this->getUser() );
 
 			// Filter out blacklisted requests, depending on the action
-			switch ( $params['requestsfor'] ) {
+			switch ( $action ) {
 				case AuthManager::ACTION_CHANGE:
 					$reqs = ApiAuthManagerHelper::blacklistAuthenticationRequests(
 						$reqs, $this->getConfig()->get( 'ChangeCredentialsBlacklist' )
@@ -75,8 +91,8 @@ class ApiQueryAuthManagerInfo extends ApiQueryBase {
 		$this->getResult()->addValue( [ 'query' ], $this->getModuleName(), $ret );
 	}
 
-	public function getCacheMode( $params ) {
-		return 'public';
+	public function isReadMode() {
+		return false;
 	}
 
 	public function getAllowedParams() {
@@ -95,18 +111,18 @@ class ApiQueryAuthManagerInfo extends ApiQueryBase {
 					AuthManager::ACTION_UNLINK,
 				],
 			],
-		] + ApiAuthManagerHelper::getStandardParams( '', 'mergerequestfields' );
+		] + ApiAuthManagerHelper::getStandardParams( '', 'mergerequestfields', 'messageformat' );
 	}
 
 	protected function getExamplesMessages() {
 		return [
 			'action=query&meta=authmanagerinfo&amirequestsfor=' . urlencode( AuthManager::ACTION_LOGIN )
-				=> 'apihelp-query+filerepoinfo-example-login',
+				=> 'apihelp-query+authmanagerinfo-example-login',
 			'action=query&meta=authmanagerinfo&amirequestsfor=' . urlencode( AuthManager::ACTION_LOGIN ) .
 				'&amimergerequestfields=1'
-				=> 'apihelp-query+filerepoinfo-example-login-merged',
+				=> 'apihelp-query+authmanagerinfo-example-login-merged',
 			'action=query&meta=authmanagerinfo&amisecuritysensitiveoperation=foo'
-				=> 'apihelp-query+filerepoinfo-example-securitysensitiveoperation',
+				=> 'apihelp-query+authmanagerinfo-example-securitysensitiveoperation',
 		];
 	}