optimize, and remove all php-jwt code

csteipp · csteipp · commit 240edef4758d · 2015-09-10T10:50:36.000-07:00
diff --git a/MWOAuthClient.php b/MWOAuthClient.php
@@ -234,11 +234,12 @@ private function makeCurlCall( $url, $headers, $isPost, $postFields, MWOAuthClie
 
 
 	private function decodeJWT( $JWT, $secret ) {
+		$JWT = strtr( $JWT, '-_', '+/' );
 		list( $headb64, $bodyb64, $sigb64 ) = explode( '.', $JWT );
 
-		$header = json_decode( $this->urlsafeB64Decode( $headb64 ) );
-		$payload = json_decode( $this->urlsafeB64Decode( $bodyb64 ) );
-		$sig = $this->urlsafeB64Decode( $sigb64 );
+		$header = json_decode( base64_decode( $headb64 ) );
+		$payload = json_decode( base64_decode( $bodyb64 ) );
+		$sig = base64_decode( $sigb64 );
 
 		// MediaWiki will only use sha256 hmac (HS256) for now. This check makes sure
 		// an attacker doesn't return a JWT with 'none' signature type.
@@ -275,15 +276,6 @@ protected function validateJWT( $identity, $consumerKey, $expectedConnonicalServ
 		return true;
 	}
 
-	private function urlsafeB64Decode( $input ) {
-		$remainder = strlen( $input ) % 4;
-		if ( $remainder ) {
-			$padlen = 4 - $remainder;
-			$input .= str_repeat( '=', $padlen );
-		}
-		return base64_decode( strtr( $input, '-_', '+/' ) );
-	}
-
 	// Constant time comparison
 	private function compareHash( $hash1, $hash2 ) {
 		$result = strlen( $hash1 ) ^ strlen( $hash2 );
