From a706b0d5655f6aa94d2a245cf4250c3e37538e1d Mon Sep 17 00:00:00 2001 From: EoleDev Date: Wed, 9 Mar 2016 14:53:48 +0100 Subject: Debut revoke --- server/core/App.php | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) (limited to 'server/core/App.php') diff --git a/server/core/App.php b/server/core/App.php index edb75f6..de886a6 100755 --- a/server/core/App.php +++ b/server/core/App.php @@ -56,10 +56,10 @@ class App{ return $this->openstack->networkingV2($opt); break; case "Compute": - if($this->tokenPost == NULL) $this->tokenClass->genComputeToken(); - $opt = $this->tokenClass->getOptions($service); - return $this->openstack->computeV2($opt); - break; + if($this->tokenPost == NULL) $this->tokenClass->genComputeToken(); + $opt = $this->tokenClass->getOptions($service); + return $this->openstack->computeV2($opt); + break; } } @@ -81,7 +81,29 @@ class App{ $this->errorClass->BaseErrorHandler($e); }catch(NotImplementedError $e){ $this->errorClass->NotImplementedHandler($e); - } + } + + } + + public function deauthenticate(){ + + try{ + + $this->tokenClass->revokeComputeToken(); + $this->tokenClass->revokeImageToken(); + $this->tokenClass->revokeNetworkToken(); + $this->tokenClass->revokeIdentityToken(); + + $this->setOutput("deauthenticate", "Ok"); + }catch(BadResponseError $e){ + $this->errorClass->BadResponseHandler($e); + }catch(UserInputError $e){ + $this->errorClass->UserInputHandler($e); + }catch(BaseError $e){ + $this->errorClass->BaseErrorHandler($e); + }catch(NotImplementedError $e){ + $this->errorClass->NotImplementedHandler($e); + } } -- cgit v1.2.3 From c8d1eeda92d2c4720dc495313a1006ec81510693 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Mar 2016 15:21:46 +0100 Subject: MAJ Library --- server/core/App.php | 8 ++++---- server/core/ErrorManagement.php | 10 +++++----- server/core/Identity.php | 2 +- server/core/LibOverride/genTokenOptions.php | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'server/core/App.php') diff --git a/server/core/App.php b/server/core/App.php index edb75f6..ceda7c9 100755 --- a/server/core/App.php +++ b/server/core/App.php @@ -3,10 +3,10 @@ include_once("core/Plugin_Api.php"); include_once("core/LibOverride/genTokenOptions.php"); include_once("core/ErrorManagement.php"); -use OpenStack\Common\Error\BadResponseError; -use OpenStack\Common\Error\BaseError; -use OpenStack\Common\Error\NotImplementedError; -use OpenStack\Common\Error\UserInputError; +use OpenCloud\Common\Error\BadResponseError; +use OpenCloud\Common\Error\BaseError; +use OpenCloud\Common\Error\NotImplementedError; +use OpenCloud\Common\Error\UserInputError; class App{ diff --git a/server/core/ErrorManagement.php b/server/core/ErrorManagement.php index 6bff61f..4ba3493 100755 --- a/server/core/ErrorManagement.php +++ b/server/core/ErrorManagement.php @@ -1,9 +1,9 @@ \ No newline at end of file +?> diff --git a/server/core/Identity.php b/server/core/Identity.php index 2638985..7100c9f 100755 --- a/server/core/Identity.php +++ b/server/core/Identity.php @@ -9,7 +9,7 @@ * * @todo Complete the functions and finish the descriptions */ -use OpenStack\Common\Error; +use OpenCloud\Common\Error; /** * Identity Class of the back-end application diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php index 50826ed..18d880f 100755 --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php @@ -1,12 +1,12 @@