updated tests

Author: pulkitjalan

README.md

@@ -97,7 +97,17 @@ return [
     | app engine or compute engine will be used.
     |
     */
-    'service' =>  ''
+    'service' =>  [
+        /*
+        | Enable service account auth or not.
+        */
+        'enabled' => false,
+
+        /*
+        | Path to service account json file
+        */
+        'file' => '',
+    ],
 ];
 
 ```

src/Client.php

@@ -20,7 +20,7 @@ class Client
      * @param array $config
      * @param string $userEmail
      */
-    public function __construct(array $config, $userEmail='')
+    public function __construct(array $config, $userEmail = '')
     {
         $this->config = $config;
 
@@ -85,56 +85,37 @@ public function make($service)
      * @param $userEmail
      * @return void
      */
-    protected function auth($userEmail='')
+    protected function auth($userEmail = '')
     {
         // see (and use) if user has set Credentials
         if ($this->useAssertCredentials($userEmail)) {
             return;
         }
 
-        // check (and use) if running on app engine
-        if ($this->useAppEngine()) {
-            return;
-        }
-
-        // fallback to compute engine
+        // fallback to compute engine or app engine
         $this->client->useApplicationDefaultCredentials();
     }
 
     /**
      * Determine and use credentials if user has set them.
      * @param $userEmail
-     * @return boolean used or not
+     * @return bool used or not
      */
-    protected function useAssertCredentials($userEmail='')
+    protected function useAssertCredentials($userEmail = '')
     {
-        $serviceJsonUrl = array_get($this->config, 'service', '');
-        if (!empty($serviceJsonUrl)) {
-            $this->client->setAuthConfig($serviceJsonUrl);
-            if ($userEmail) {
-                $this->client->setSubject($userEmail);
-            }
-            return true;
-        }
+        $serviceJsonUrl = array_get($this->config, 'service.file', '');
 
-        return false;
-    }
+        if (empty($serviceJsonUrl)) {
+            return false;
+        }
 
-    /**
-     * Determine and use app engine credentials
-     * if running on app engine.
-     *
-     * @return boolean used or not
-     */
-    protected function useAppEngine()
-    {
-        // if running on app engine
-        if ($this->client->isAppEngine()) {
-            $this->client->useApplicationDefaultCredentials();
-            return true;
+        $this->client->setAuthConfig($serviceJsonUrl);
+        
+        if ($userEmail) {
+            $this->client->setSubject($userEmail);
         }
 
-        return false;
+        return true;
     }
 
     /**
@@ -155,4 +136,4 @@ public function __call($method, $parameters)
 
         throw new \BadMethodCallException(sprintf('Method [%s] does not exist.', $method));
     }
-}
+}

src/config/config.php

@@ -44,5 +44,15 @@
     | app engine or compute engine will be used.
     |
     */
-    'service' => env('GOOGLE_SERVICE_ACCOUNT_JSON_LOCATION', '')
+    'service' => [
+        /*
+        | Enable service account auth or not.
+        */
+        'enable' => env('GOOGLE_SERVICE_ENABLED', false),
+
+        /*
+        | Path to service account json file
+        */
+        'file' => env('GOOGLE_SERVICE_ACCOUNT_JSON_LOCATION', '')
+    ],
 ];

tests/ClientTest.php

@@ -44,54 +44,22 @@ public function testMagicMethodException()
         $client->getAuthTest();
     }
 
-    /*
-     * TODO: Rewrite these tests
-     */
-
-    /*public function testDefaultAuth()
+    public function testNoCredentials()
     {
         $client = new \PulkitJalan\Google\Client([]);
 
-        $this->assertInstanceOf('Google_Auth_OAuth2', $client->getAuth());
-    }
-
-    public function testAssertCredentials()
-    {
-        $client = new \PulkitJalan\Google\Client([
-            'service' => [
-                'enable' => true,
-                'account' => 'name',
-                'scopes'  => ['scope'],
-                'key'     => __DIR__.'/data/cert.p12',
-            ],
-        ]);
-
-        $this->assertInstanceOf('Google_Auth_OAuth2', $client->getAuth());
+        $this->assertFalse($client->isUsingApplicationDefaultCredentials());
     }
 
-    public function testAppEngineCredentials()
+    public function testDefaultCredentials()
     {
-        $_SERVER['SERVER_SOFTWARE'] = 'Google App Engine';
-
         $client = new \PulkitJalan\Google\Client([
             'service' => [
                 'enable' => true,
+                'file'   => __DIR__.'/data/test.json',
             ],
         ]);
 
-        $this->assertInstanceOf('Google_Auth_AppIdentity', $client->getAuth());
-
-        unset($_SERVER['SERVER_SOFTWARE']);
+        $this->assertTrue($client->isUsingApplicationDefaultCredentials());
     }
-
-    public function testComputeEngineCredentials()
-    {
-        $client = new \PulkitJalan\Google\Client([
-            'service' => [
-                'enable' => true,
-            ],
-        ]);
-
-        $this->assertInstanceOf('Google_Auth_ComputeEngine', $client->getAuth());
-    }*/
 }

tests/data/cert.p12

@@ -0,0 +1,12 @@
+{
+  "type": "service_account",
+  "project_id": "12345",
+  "private_key_id": "12345",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC4Oj1gs8sOUm43\n325pnsaW0tkk6kNSWd0z2OQop7QIyXpmEYXLA2yZEqfsEyaCZey5WC4EE69AdkHZ\nDu+RpoKl4gc46elqOzxFSjaY3T3VY0nBbCFdtuHfED8+1VPGbGBe/XqVDWlrLs4o\n4/AZTA2gzt6+rXZIs0IIyvCLJdtP34uViOh/orjdnEZas9aBwzqcjUgDtj6G8UGi\nKpa4b2suyaA30/c7PJCqNciPwc1rpqXnl0Mrg/fmv9A97mpJdCgfvN2dE6CeTjnQ\nqG/zM5pNrv/dwAjf6GwFJK0LUta6tLv6r4WrSUAJCk9lGy2sCALsFEUm2SGaMNab\njBB1S4qvAgMBAAECggEBAJhJHD95mdxNa2qoOT75zrMSLAlF1MyYGDApk8C/kCTL\nV3BT/8LnW7fVIhYVZnnYAyza5X7dPrsMhjYFEKfXepvhEZLiid4UhSfJxwPprplb\n77YByjsLV/7qET3BXfTh1W/wHIplgcTl9ej7MpfWtFU/bAU2olXJU/6sstZzPqzw\neAFT6k72XQ9+t6xT6g5/M3apP9MncATzmMU8+DSZqC8+Kg3/WFZQnZNyXvG+EM2j\njOxmBmzrewqRd5pEbHJq0G/e6otb04DXXmJXfQHRFJaGgKC6aaLVZtyk5W3XRx2d\n21OsnC+5le4D4y3nwZwtyNl9beWEu9QxUvY2Fp4wQwECgYEA3EnBoTQc9gq66wB2\nT4D7ONzqzKJKsNqasB4IYYC19Wj0uck6xv3BCIHmH5YQwjhMSbK6YKOjpFE66/1u\nMVvRvCBRFeadOU5+pCxkNInhNdjCYZrPuNB2KoHpxX76LiKXdpGvgo3T3IdeUobr\ne6Jq5IJrzu0L85k0QrpO3hwdnW8CgYEA1kfrx7O1HE6Hdmy86nuNu2Ll2Ln4ZYOR\nd/J5wWDiY4TCeVQelCOeul7YBu/blItZjd80JHARz/DBxjov/T21Agxo57GX7oZD\negldYmQHYxtq+4RLIqk/WDklBmcAgRqD2R9boY9an9XBkXoTm/qqQqRWklG4FCHL\njyWma6YMxsECgYEAsbv8s2EFoOqFZ4hm7LyzdXihJVwoIUsvlbuVjX240fnNwnx+\npQEmFwQftQpyGRItUyUWRVSierhjbvZ6Su7HaR817RK1dgBEI5gBfXZls/lg1DmB\nMZ9YR/GruQI7PrAAPtVKo25lKsA5tSJQqt8fmaE09K7Dftb0mIYTjhdnOZcCgYBL\nZz1ppoeBIr9fHEklJML0Xo6pWEZ+KmqPnlz3mNHjTxzXcqMadbkv1rurJctmc/Xk\nm9pXgwki/Z6h3FiOjq8zu38vK0NhhPQ7BRVY0/YuF7gEQcHcwVNIFUhPCvQIhHgv\nfnXdXwoCBV0Zia9iXlSdCBhdjF6S6JwzH1WSoHcbgQKBgFCEElMvjp8JJ+RCCcmP\nEF9C33dNL5+WrPC/zhIwrxsXYIq2fw9bGZ4wgbrfVMLa2Go1uPc7yfHxHZd/Bo9C\n30gOYduKt5+/d6OkQgzITOczNfKtIOodjjSzwnQPICDNwjjxzQ47MlHfKraO/ADJJ\ngeJTZGxlf1Oyx+mSWHKda7eX\n-----END PRIVATE KEY-----\n",
+  "client_email": "[email protected]",
+  "client_id": "12345",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://accounts.google.com/o/oauth2/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/12345%40api-project-12345.apps.iam.gserviceaccount.com"
+}