Catch BitBucket API error

If the JSON returned by the API call can't be decoded, we now trigger
an error.

This properly catches the case of the user/password authentication which
was removed on 2022-03-01.

Fixes #399

Author: dregad

SourceBitBucket/SourceBitBucket.php

@@ -12,6 +12,11 @@ class SourceBitBucketPlugin extends MantisSourceGitBasePlugin {
 	const PLUGIN_VERSION = '2.2.0';
 	const FRAMEWORK_VERSION_REQUIRED = '2.5.0';
 
+	/**
+	 * Error constants
+	 */
+	const ERROR_BITBUCKET_API = 'bitbucket_api';
+
 	protected $main_url = "https://bitbucket.org/";
 	protected $api_url = 'https://bitbucket.org/api/2.0/';
 
@@ -26,6 +31,18 @@ public function register() {
 		$this->contact = 'sergey@mzsl.ru';
 	}
 
+	function errors() {
+		$t_errors_list = array(
+			self::ERROR_BITBUCKET_API,
+		);
+
+		foreach( $t_errors_list as $t_error ) {
+			$t_errors[$t_error] = plugin_lang_get( 'error_' . $t_error );
+		}
+
+		return array_merge( parent::errors(), $t_errors );
+	}
+
 	public function show_type() {
 		return plugin_lang_get( 'bitbucket' );
 	}
@@ -201,7 +218,12 @@ private function api_url( $p_path ) {
 
 	private function api_json_url( $p_repo, $p_url ) {
 		$t_data = $this->url_get( $p_repo, $p_url );
-		return json_decode( utf8_encode( $t_data ) );
+		$t_json = json_decode( utf8_encode( $t_data ) );
+		if( json_last_error() != JSON_ERROR_NONE ) {
+			error_parameters( $t_data );
+			plugin_error( self::ERROR_BITBUCKET_API );
+		}
+		return $t_json;
 	}
 
 	private function api_json_url_values( $p_repo, $p_url ) {
@@ -342,7 +364,7 @@ public function import_commits( $p_repo, $p_commit_ids, $p_branch = '' ) {
 				echo "Looking up target commit for $t_branch ... ";
 				$t_url  = $this->api_url( "repositories/$t_username/$t_reponame/refs/branches/$t_branch" );
 				$t_json = $this->api_json_url( $p_repo, $t_url );
-				if( false !== $t_json ) {
+				if( null !== $t_json ) {
 					$t_branch = $t_json->target->hash;
 				}
 			}

SourceBitBucket/lang/strings_english.txt

@@ -16,3 +16,5 @@ $s_plugin_SourceBitBucket_repo_authorization_failed = 'Sorry, MantisBT could not
 
 $s_plugin_SourceBitBucket_oauth_authorization = 'BitBucket OAuth Authorization';
 $s_plugin_SourceBitBucket_back_repo = 'Back to Repository';
+
+$s_plugin_SourceBitBucket_error_bitbucket_api = 'BitBucket API call failed with the following error message:<br><em>%1$s</em>';