Merge branch 'develop' into loic

1 files changed, 27 insertions, 5 deletions

diff --git a/server/core/App.php b/server/core/App.php
index ceda7c9..d35ccc0 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);

+    }

 		

 	}