From 4f062230bcfc8209776259af9c21fc34a29668e4 Mon Sep 17 00:00:00 2001
From: Eole <EoleDev@outlook.fr>
Date: Sun, 31 Jan 2016 14:34:43 +0100
Subject: Implementation Token Multi Service ENd

---
 server/core/LibOverride/genTokenOptions.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'server/core/LibOverride/genTokenOptions.php')

diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index 3e8414e..9cb4100 100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -56,9 +56,11 @@ class genTokenOptions
 		$options['catalogType'] = 'false';
 		$options['region'] = 'RegionOne';
 		
-		list($token, $baseUrl) = $options['identityService']->authenticate($options);
-
-        $this->stack->push(Middleware::authHandler($options['authHandler'], $token));
+		//list($token, $baseUrl) = $options['identityService']->authenticate($options);
+		$baseUrl = $options["authUrl"];
+		$token = $options['identityService']->generateToken($options);
+		
+		$this->stack->push(Middleware::authHandler($options['authHandler'], $token));
 		
 		$this->addDebugMiddleware($options, $this->stack);
 		
@@ -227,8 +229,8 @@ class genTokenOptions
 		return serialize($this->backup[$service]);
 	}
 	
-	public function getOptionsCompute(){
-		return $this->optionsGlobal['Compute'];
+	public function getOptions($service){
+		return $this->optionsGlobal[$service];
 	}
 	
 	private function serializeToken($token){
-- 
cgit v1.2.3