Skip to content

Ensure token header is reset before authenticating; fixes #483 #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ycombinator merged 1 commit into from
Dec 4, 2014
Merged

Ensure token header is reset before authenticating; fixes #483 #484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions lib/OpenCloud/OpenStack.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,10 @@ public function getUser()
*/
public function authenticate()
{
// OpenStack APIs will return a 401 if an expired X-Auth-Token is sent,
// so we need to reset the value before authenticating for another one.
$this->updateTokenHeader('');

$identity = IdentityService::factory($this);
$response = $identity->generateToken($this->getCredentials());

Expand All @@ -384,7 +388,7 @@ public function authenticate()
}

// Set X-Auth-Token HTTP request header
$this->updateTokenHeader();
$this->updateTokenHeader($this->getToken());
}

/**
Expand Down Expand Up @@ -422,7 +426,7 @@ public function importCredentials(array $values)
{
if (!empty($values['token'])) {
$this->setToken($values['token']);
$this->updateTokenHeader();
$this->updateTokenHeader($this->getToken());
}
if (!empty($values['expiration'])) {
$this->setExpiration($values['expiration']);
Expand All @@ -438,13 +442,12 @@ 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.
* @param string $token Value of header.
* @return void
*/
private function updateTokenHeader($token = null)
private function updateTokenHeader($token)
{
$token = $token ? : $this->getToken();
$this->setDefaultOption('headers/X-Auth-Token', (string)$token);
$this->setDefaultOption('headers/X-Auth-Token', (string) $token);
}

/**
Expand Down