Added the ability to do $cert->sub.

The constructor takes a new optional parameter called $userEmail and $cert->sub is assigned to that if it is set.

Author: avanderbergh

src/Client.php

@@ -18,8 +18,9 @@ class Client
 
     /**
      * @param array $config
+     * @param string $userEmail
      */
-    public function __construct(array $config)
+    public function __construct(array $config, $userEmail='')
     {
         $this->config = $config;
 
@@ -41,9 +42,7 @@ public function __construct(array $config)
         $this->client->setDeveloperKey(array_get($config, 'developer_key', ''));
 
         // auth for service account
-        if (array_get($config, 'service.enable', false)) {
-            $this->auth();
-        }
+        $this->auth($userEmail);
     }
 
     /**
@@ -81,12 +80,13 @@ public function make($service)
     /**
      * Setup correct auth method based on type.
      *
+     * @param $userEmail
      * @return void
      */
-    protected function auth()
+    protected function auth($userEmail='')
     {
         // see (and use) if user has set Credentials
-        if ($this->useAssertCredentials()) {
+        if ($this->useAssertCredentials($userEmail)) {
             return;
         }
 
@@ -102,10 +102,10 @@ protected function auth()
 
     /**
      * Determine and use credentials if user has set them.
-     *
+     * @param $userEmail
      * @return boolean used or not
      */
-    protected function useAssertCredentials()
+    protected function useAssertCredentials($userEmail='')
     {
         $account = array_get($this->config, 'service.account', '');
         if (!empty($account)) {
@@ -114,6 +114,9 @@ protected function useAssertCredentials()
                 array_get($this->config, 'service.scopes', []),
                 file_get_contents(array_get($this->config, 'service.key', ''))
             );
+            if($userEmail){
+                $cert->sub=$userEmail;
+            }
             $this->client->setAssertionCredentials($cert);
 
             return true;
@@ -159,4 +162,4 @@ public function __call($method, $parameters)
 
         throw new \BadMethodCallException(sprintf('Method [%s] does not exist.', $method));
     }
-}
+}