bump google auth to v0.4 and add JWT3.0 support as a result

Author: bshaffer

composer.json

@@ -7,7 +7,8 @@
     "license": "Apache-2.0",
     "require": {
         "php": ">=5.4",
-        "google/auth": "v0.3",
+        "google/auth": "~v0.4",
+        "firebase/php-jwt": "~2.0|~3.0",
         "monolog/monolog": "^1.17",
         "phpseclib/phpseclib": "~2.0",
         "guzzlehttp/guzzle": "5.2.*"

src/Google/AccessToken/Verify.php

@@ -54,6 +54,7 @@ public function __construct(ClientInterface $http = null, CacheInterface $cache
 
     $this->http = $http;
     $this->cache = $cache;
+    $this->jwt = $this->getJwtService();
   }
 
   /**
@@ -74,14 +75,14 @@ public function verifyIdToken($idToken, $audience = null)
     // Check signature
     $certs = $this->getFederatedSignonCerts();
     foreach ($certs as $cert) {
-      $modulus = new BigInteger(JWT::urlsafeB64Decode($cert['n']), 256);
-      $exponent = new BigInteger(JWT::urlsafeB64Decode($cert['e']), 256);
+      $modulus = new BigInteger($this->jwt->urlsafeB64Decode($cert['n']), 256);
+      $exponent = new BigInteger($this->jwt->urlsafeB64Decode($cert['e']), 256);
 
       $rsa = new RSA();
       $rsa->loadKey(array('n' => $modulus, 'e' => $exponent));
 
       try {
-        $payload = JWT::decode(
+        $payload = $this->jwt->decode(
             $idToken,
             $rsa->getPublicKey(),
             array('RS256')
@@ -185,4 +186,13 @@ private function getFederatedSignOnCerts()
 
     return $certs['keys'];
   }
+
+  private function getJwtService()
+  {
+    if (class_exists('\Firebase\JWT\JWT')) {
+      return new \Firebase\JWT\JWT;
+    }
+
+    return new \JWT;
+  }
 }

tests/Google/AccessToken/VerifyTest.php

@@ -33,6 +33,7 @@ public function testValidateIdToken()
   {
     $this->checkToken();
 
+    $jwt = $this->getJwtService();
     $client = $this->getClient();
     $token = $client->getAccessToken();
     if ($client->isAccessTokenExpired()) {
@@ -41,7 +42,7 @@ public function testValidateIdToken()
     $segments = explode('.', $token['id_token']);
     $this->assertEquals(3, count($segments));
     // Extract the client ID in this case as it wont be set on the test client.
-    $data = json_decode(JWT::urlSafeB64Decode($segments[1]));
+    $data = json_decode($jwt->urlSafeB64Decode($segments[1]));
     $verify = new Google_AccessToken_Verify();
     $payload = $verify->verifyIdToken($token['id_token'], $data->aud);
     $this->assertTrue(isset($payload['sub']));
@@ -51,10 +52,19 @@ public function testValidateIdToken()
     // caching for this test to make sense. Not sure how to do that
     // at the moment.
     $client = $this->getClient();
-    $data = json_decode(JWT::urlSafeB64Decode($segments[1]));
+    $data = json_decode($jwt->urlSafeB64Decode($segments[1]));
     $verify = new Google_AccessToken_Verify();
     $payload = $verify->verifyIdToken($token['id_token'], $data->aud);
     $this->assertTrue(isset($payload['sub']));
     $this->assertTrue(strlen($payload['sub']) > 0);
   }
+
+  private function getJwtService()
+  {
+    if (class_exists('\Firebase\JWT\JWT')) {
+      return new \Firebase\JWT\JWT;
+    }
+
+    return new \JWT;
+  }
 }