loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactoring of comments beginning

Browse source
This commit is contained in:
EoleDev 2016-04-26 20:42:31 +02:00
parent 477dc82182
commit 5263cf00a2
13 changed files with 1535 additions and 1744 deletions
Download patch file Download diff file Expand all files Collapse all files

104
server/core/LibOverride/genTokenOptions.php
View file

@ -22,33 +22,33 @@ class genTokenOptions
$this->stack = HandlerStack::create();
$httpClient = new Client([
'base_uri' => Utils::normalizeUrl($options['authUrl']),
'handler' => $this->stack,
]);
'base_uri' => Utils::normalizeUrl($options['authUrl']),
'handler' => $this->stack,
]);
$this->httpClient = $httpClient;
$options['identityService'] = Service::factory($httpClient);
$options['identityService'] = Service::factory($httpClient);
$options['authHandler'] = function () use ($options) {
return $options['identityService']->generateToken($options);
};
};
$this->optionsGlobal['Common'] = $options;
}
/**
* @codeCoverageIgnore
*/
private function addDebugMiddleware(array $options, HandlerStack &$stack)
{
if (!empty($options['debugLog'])
&& !empty($options['logger'])
&& !empty($options['messageFormatter'])
) {
$stack->push(GuzzleMiddleware::log($options['logger'], $options['messageFormatter']));
}
}
/**
* @codeCoverageIgnore
*/
private function addDebugMiddleware(array $options, HandlerStack &$stack)
{
if (!empty($options['debugLog'])
&& !empty($options['logger'])
&& !empty($options['messageFormatter'])
) {
$stack->push(GuzzleMiddleware::log($options['logger'], $options['messageFormatter']));
}
}
public function checkToken(){
//error_log(print_r($this->backup['time'], true), 0);
@ -73,9 +73,9 @@ class genTokenOptions
$this->addDebugMiddleware($options, $stack);
$options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
$this->saveBackup('Identity', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Identity'] = $options;
@ -98,15 +98,15 @@ class genTokenOptions
$baseUrl = $this->backup['Identity']['baseUrl'];
$stack = HandlerStack::create();
$stack->push(Middleware::authHandler($options['authHandler'], $token));
$this->addDebugMiddleware($options, $stack);
$options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
$this->saveBackup('Identity', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Identity'] = $options;
@ -122,14 +122,14 @@ class genTokenOptions
$stack = HandlerStack::create();
$stack->push(Middleware::authHandler($options['authHandler'], $token));
$stack->push(Middleware::authHandler($options['authHandler'], $token));
$this->addDebugMiddleware($options, $stack);
$options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
$this->saveBackup('Image', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Image'] = $options;
@ -150,7 +150,7 @@ class genTokenOptions
$this->backup['Image'] = $opt;
$token = $this->unserializeToken($this->backup['Image']['token']);
$baseUrl = $this->backup['Image']['baseUrl'];
$stack = HandlerStack::create();
$stack->push(Middleware::authHandler($options['authHandler'], $token));
@ -158,9 +158,9 @@ class genTokenOptions
$this->addDebugMiddleware($options, $stack);
$options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
$this->saveBackup('Image', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Image'] = $options;
}
@ -175,14 +175,14 @@ class genTokenOptions
$stack = HandlerStack::create();
$stack->push(Middleware::authHandler($options['authHandler'], $token));
$stack->push(Middleware::authHandler($options['authHandler'], $token));
$this->addDebugMiddleware($options, $stack);
$options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
$this->saveBackup('Network', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Network'] = $options;
@ -203,17 +203,17 @@ class genTokenOptions
$this->backup['Network'] = $opt;
$token = $this->unserializeToken($this->backup['Network']['token']);
$baseUrl = $this->backup['Network']['baseUrl'];
$stack = HandlerStack::create();
$stack->push(Middleware::authHandler($options['authHandler'], $token));
$this->addDebugMiddleware($options, $stack);
$options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
$this->saveBackup('Network', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Network'] = $options;
}
@ -228,14 +228,14 @@ class genTokenOptions
$stack = HandlerStack::create();
$stack->push(Middleware::authHandler($options['authHandler'], $token));
$stack->push(Middleware::authHandler($options['authHandler'], $token));
$this->addDebugMiddleware($options, $stack);
$options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
$this->saveBackup('Compute', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Compute'] = $options;
@ -257,17 +257,17 @@ class genTokenOptions
$this->backup['Compute'] = $opt;
$token = $this->unserializeToken($this->backup['Compute']['token']);
$baseUrl = $this->backup['Compute']['baseUrl'];
$stack = HandlerStack::create();
$stack->push(Middleware::authHandler($options['authHandler'], $token));
$this->addDebugMiddleware($options, $stack);
$options['httpClient'] = new Client([
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
'base_uri' => Utils::normalizeUrl($baseUrl),
'handler' => $stack,
]);
$this->saveBackup('Compute', array('token' => $token, 'baseUrl' => $baseUrl ));
$this->optionsGlobal['Compute'] = $options;
}
@ -426,7 +426,7 @@ class genTokenOptions
$token->user->description = unserialize($this->backup["user"]["description"]);
$token->issued = unserialize($tokenSerialized["issued"]);
$token->id = unserialize($tokenSerialized["id"]);
return $token;
}
}