Merge pull request #13 from tyteen4a03/master

Upgrade to Google API 2.0

Author: pulkitjalan

README.md

@@ -93,33 +93,21 @@ return [
     | Google service account
     |----------------------------------------------------------------------------
     |
-    | Set the information below to use assert credentials
-    | Leave blank to use app engine or compute engine.
+    | Set the credentials JSON's location to use assert credentials, otherwise
+    | app engine or compute engine will be used.
     |
     */
-    'service' => [
-        /*
-        | Example [email protected]
-        */
-        'account' => '',
-
-        /*
-        | Example ['https://www.googleapis.com/auth/cloud-platform']
-        */
-        'scopes' => [],
-
-        /*
-        | Path to key file
-        | Example storage_path().'/key/google.p12'
-        */
-        'key' => '',
-    ]
+    'service' =>  ''
 ];
+
 ```
 
-To use the Google Cloud Platform Services you can either set the information in the config file under `service`, or if running under compute engine (or app engine) leave it blank.
+To use Google Cloud Platform services, enter the location to the service account JSON file **(not the JSON string itself)**. To use App Engine or Computer Engine, leave it blank.
+
+From [Google's upgrading document](https://github.com/google/google-api-php-client/blob/master/UPGRADING.md):
+
+> Note: P12s are deprecated in favor of service account JSON, which can be generated in the Credentials section of Google Developer Console.
 
-`NOTE: service => ['account'] is the service Email Address and not the Client ID!`
 
 Get `Google_Client`
 ```php

composer.json

@@ -12,7 +12,7 @@
     "require": {
         "php": ">=5.4.0",
         "illuminate/support": "~5",
-        "google/apiclient": "1.*"
+        "google/apiclient": "^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "4.*",

src/Client.php

@@ -98,8 +98,7 @@ protected function auth($userEmail='')
         }
 
         // fallback to compute engine
-        $auth = new \Google_Auth_ComputeEngine($this->client);
-        $this->client->setAuth($auth);
+        $this->client->useApplicationDefaultCredentials();
     }
 
     /**
@@ -109,18 +108,12 @@ protected function auth($userEmail='')
      */
     protected function useAssertCredentials($userEmail='')
     {
-        $account = array_get($this->config, 'service.account', '');
-        if (!empty($account)) {
-            $cert = new \Google_Auth_AssertionCredentials(
-                array_get($this->config, 'service.account', ''),
-                array_get($this->config, 'service.scopes', []),
-                file_get_contents(array_get($this->config, 'service.key', ''))
-            );
-            if($userEmail){
-                $cert->sub=$userEmail;
+        $serviceJsonUrl = array_get($this->config, 'service', '');
+        if (!empty($serviceJsonUrl)) {
+            $this->client->setAuthConfig($serviceJsonUrl);
+            if ($userEmail) {
+                $this->client->setSubject($userEmail);
             }
-            $this->client->setAssertionCredentials($cert);
-
             return true;
         }
 
@@ -137,9 +130,7 @@ protected function useAppEngine()
     {
         // if running on app engine
         if ($this->client->isAppEngine()) {
-            $auth = new \Google_Auth_AppIdentity($this->client);
-            $this->client->setAuth($auth);
-
+            $this->client->useApplicationDefaultCredentials();
             return true;
         }
 

src/config/config.php

@@ -40,30 +40,9 @@
     | Google service account
     |----------------------------------------------------------------------------
     |
-    | Enable and set the information below to use assert credentials
-    | Enable and leave blank to use app engine or compute engine.
+    | Set the credentials JSON's location to use assert credentials, otherwise
+    | app engine or compute engine will be used.
     |
     */
-    'service' => [
-        /*
-        | Enable service account auth or not.
-        */
-        'enable' => env('GOOGLE_SERVICE_ENABLED', false),
-
-        /*
-        | Example [email protected]
-        */
-        'account' => env('GOOGLE_SERVICE_ACCOUNT', ''),
-
-        /*
-        | Example ['https://www.googleapis.com/auth/cloud-platform']
-        */
-        'scopes' => [],
-
-        /*
-        | Path to key file
-        | Example storage_path().'/key/google.p12'
-        */
-        'key' => storage_path().env('GOOGLE_SERVICE_KEY', ''),
-    ],
+    'service' => env('GOOGLE_SERVICE_ACCOUNT_JSON_LOCATION', '')
 ];

tests/ClientTest.php

@@ -44,7 +44,11 @@ public function testMagicMethodException()
         $client->getAuthTest();
     }
 
-    public function testDefaultAuth()
+    /*
+     * TODO: Rewrite these tests
+     */
+
+    /*public function testDefaultAuth()
     {
         $client = new \PulkitJalan\Google\Client([]);
 
@@ -89,5 +93,5 @@ public function testComputeEngineCredentials()
         ]);
 
         $this->assertInstanceOf('Google_Auth_ComputeEngine', $client->getAuth());
-    }
+    }*/
 }