Merge branch 'develop' of https://github.com/manzerbredes/istic-openstack into develop

1 files changed, 30 insertions, 6 deletions

diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index 50826ed..bdae8a6 100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -1,12 +1,12 @@
 <?php
 
 use GuzzleHttp\Client;
-use OpenStack\Common\Transport\HandlerStack;
-use OpenStack\Common\Transport\Middleware;
+use OpenCloud\Common\Transport\HandlerStack;
+use OpenCloud\Common\Transport\Middleware;
 use OpenStack\Identity\v3\Service;
 use OpenStack\Identity\v3\Api;
-use OpenStack\Common\Auth\Token;
-use OpenStack\Common\Transport\Utils;
+use OpenCloud\Common\Auth\Token;
+use OpenCloud\Common\Transport\Utils;
 use OpenStack\Identity\v3\Models;
 
 class genTokenOptions
@@ -75,6 +75,12 @@ class genTokenOptions
 		$this->optionsGlobal['Identity'] = $options;
 	}
 	
+	public function revokeIdentityToken(){
+		$token = $this->unserializeToken($this->backup['Identity']['token']);
+		$this->optionsGlobal['Common']['identityService']->revokeToken($token->id);
+		
+	}
+	
 	public function loadIdentityBackup($opt){
 		$options = $this->optionsGlobal['Common'];
 		$options['catalogName'] = 'false';
@@ -123,6 +129,12 @@ class genTokenOptions
 		$this->optionsGlobal['Image'] = $options;
 	}
 	
+	public function revokeImageToken(){
+		$token = $this->unserializeToken($this->backup['Image']['token']);
+		$this->optionsGlobal['Common']['identityService']->revokeToken($token->id);
+		
+	}
+	
 	public function loadImageBackup($opt){
 		$options = $this->optionsGlobal['Common'];
 		$options['catalogName'] = 'glance';
@@ -157,7 +169,7 @@ class genTokenOptions
 
 		$stack = HandlerStack::create();
 		
-        $stack->push(Middleware::authHandler($options['authHandler'], $token));
+    $stack->push(Middleware::authHandler($options['authHandler'], $token));
 		
 		$this->addDebugMiddleware($options, $stack);
 		
@@ -170,6 +182,12 @@ class genTokenOptions
 		$this->optionsGlobal['Network'] = $options;
 	}
 	
+	public function revokeNetworkToken(){
+		$token = $this->unserializeToken($this->backup['Network']['token']);
+		$this->optionsGlobal['Common']['identityService']->revokeToken($token->id);
+		
+	}
+	
 	public function loadNetworkBackup($opt){
 		$options = $this->optionsGlobal['Common'];
 		$options['catalogName'] = 'neutron';
@@ -217,6 +235,12 @@ class genTokenOptions
 		$this->optionsGlobal['Compute'] = $options;
 	}
 	
+	public function revokeComputeToken(){
+		$token = $this->unserializeToken($this->backup['Compute']['token']);
+		$this->optionsGlobal['Common']['identityService']->revokeToken($token->id);
+		
+	}
+	
 	public function loadComputeBackup($opt){
 		
 		$options = $this->optionsGlobal['Common'];
@@ -245,7 +269,7 @@ class genTokenOptions
 	private function saveBackup($name, $data){
 		$token = $this->serializeToken($data["token"]);
 		$path = "core/LibOverride/projectTokenData/".$token['saved']["project"]["name"];
-		error_log(print_r($path, true), 0);
+		//error_log(print_r($path, true), 0);
 		file_put_contents("core/LibOverride/projectTokenData/".$token['saved']["project"]["name"], serialize($token['saved']));
 		$this->backup["roles"] = $token["roles"];
 		$this->backup["project"] = $token['saved']["project"]["name"];