Refactor Token::bearerToken()

Author: sunaoka

src/Drivers/APNs/Token.php

@@ -4,6 +4,7 @@
 
 use Exception;
 use GuzzleHttp;
+use RuntimeException;
 use Sunaoka\PushNotifications\Drivers\Driver;
 use Sunaoka\PushNotifications\Drivers\Feedback;
 use Sunaoka\PushNotifications\Exceptions\OptionTypeError;
@@ -112,22 +113,31 @@ private function _send($device)
     private function bearerToken($authKey, $keyId, $teamId)
     {
         $key = openssl_pkey_get_private($authKey);
+        if ($key === false) {
+            throw new RuntimeException(openssl_error_string());  // @codeCoverageIgnore
+        }
+
+        $segments = [];
+        $segments[] = $this->encodeB64URLSafe(json_encode(['alg' => 'ES256', 'kid' => $keyId]));
+        $segments[] = $this->encodeB64URLSafe(json_encode(['iss' => $teamId, 'iat' => time()]));
 
-        $header = $this->jwtEncode(['alg' => 'ES256', 'kid' => $keyId]);
-        $claims = $this->jwtEncode(['iss' => $teamId, 'iat' => time()]);
+        $success = openssl_sign(implode('.', $segments), $signature, $key, 'sha256');
+        if ($success === false) {
+            throw new RuntimeException(openssl_error_string());  // @codeCoverageIgnore
+        }
 
-        openssl_sign("{$header}.{$claims}", $signature, $key, 'sha256');
+        $segments[] = $this->encodeB64URLSafe($signature);
 
-        return sprintf('bearer %s.%s.%s', $header, $claims, base64_encode($signature));
+        return 'bearer ' . implode('.', $segments);
     }
 
     /**
-     * @param array $input
+     * @param string $input
      *
      * @return string
      */
-    private function jwtEncode($input)
+    private function encodeB64URLSafe($input)
     {
-        return str_replace('=', '', strtr(base64_encode(json_encode($input)), '+/', '-_'));
+        return str_replace('=', '', strtr(base64_encode($input), '+/', '-_'));
     }
 }

tests/Fake/Certs/fake.p8

@@ -1,6 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGTAgEAMA0GCSqGSIb3DQEBAQUABH8wfQIBAAIXAM2ikj0CTh0vyIu5/zLk+fPF
-4K2g7xECAwEAAQIWXt1zDYY0ty5GHH78Up+IrvvbkC7XKQIMAOcX2sPRaFcqXAPH
-AgwA48xLmgs6aQPVRmcCC3IcFFkHCTepYgA3AgwA18HzRWcnHrojsjcCCzx4xaxZ
-N+kN9ocw
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg+K4GtiSGthyWghna
+pMC+R1chj8fvydobNaOl/UBoCGqhRANCAATneGLhyb/UZd0HBBQhSqsMGN4ede8N
+eEvlJmgZ8z7NYbQpUZehHwm4M64oW90uzmUgj0r+CSMfyksBK/2CZK6j
 -----END PRIVATE KEY-----