Make sure importing credentials updates default HTTP X-Auth-Token hea…

…der; fixes #236

lib/OpenCloud/OpenStack.php

@@ -292,8 +292,8 @@ public function authenticate()
         $this->setExpiration(strtotime($body->access->token->expires));
         $this->setCatalog($body->access->serviceCatalog);
 
-        // Add to default headers for future reference
-        $this->setDefaultOption('headers/X-Auth-Token', (string) $this->getToken());
+        // Set X-Auth-Token HTTP request header
+        $this->updateTokenHeader();
 
         /**
          * In some cases, the tenant name/id is not returned
@@ -340,6 +340,7 @@ public function importCredentials(array $values)
     {
         if (!empty($values['token'])) {
             $this->setToken($values['token']);
+            $this->updateTokenHeader();
         }
         if (!empty($values['expiration'])) {
             $this->setExpiration($values['expiration']);
@@ -352,6 +353,18 @@ public function importCredentials(array $values)
         }
     }
 
+    /**
+     * Sets the X-Auth-Token header. If no value is explicitly passed in, the current token is used.
+     *
+     * @param  string $token Optional value of token.
+     * @return void
+     */
+    private function updateTokenHeader($token = null)
+    {
+        $token = $token ?: $this->getToken();
+        $this->setDefaultOption('headers/X-Auth-Token', (string) $token);
+    }
+
     /**
      * Creates a new ObjectStore object (Swift/Cloud Files)
      *
@@ -421,4 +434,4 @@ public function volumeService($name = null, $region = null, $urltype = null)
         ));
     }
 
-}
+}