Change the file names expected for developer credentials, and other f…

…ixes.

.gitignore

@@ -8,4 +8,5 @@ composer.phar
 .php_cs.cache
 client_secret.json
 credentials.json
+token.json
 application_credentials.json

admin-sdk/directory/README.md

@@ -12,11 +12,11 @@ Before running this quickstart, be sure you have [Composer installed globally](h
 composer install
 ```
 
-### Download Service Account Credentials
+### Download Developer Credentials
 
-- Go to [APIs and Services](https://pantheon.corp.google.com/apis/credentials) and click "Create Credentials".
-  Select "Service Account Key" using the JSON key type, and select "Create".
-  Once downloaded, rename the credentials file to `~/credentials.json`
+- Follow the steps in the quickstart instructions to download your developer
+  credentials and save them in a file called `credentails.json` in this
+  directory.
 
 ## Run
 

admin-sdk/directory/quickstart.php

@@ -17,6 +17,10 @@
 // [START admin_sdk_directory_quickstart]
 require __DIR__ . '/vendor/autoload.php';
 
+if (php_sapi_name() != 'cli') {
+    throw new Exception('This application must be run on the command line.');
+}
+
 /**
  * Returns an authorized API client.
  * @return Google_Client the authorized client object
@@ -26,11 +30,11 @@ function getClient()
     $client = new Google_Client();
     $client->setApplicationName('G Suite Directory API PHP Quickstart');
     $client->setScopes(Google_Service_Directory::ADMIN_DIRECTORY_USER_READONLY);
-    $client->setAuthConfig('client_secret.json');
+    $client->setAuthConfig('credentials.json');
     $client->setAccessType('offline');
 
     // Load previously authorized credentials from a file.
-    $credentialsPath = expandHomeDirectory('credentials.json');
+    $credentialsPath = 'token.json';
     if (file_exists($credentialsPath)) {
         $accessToken = json_decode(file_get_contents($credentialsPath), true);
     } else {
@@ -60,19 +64,6 @@ function getClient()
     return $client;
 }
 
-/**
- * Expands the home directory alias '~' to the full path.
- * @param string $path the path to expand.
- * @return string the expanded path.
- */
-function expandHomeDirectory($path)
-{
-    $homeDirectory = getenv('HOME');
-    if (empty($homeDirectory)) {
-        $homeDirectory = getenv('HOMEDRIVE') . getenv('HOMEPATH');
-    }
-    return str_replace('~', realpath($homeDirectory), $path);
-}
 
 // Get the API client and construct the service object.
 $client = getClient();

admin-sdk/reports/README.md

@@ -12,11 +12,11 @@ Before running this quickstart, be sure you have [Composer installed globally](h
 composer install
 ```
 
-### Download Service Account Credentials
+### Download Developer Credentials
 
-- Go to [APIs and Services](https://pantheon.corp.google.com/apis/credentials) and click "Create Credentials".
-  Select "Service Account Key" using the JSON key type, and select "Create".
-  Once downloaded, rename the credentials file to `~/credentials.json`
+- Follow the steps in the quickstart instructions to download your developer
+  credentials and save them in a file called `credentails.json` in this
+  directory.
 
 ## Run