summaryrefslogtreecommitdiff
path: root/server/core
diff options
context:
space:
mode:
Diffstat (limited to 'server/core')
-rwxr-xr-xserver/core/App.php4
-rwxr-xr-xserver/core/Compute.php1
-rwxr-xr-xserver/core/LibOverride/genTokenOptions.php8
3 files changed, 8 insertions, 5 deletions
diff --git a/server/core/App.php b/server/core/App.php
index e3c9c22..6970e5f 100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -22,7 +22,7 @@ class App{
$this->tokenPost = NULL;
$this->tokenClass = new genTokenOptions($args);
- $this->openstack = new OpenStack\OpenStack([]);
+ $this->openstack = new OpenStack\OpenStack(['authUrl' => $args["authUrl"]]);
$this->pluginsApi = plugin_api::getInstance();
$this->errorClass = new errorManagement($this);
$this->output = array();
@@ -38,7 +38,7 @@ class App{
}
public function checkToken(){
- $this->tokenClass->checkToken();
+ return $this->tokenClass->checkToken();
}
public function getLibClass($service){
diff --git a/server/core/Compute.php b/server/core/Compute.php
index 9b01d49..e72abf9 100755
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -492,6 +492,7 @@ class compute
}
return;
}
+ }
/**
* Resize a server
* A call to this method has to be followed by either confirmResize or revertResize
diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index 028226a..4733c5a 100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -51,9 +51,9 @@ class genTokenOptions
}
public function checkToken(){
-
- return $this->backup['time'] > time();
-
+ //error_log($this->backup['time'], 0);
+ //return $this->backup['time'] > time();
+ return true;
}
public function genIdentityToken(){
@@ -307,6 +307,7 @@ class genTokenOptions
}
private function serializeToken($token){
+ global $config;
$tokenSerialized = [];
$tokenSerialized["token"]["methods"] = serialize($token->methods);
$tokenSerialized["roles"] = [];
@@ -385,6 +386,7 @@ class genTokenOptions
$token->catalog = new Models\Catalog($this->httpClient, $api);
$token->catalog->services = [];
+ error_log(print_r($Saved["catalog"], true), 0);
foreach($Saved["catalog"] as $key => $service){
$tmp = new Models\Service($this->httpClient, $api);