Merge "API: Pretty-printed responses should always use HTTP status 200"

diff --combined includes/api/ApiMain.php
index ce2f930,a2da166..38299b4
--- 1/includes/api/ApiMain.php
--- 2/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@@ -572,11 -572,7 +572,7 @@@ class ApiMain extends ApiBase 
  
                $response = $this->getRequest()->response();
                $headerStr = 'MediaWiki-API-Error: ' . $errCode;
-               if ( $e->getCode() === 0 ) {
-                       $response->header( $headerStr );
-               } else {
-                       $response->header( $headerStr, true, $e->getCode() );
-               }
+               $response->header( $headerStr );
  
                // Reset and print just the error message
                ob_clean();
@@@ -585,7 -581,7 +581,7 @@@
                $this->createErrorPrinter();
  
                try {
-                       $this->printResult( true );
+                       $this->printResult( $e->getCode() );
                } catch ( UsageException $ex ) {
                        // The error printer itself is failing. Try suppressing its request
                        // parameters and redo.
@@@ -595,7 -591,10 +591,10 @@@
                        $this->mPrinter = null;
                        $this->createErrorPrinter();
                        $this->mPrinter->forceDefaultParams();
-                       $this->printResult( true );
+                       if ( $e->getCode() ) {
+                               $response->statusHeader( 200 ); // Reset in case the fallback doesn't want a non-200
+                       }
+                       $this->printResult( $e->getCode() );
                }
        }
  
@@@ -636,8 -635,8 +635,8 @@@
         * If the parameter and the header do match, the header is checked against $wgCrossSiteAJAXdomains
         * and $wgCrossSiteAJAXdomainExceptions, and if the origin qualifies, the appropriate CORS
         * headers are set.
 -       * http://www.w3.org/TR/cors/#resource-requests
 -       * http://www.w3.org/TR/cors/#resource-preflight-requests
 +       * https://www.w3.org/TR/cors/#resource-requests
 +       * https://www.w3.org/TR/cors/#resource-preflight-requests
         *
         * @return bool False if the caller should abort (403 case), true otherwise (all other cases)
         */
@@@ -719,7 -718,7 +718,7 @@@
  
                        $response->header( "Access-Control-Allow-Origin: $allowOrigin" );
                        $response->header( "Access-Control-Allow-Credentials: $allowCredentials" );
 -                      // http://www.w3.org/TR/resource-timing/#timing-allow-origin
 +                      // https://www.w3.org/TR/resource-timing/#timing-allow-origin
                        if ( $allowTiming !== false ) {
                                $response->header( "Timing-Allow-Origin: $allowTiming" );
                        }
@@@ -1441,7 -1440,7 +1440,7 @@@
                        MWDebug::appendDebugInfoToApiResult( $this->getContext(), $this->getResult() );
  
                        // Print result data
-                       $this->printResult( false );
+                       $this->printResult();
                }
        }
  
@@@ -1621,15 -1620,18 +1620,18 @@@
        /**
         * Print results using the current printer
         *
-        * @param bool $isError
+        * @param int $httpCode HTTP status code, or 0 to not change
         */
-       protected function printResult( $isError ) {
+       protected function printResult( $httpCode = 0 ) {
                if ( $this->getConfig()->get( 'DebugAPI' ) !== false ) {
                        $this->setWarning( 'SECURITY WARNING: $wgDebugAPI is enabled' );
                }
  
                $printer = $this->mPrinter;
                $printer->initPrinter( false );
+               if ( $httpCode ) {
+                       $printer->setHttpStatus( $httpCode );
+               }
                $printer->execute();
                $printer->closePrinter();
        }

diff --combined resources/src/mediawiki.special/mediawiki.special.apisandbox.js
index a206328,af4a8e9..64cfcf5
--- 1/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
--- 2/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
+++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
@@@ -26,11 -26,7 +26,11 @@@
                        },
                        apiCheckValid: function () {
                                var that = this;
 -                              return this.isValid().done( function ( ok ) {
 +                              return this.getValidity().then( function () {
 +                                      return $.Deferred().resolve( true ).promise();
 +                              }, function () {
 +                                      return $.Deferred().resolve( false ).promise();
 +                              } ).done( function ( ok ) {
                                        ok = ok || suppressErrors;
                                        that.setIcon( ok ? null : 'alert' );
                                        that.setIconTitle( ok ? '' : mw.message( 'apisandbox-alert-field' ).plain() );
@@@ -39,12 -35,9 +39,12 @@@
                },
  
                dateTimeInputWidget: {
 -                      isValid: function () {
 -                              var ok = !Util.apiBool( this.paramInfo.required ) || this.getApiValue() !== '';
 -                              return $.Deferred().resolve( ok ).promise();
 +                      getValidity: function () {
 +                              if ( !Util.apiBool( this.paramInfo.required ) || this.getApiValue() !== '' ) {
 +                                      return $.Deferred().resolve().promise();
 +                              } else {
 +                                      return $.Deferred().reject().promise();
 +                              }
                        }
                },
  
@@@ -379,7 -372,7 +379,7 @@@
                                        } );
                                        widget.setIcon = widget.input.setIcon.bind( widget.input );
                                        widget.setIconTitle = widget.input.setIconTitle.bind( widget.input );
 -                                      widget.isValid = widget.input.isValid.bind( widget.input );
 +                                      widget.getValidity = widget.input.getValidity.bind( widget.input );
                                        widget.paramInfo = pi;
                                        $.extend( widget, WidgetMethods.textInputWidget );
                                        if ( Util.apiBool( pi.enforcerange ) ) {
@@@ -395,7 -388,7 +395,7 @@@
                                        } );
                                        widget.setIcon = widget.input.setIcon.bind( widget.input );
                                        widget.setIconTitle = widget.input.setIconTitle.bind( widget.input );
 -                                      widget.isValid = widget.input.isValid.bind( widget.input );
 +                                      widget.getValidity = widget.input.getValidity.bind( widget.input );
                                        widget.input.setValidation( function ( value ) {
                                                return value === 'max' || widget.validateNumber( value );
                                        } );
@@@ -976,6 -969,14 +976,14 @@@
                                                        if ( data.modules.length ) {
                                                                mw.loader.load( data.modules );
                                                        }
+                                                       if ( data.status && data.status !== 200 ) {
+                                                               $( '<div>' )
+                                                                       .addClass( 'api-pretty-header api-pretty-status' )
+                                                                       .append(
+                                                                               mw.message( 'api-format-prettyprint-status', data.status, data.statustext ).parse()
+                                                                       )
+                                                                       .appendTo( $result );
+                                                       }
                                                        $result.append( Util.parseHTML( data.html ) );
                                                        loadTime = data.time;
                                                } else if ( ( m = data.match( /<pre[ >][\s\S]*<\/pre>/ ) ) ) {