From f9643dd9ffeec5eda4f563dd695135ac3a681d60 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Sat, 19 Mar 2016 12:49:07 +0100
Subject: Time maagement on token

---
 server/core/LibOverride/genTokenOptions.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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

diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index bdae8a6..028226a 100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -49,6 +49,12 @@ class genTokenOptions
             $stack->push(GuzzleMiddleware::log($options['logger'], $options['messageFormatter']));
         }
     }
+
+	public function checkToken(){
+
+		return $this->backup['time'] > time();
+
+	}
 	
 	public function genIdentityToken(){
 		$options = $this->optionsGlobal['Common'];
@@ -271,6 +277,7 @@ class genTokenOptions
 		$path = "core/LibOverride/projectTokenData/".$token['saved']["project"]["name"];
 		//error_log(print_r($path, true), 0);
 		file_put_contents("core/LibOverride/projectTokenData/".$token['saved']["project"]["name"], serialize($token['saved']));
+		$this->backup['time'] = $token['time'];
 		$this->backup["roles"] = $token["roles"];
 		$this->backup["project"] = $token['saved']["project"]["name"];
 		$this->backup["user"] = $token["user"];
@@ -284,7 +291,7 @@ class genTokenOptions
 	public function loadBackup($back){
 		
 		$backup = unserialize($back);
-
+		$this->backup['time'] = $backup['time'];
 		$this->backup["roles"] = $backup["roles"];
 		$this->backup["project"] = $backup["project"];
 		$this->backup["user"] = $backup["user"];
@@ -343,6 +350,7 @@ class genTokenOptions
 		$tokenSerialized["user"]["name"] = serialize($token->user->name);
 		$tokenSerialized["token"]["issued"] = serialize($token->issued);
 		$tokenSerialized["token"]["id"] = serialize($token->id);		
+		$tokenSerialized['time'] = time()+$config['tokenTime']*60;
 
 		return $tokenSerialized;
 	}
-- 
cgit v1.2.3


From 0dc17aa9efb987dcdf6f864f4110450bcc0c9003 Mon Sep 17 00:00:00 2001
From: EoleDev <EoleDev@outlook.fr>
Date: Wed, 23 Mar 2016 15:13:42 +0100
Subject: Correction Erreur

---
 client/js/controllers/home/home.js          | 2 +-
 server/core/App.php                         | 4 ++--
 server/core/Compute.php                     | 1 +
 server/core/LibOverride/genTokenOptions.php | 8 +++++---
 server/index.php                            | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

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

diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js
index 3332a10..ec6fb6e 100755
--- a/client/js/controllers/home/home.js
+++ b/client/js/controllers/home/home.js
@@ -44,7 +44,7 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
 
 	
 	if(Identity.isAlreadyLogin()){
-		if(Compute.getData().machines == null{
+		if(Compute.getData().machines == null){
 			Loading.start();
 			Compute.pullData(callMeAfterPullData);		
 		}
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);
 			
diff --git a/server/index.php b/server/index.php
index 4e9c82b..d6b0329 100755
--- a/server/index.php
+++ b/server/index.php
@@ -55,7 +55,7 @@
 		}
 		
 	}else{
-		$App->setOuptut("Error", "Token Invalide");
+		$App->setOutput("Error", "Token Invalide");
 		$App->show();
 	}
 	
-- 
cgit v1.2.3