From 784b25754c6b168a6c015aa39837c34339c88444 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Thu, 4 Feb 2016 13:20:45 +0100 Subject: [PATCH 1/9] Add error checking, add method handler for login --- client/index.html | 1 + client/js/controllers/login.js | 48 ++++++++++++++++++---------------- client/js/requests/errors.js | 14 ++++++++++ client/js/requests/identity.js | 9 +++++-- client/partials/login.html | 12 ++++----- 5 files changed, 53 insertions(+), 31 deletions(-) create mode 100644 client/js/requests/errors.js diff --git a/client/index.html b/client/index.html index a4845e8..fe53069 100644 --- a/client/index.html +++ b/client/index.html @@ -73,6 +73,7 @@ + diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js index 2f74414..d08a9f2 100644 --- a/client/js/controllers/login.js +++ b/client/js/controllers/login.js @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ /** * Represents a book. @@ -10,30 +5,37 @@ */ mainApp.controller('loginCtrl', function ($scope,$interval,$sce) { - // Define default states - $('#loginModal').modal({backdrop: 'static', keyboard: false}); - $('#loadingLoginButton').hide(); - $('#failedToLoginAlert').hide(); + // Define default states + $('#loginModal').modal({backdrop: 'static', keyboard: false}); + $('#loadingLoginButton').hide(); + $('#failedToLoginAlert').hide(); - $('#loginButton').click(function(){ - $('#loginButton').hide(); - $('#loadingLoginButton').show(); - $('#failedToLoginAlert').hide(); + $('#loginButton').click(function(){ + $('#loginButton').hide(); + $('#loadingLoginButton').show(); + $('#failedToLoginAlert').hide(); - + var result=identity.login($("#loginFormUsername").val(), $("#loginFormProjectname").val(), $("#loginFormPassword").val()); - $interval( - function() - { - $('#failedToLoginAlert').show(); + $interval( + function() + { + // Check for error + if(!errors.checkForLogin(result)){ + $('#failedToLoginAlert').show(); + } + else { + $('#loginModal').modal('hide'); + } + + // Reset button state $('#loginButton').show(); - $('#loadingLoginButton').hide(); - - }, 2000,1); - + $('#loadingLoginButton').hide(); + }, 2000,1); + }); -}) +}); diff --git a/client/js/requests/errors.js b/client/js/requests/errors.js new file mode 100644 index 0000000..cc9389a --- /dev/null +++ b/client/js/requests/errors.js @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + + +var errors={}; + + +errors.checkForLogin=function(result){ + // TODO + return true; +}; \ No newline at end of file diff --git a/client/js/requests/identity.js b/client/js/requests/identity.js index cad1261..61f06ed 100644 --- a/client/js/requests/identity.js +++ b/client/js/requests/identity.js @@ -1,9 +1,14 @@ // Make Namespace -var identity = {} ; - +var identity = {}; +identity.login=function(username, projectname, password){ + + // Todo + + return "tokens"; +}; diff --git a/client/partials/login.html b/client/partials/login.html index 387b075..aa974ab 100644 --- a/client/partials/login.html +++ b/client/partials/login.html @@ -12,18 +12,18 @@
- - User +
- - Project +
- - Password +
From c2a5b1880c19c1490c42eb40a6a15ce2bc64b9e9 Mon Sep 17 00:00:00 2001 From: EoleDev Date: Fri, 5 Feb 2016 00:07:31 +0100 Subject: [PATCH 2/9] Request Analyse reviewed, Server Initialisation Reviewed, Core Class Interface Created, App created --- server/core/App.php | 68 +++++++++++++++++++++ server/core/CoreInterface.php | 7 +++ server/core/Identity.php | 27 +++++--- server/core/LibOverride/genTokenOptions.php | 22 +++++-- server/index.php | 52 ++++++++-------- server/init.php | 54 +++++----------- 6 files changed, 147 insertions(+), 83 deletions(-) create mode 100755 server/core/App.php create mode 100755 server/core/CoreInterface.php mode change 100644 => 100755 server/core/Identity.php diff --git a/server/core/App.php b/server/core/App.php new file mode 100755 index 0000000..45f6922 --- /dev/null +++ b/server/core/App.php @@ -0,0 +1,68 @@ +tokenPost = NULL; + $this->tokenClass = new genTokenOptions($args); + $this->openstack = new OpenStack\OpenStack([]); + $this->pluginsApi = plugin_api::getInstance(); + $this->output = array(); + + } + + public function setToken($token){ + + $this->tokenPost = $token; + $this->tokenClass->loadBackup($his->tokenPost); + + } + + public function getLibClass($service){ + + switch($service){ + case "Identity": + if($tokenPost == NULL) $tokenClass->genIdentityToken(); + $opt = $tokenClass->getOptions($service); + return $this->openstack->identityV3($opt); + break; + } + + } + + public function authenticate(){ + + try{ + $this->tokenClass->genIdentityToken(); + $this->tokenClass->genComputeToken(); + $this->tokenClass->genImageToken(); + $this->tokenClass->genNetworkToken(); + + $this->setOutput("token", $this->tokenClass->getBackup()); + }catch(Exception $e){ + echo $e; + exit(); + } + + } + + public function setOutput($key, $out){ + + $this->output[$key] = $out; + + } + + public function show(){ + echo json_encode($this->output); + } + +} \ No newline at end of file diff --git a/server/core/CoreInterface.php b/server/core/CoreInterface.php new file mode 100755 index 0000000..ed0d959 --- /dev/null +++ b/server/core/CoreInterface.php @@ -0,0 +1,7 @@ +oidentity = $ostack->identityV3(); - $this->plugins = $apiP; + $this->app = $app; + if($app->getOptions("Identity")) + $this->libClass = $app->getLibClass("Identity"); } + public function action($action){ + + //To be Complete + + } + public function genToken(){ - global $Args; - $token = $this->oidentity->generateToken($Args); - return $token; - } + + //To be Complete + + } } diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php index 81ecfc8..58b87c1 100755 --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php @@ -81,7 +81,7 @@ class genTokenOptions $options['catalogType'] = 'false'; $options['region'] = 'RegionOne'; - $this->backup['Identity'] = unserialize($opt); + $this->backup['Identity'] = $opt; $token = $this->unserializeToken($this->backup['Identity']['token']); $baseUrl = $this->backup['Identity']['baseUrl']; @@ -129,7 +129,7 @@ class genTokenOptions $options['catalogType'] = 'image'; $options['region'] = 'RegionOne'; - $this->backup['Image'] = unserialize($opt); + $this->backup['Image'] = $opt; $token = $this->unserializeToken($this->backup['Image']['token']); $baseUrl = $this->backup['Image']['baseUrl']; @@ -176,7 +176,7 @@ class genTokenOptions $options['catalogType'] = 'network'; $options['region'] = 'RegionOne'; - $this->backup['Network'] = unserialize($opt); + $this->backup['Network'] = $opt; $token = $this->unserializeToken($this->backup['Network']['token']); $baseUrl = $this->backup['Network']['baseUrl']; @@ -224,7 +224,7 @@ class genTokenOptions $options['catalogType'] = 'compute'; $options['region'] = 'RegionOne'; - $this->backup['Compute'] = unserialize($opt); + $this->backup['Compute'] = $opt; $token = $this->unserializeToken($this->backup['Compute']['token']); $baseUrl = $this->backup['Compute']['baseUrl']; @@ -242,8 +242,18 @@ class genTokenOptions $this->optionsGlobal['Compute'] = $options; } - public function getBackup($service){ - return serialize($this->backup[$service]); + public function getBackup(){ + return serialize($this->backup); + } + + public function loadBackup($back){ + + $backup = unserialize($back); + loadComputeBackup($backup["Compute"]); + loadIdentityBackup($backup["Identity"]); + loadImageBackup($backup["Image"]); + loadNetworkBackup($backup["Network"]); + } public function getOptions($service){ diff --git a/server/index.php b/server/index.php index b3c061a..41f77b8 100755 --- a/server/index.php +++ b/server/index.php @@ -3,33 +3,29 @@ include_once("config.inc.php"); include_once("init.php"); -// $task = $_POST["task"]; -// $action = $_POST["action"]; - - - //$id = new identity($openstack_api, $pluginApi); - -// var_dump($id->genToken()); -// $identity = $openstack_api->identityV3($Args); - //$tmp = $identity->listEndpoints(); - //foreach($tmp as $cred){ -// echo $cred->id." %%%%%% "; - //} - //$servers = $compute->listServers(true); - //var_dump($servers); - //foreach($servers as $server){ - // echo $server->id." !!!!!!!!! "; - //} - - $tmp = new genTokenOptions($Args); - $tmp->loadIdentityBackup($identityBack); - $array = $tmp->getOptions("Identity"); - - $openstackTest = new OpenStack\OpenStack([]); - $identityTest = $openstackTest->identityV3($array); - $domainsTest = $identityTest->listDomains(); - foreach($domainsTest as $domain){ - echo $domain->id." %%%%%% "; + if(isset($_POST["task"]) && isset($_POST["action"])){ + $task = $_POST["task"]; + $action = $_POST["action"]; + }else if(isset($_POST["task"]) && $_POST["task"] == "Authenticate"){ + $task = $_POST["task"]; + }else{ + //Gestion Erreur + } + + if($task == "Authenticate"){ + + $App->authenticate(); + $App->show(); + + } + + switch($task) + { + case "identity": + include_once("core/Identity.php"); + $identityObject = new identity($App); + $identityObject->action($action); + $App->show(); + break; } - // var_dump($openstack_api->getBuilderOptions()); diff --git a/server/init.php b/server/init.php index 2c07947..cf08523 100755 --- a/server/init.php +++ b/server/init.php @@ -1,13 +1,15 @@ Array( - "name" => $user, - "password" => $password, - "domain" => Array( - "name" => "Default") - ), - "scope" => Array( - "project" => Array( - "name" => $project, - "domain" => Array( - "name" => "Default") - ) - ), - "authUrl" => $config["urlAuth"] - ); - } else { + } /*else { // Test Backend $user = "admin"; $password = "ae5or6cn"; $project = "admin"; - $Args = Array( + }*/ + + $Args = Array( "user" => Array( "name" => $user, "password" => $password, @@ -52,21 +40,7 @@ ), "authUrl" => $config["urlAuth"] ); - } - - $pluginApi = plugin_api::getInstance(); - //$openstack_api = new OpenStack\OpenStack($Args); - //$id = new identity($openstack_api, $pluginApi); - - //$token = $id->genToken(); - - $tmp = new genTokenOptions($Args); - $tmp->genIdentityToken(); - $array = $tmp->getOptions("Identity"); - $openstack_api = new OpenStack\OpenStack([]); - - $identityBack = $tmp->getBackup("Identity"); - //file_put_contents("token", serialize($tmp)); + $App = new App($Args); ?> From a16df328c05b3ac005a3c05237a069786b8d5d6f Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Fri, 5 Feb 2016 17:47:53 +0100 Subject: [PATCH 3/9] Make login part dynamic --- client/index.html | 1 - client/js/controllers/login.js | 38 +++++++++++++++--------- client/js/requests/errors.js | 14 --------- client/js/requests/identity.js | 54 ++++++++++++---------------------- 4 files changed, 43 insertions(+), 64 deletions(-) delete mode 100644 client/js/requests/errors.js diff --git a/client/index.html b/client/index.html index fe53069..a4845e8 100644 --- a/client/index.html +++ b/client/index.html @@ -73,7 +73,6 @@ - diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js index d08a9f2..07f1d19 100644 --- a/client/js/controllers/login.js +++ b/client/js/controllers/login.js @@ -3,7 +3,7 @@ * Represents a book. * @constructor */ -mainApp.controller('loginCtrl', function ($scope,$interval,$sce) +mainApp.controller('loginCtrl', function ($scope,$interval,$sce, $http) { // Define default states $('#loginModal').modal({backdrop: 'static', keyboard: false}); @@ -12,30 +12,40 @@ mainApp.controller('loginCtrl', function ($scope,$interval,$sce) $('#loginButton').click(function(){ - $('#loginButton').hide(); - $('#loadingLoginButton').show(); - $('#failedToLoginAlert').hide(); + $('#loginButton').hide(); + $('#loadingLoginButton').show(); + $('#failedToLoginAlert').hide(); - var result=identity.login($("#loginFormUsername").val(), $("#loginFormProjectname").val(), $("#loginFormPassword").val()); - - - $interval( - function() - { + var result=identity.request.login($http,$("#loginFormUsername").val(), $("#loginFormProjectname").val(), $("#loginFormPassword").val()); + + + result.then(function (response){ + + // Parser result + var requestResultObject=identity.requestParser.parseLoginAnswer(response); + // Check for error - if(!errors.checkForLogin(result)){ + if(requestResultObject.status!==0){ + //alert(result.data) $('#failedToLoginAlert').show(); } else { $('#loginModal').modal('hide'); } - + // Reset button state $('#loginButton').show(); $('#loadingLoginButton').hide(); - }, 2000,1); - + },function(response){ + + $('#failedToLoginAlert').show(); + // Reset button state + $('#loginButton').show(); + $('#loadingLoginButton').hide(); + }); + + }); }); diff --git a/client/js/requests/errors.js b/client/js/requests/errors.js deleted file mode 100644 index cc9389a..0000000 --- a/client/js/requests/errors.js +++ /dev/null @@ -1,14 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ - - -var errors={}; - - -errors.checkForLogin=function(result){ - // TODO - return true; -}; \ No newline at end of file diff --git a/client/js/requests/identity.js b/client/js/requests/identity.js index 61f06ed..59bbcf2 100644 --- a/client/js/requests/identity.js +++ b/client/js/requests/identity.js @@ -1,47 +1,31 @@ // Make Namespace var identity = {}; +identity.request = {}; // Request part +identity.requestParser = {}; // Parser part -identity.login=function(username, projectname, password){ + +identity.request.login=function($http,username, projectname, password){ + var requestResultObject={}; - // Todo - - return "tokens"; + return $http.post('http://localhost.istic-openstack/server/index.php', + $.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname}), + {headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}}); }; -/* -mainApp.controller('identityCtrl', function($scope, $http) { - - $scope.identityFormData = {}; - - $scope.processForm = function() { - - $http({ - method : 'POST', - url : 'http://148.60.11.31/', - data : $.param($scope.identityFormData), - headers : { 'Content-Type': 'application/x-www-form-urlencoded' } - }) - .success(function(data) { - console.log(data); - - if (!data.success) { - // if not successful, bind errors to error variables - //$scope.errorName = data.errors.name; - //$scope.errorSuperhero = data.errors.superheroAlias; - } else { - // if successful, bind success message to message - //$scope.message = data.message; - } - }); - }; - - - -});*/ +identity.requestParser.parseLoginAnswer=function(response){ + var requestParserResult={}; - + requestParserResult.status=0; + requestParserResult.data=response.data; + + + // TODO + + + return requestParserResult; +}; From cca5df968e3598b07ee81c1f7f2680f5b9120ec3 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Fri, 5 Feb 2016 19:35:38 +0100 Subject: [PATCH 4/9] Add sharedProfile service --- client/index.html | 6 +++++- client/js/app.js | 5 ++++- client/js/controllers/login.js | 19 ++++++++++++------- client/js/controllers/status.js | 26 ++++++-------------------- client/js/requests/identity.js | 2 +- client/js/services/sharedProfile.js | 11 +++++++++++ client/partials/login.html | 2 +- client/partials/nav.html | 4 ++-- 8 files changed, 42 insertions(+), 33 deletions(-) create mode 100644 client/js/services/sharedProfile.js diff --git a/client/index.html b/client/index.html index a4845e8..013b1b4 100644 --- a/client/index.html +++ b/client/index.html @@ -71,6 +71,9 @@ + + + @@ -79,7 +82,8 @@ - + + diff --git a/client/js/app.js b/client/js/app.js index 0e9c423..96997eb 100644 --- a/client/js/app.js +++ b/client/js/app.js @@ -15,4 +15,7 @@ mainApp.config(['$routeProvider', function($routeProvider){ }).otherwise({ redirectTo: '/home' }); -}]); \ No newline at end of file +}]); + + + diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js index 07f1d19..3447ab1 100644 --- a/client/js/controllers/login.js +++ b/client/js/controllers/login.js @@ -3,24 +3,27 @@ * Represents a book. * @constructor */ -mainApp.controller('loginCtrl', function ($scope,$interval,$sce, $http) +mainApp.controller('loginCtrl', ['$scope','$sce','$http', 'sharedProfile', function ($scope,$sce, $http, sharedProfile) { // Define default states $('#loginModal').modal({backdrop: 'static', keyboard: false}); $('#loadingLoginButton').hide(); $('#failedToLoginAlert').hide(); - + $('#loginButton').click(function(){ $('#loginButton').hide(); $('#loadingLoginButton').show(); $('#failedToLoginAlert').hide(); - var result=identity.request.login($http,$("#loginFormUsername").val(), $("#loginFormProjectname").val(), $("#loginFormPassword").val()); + var username=$("#loginFormUsername").val(); + var password=$("#loginFormPassword").val(); + var projectname=$("#loginFormProjectname").val(); + + var result=identity.request.login($http,username, password, projectname); result.then(function (response){ - // Parser result var requestResultObject=identity.requestParser.parseLoginAnswer(response); @@ -31,21 +34,23 @@ mainApp.controller('loginCtrl', function ($scope,$interval,$sce, $http) } else { $('#loginModal').modal('hide'); + sharedProfile.username=username; + sharedProfile.projectname=projectname; + } // Reset button state $('#loginButton').show(); $('#loadingLoginButton').hide(); },function(response){ - $('#failedToLoginAlert').show(); // Reset button state $('#loginButton').show(); $('#loadingLoginButton').hide(); }); - + }); -}); +}]); diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js index 42a54d4..4ffdb6b 100644 --- a/client/js/controllers/status.js +++ b/client/js/controllers/status.js @@ -4,25 +4,11 @@ -mainApp.controller('statusCtrl', function ($scope,$interval,$sce) + + +mainApp.controller('statusCtrl', ['$scope','sharedProfile', function ($scope, sharedProfile) { - $scope.username="John Doe"; - $scope.projectname="Web Server"; - // Update status every 2 seconds - /*$interval(function(){ - var status=identity.fetchStatus(); - $scope.username=status[1]; - $scope.lastconnection=status[2]; - if(status[0] == "1"){ - $scope.connection=$sce.trustAsHtml("Online"); - } - else{ - $scope.connection=$sce.trustAsHtml("Offline"); - } - }, 2000);*/ - - - + $scope.profile=sharedProfile; + - -}); \ No newline at end of file +}]); \ No newline at end of file diff --git a/client/js/requests/identity.js b/client/js/requests/identity.js index 59bbcf2..7a08714 100644 --- a/client/js/requests/identity.js +++ b/client/js/requests/identity.js @@ -6,7 +6,7 @@ identity.requestParser = {}; // Parser part -identity.request.login=function($http,username, projectname, password){ +identity.request.login=function($http,username, password,projectname){ var requestResultObject={}; return $http.post('http://localhost.istic-openstack/server/index.php', diff --git a/client/js/services/sharedProfile.js b/client/js/services/sharedProfile.js new file mode 100644 index 0000000..2a5ab83 --- /dev/null +++ b/client/js/services/sharedProfile.js @@ -0,0 +1,11 @@ + + + +mainApp.factory('sharedProfile',[function(){ + var profile={}; + + profile.username="None"; + profile.projectname="None"; + + return profile; +}]); \ No newline at end of file diff --git a/client/partials/login.html b/client/partials/login.html index aa974ab..e0ce876 100644 --- a/client/partials/login.html +++ b/client/partials/login.html @@ -19,7 +19,7 @@
+ placeholder="Project Name" type="text" ng-model="identityFormData.project">
diff --git a/client/partials/nav.html b/client/partials/nav.html index f412597..786c53b 100644 --- a/client/partials/nav.html +++ b/client/partials/nav.html @@ -18,8 +18,8 @@
  • -
  • User : {{ username }}
    • -
  • Project Name : {{ projectname }}
    • +
  • User : {{ profile.username }}
    • +
  • Project Name : {{ profile.projectname }}
    • From e9e7ddf9b11f73e01925541bd6a534d5abaa7548 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Fri, 5 Feb 2016 20:52:13 +0100 Subject: [PATCH 5/9] Make relative path for http request --- client/js/requests/identity.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/js/requests/identity.js b/client/js/requests/identity.js index 7a08714..d34af53 100644 --- a/client/js/requests/identity.js +++ b/client/js/requests/identity.js @@ -9,7 +9,7 @@ identity.requestParser = {}; // Parser part identity.request.login=function($http,username, password,projectname){ var requestResultObject={}; - return $http.post('http://localhost.istic-openstack/server/index.php', + return $http.post('../server/index.php', $.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname}), {headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}}); }; From bd81674a85677378b8a6a167439cac92c807dc23 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sat, 6 Feb 2016 12:10:04 +0100 Subject: [PATCH 6/9] Add doc --- client/js/app.js | 9 +++++-- client/js/controllers/home/main.js | 9 +++---- client/js/controllers/login.js | 8 ++++-- client/js/controllers/network/main.js | 9 +++---- client/js/controllers/status.js | 14 +++++----- client/js/requests/identity.js | 38 +++++++++++++++++++++------ client/js/services/sharedProfile.js | 6 +++-- 7 files changed, 62 insertions(+), 31 deletions(-) diff --git a/client/js/app.js b/client/js/app.js index 96997eb..451df66 100644 --- a/client/js/app.js +++ b/client/js/app.js @@ -1,8 +1,13 @@ -// Declare main app +/** + * The main app module instance + * @type angular.module.angular-1_3_6_L1749.moduleInstance + */ var mainApp=angular.module("mainApp",['ngRoute', 'ngSanitize']); - +/** + * Configure the router + */ mainApp.config(['$routeProvider', function($routeProvider){ $routeProvider. when('/home',{ diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js index 2898de2..e629779 100644 --- a/client/js/controllers/home/main.js +++ b/client/js/controllers/home/main.js @@ -1,9 +1,8 @@ -/* - * home Controller +/** + * The home controller + * + * @param {$scope} $scope The $scope service from angular */ - - - mainApp.controller('homeCtrl', function ($scope) { diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js index 3447ab1..751bd09 100644 --- a/client/js/controllers/login.js +++ b/client/js/controllers/login.js @@ -1,7 +1,11 @@ /** - * Represents a book. - * @constructor + * The login controler + * @param {$scope} $scope The $scope angular service + * @param {$sce} $sce The $sce angular service + * @param {$http} $http The $http angular service + * @param {sharedProfile} sharedProfile The sharedProfile service + */ mainApp.controller('loginCtrl', ['$scope','$sce','$http', 'sharedProfile', function ($scope,$sce, $http, sharedProfile) { diff --git a/client/js/controllers/network/main.js b/client/js/controllers/network/main.js index 6c916ae..7264aec 100644 --- a/client/js/controllers/network/main.js +++ b/client/js/controllers/network/main.js @@ -1,9 +1,8 @@ -/* - * network Controller +/** + * The network controller + * + * @param {$scope} $scope The $scope service from angular */ - - - mainApp.controller('networkCtrl', function ($scope) { }); \ No newline at end of file diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js index 4ffdb6b..ce6882e 100644 --- a/client/js/controllers/status.js +++ b/client/js/controllers/status.js @@ -1,11 +1,11 @@ -/* - * mainApp Controller + + +/** + * The status controller + * + * @param {$scope} $scope The $scope service from angular + * @param {sharedProfile} sharedProfile The sharedProfile build by ourself */ - - - - - mainApp.controller('statusCtrl', ['$scope','sharedProfile', function ($scope, sharedProfile) { $scope.profile=sharedProfile; diff --git a/client/js/requests/identity.js b/client/js/requests/identity.js index d34af53..b2c7273 100644 --- a/client/js/requests/identity.js +++ b/client/js/requests/identity.js @@ -1,21 +1,43 @@ -// Make Namespace +/** + * Client Identity Module + * @namespace identity + */ var identity = {}; -identity.request = {}; // Request part -identity.requestParser = {}; // Parser part + +/** + * Contain all request who can be send with http request + * @namespace request + */ +identity.request = {}; + +/** + * Contain parser for result of request made by {@link identity.request} + * @namespace request + */ +identity.requestParser = {}; - -identity.request.login=function($http,username, password,projectname){ - var requestResultObject={}; - +/** + * + * @param {object} $http Angular $http service + * @param {string} username The user name + * @param {string} password The user password + * @param {string} projectname The user project name + * @returns {promise} The result of the request + */ +identity.request.login=function($http,username, password,projectname){ return $http.post('../server/index.php', $.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname}), {headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}}); }; - +/** + * + * @param {string} response The response to parse + * @returns {requestParserResult} Formated data + */ identity.requestParser.parseLoginAnswer=function(response){ var requestParserResult={}; diff --git a/client/js/services/sharedProfile.js b/client/js/services/sharedProfile.js index 2a5ab83..6e78cf6 100644 --- a/client/js/services/sharedProfile.js +++ b/client/js/services/sharedProfile.js @@ -1,6 +1,8 @@ - - +/** + * The sharedProfile service + * It's used to shared the profile between controller + */ mainApp.factory('sharedProfile',[function(){ var profile={}; From ee36719e20e6a72ca07849d4a2fea32c6ca9734f Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Sun, 7 Feb 2016 10:29:12 +0100 Subject: [PATCH 7/9] Add commentaries for errors managing --- server/core/Image.php | 107 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 103 insertions(+), 4 deletions(-) diff --git a/server/core/Image.php b/server/core/Image.php index d345034..b83d155 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -31,8 +31,10 @@ class Image { public function create_image(array $opt){ // VOIR SI MAUVAIS TYPE $options = Array(); - if(isset($opt['name'])){ // string, rendre le nom obligatoire - $options['name'] = $opt['name']; + if(isset($opt['name'])){ // string, rendre le nom obligatoire, vérifier nom pas déjà pris + } + else{ + //ERROR } if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn $options['id'] = $opt['id']; @@ -71,6 +73,7 @@ class Image { * List images */ public function list_images(){ + // vérifier si au moins une image $service = $this->oidentity; $images = $service->listImages(); return $images; @@ -84,6 +87,7 @@ class Image { * **/ public function image_details($id){ + //vérifier existence image $service = $this->oidentity; $image = $service->getImage($id); return $image; @@ -99,6 +103,7 @@ class Image { * options for the image creation **/ public function update_image($id, array $opt){ + //vérifier existence image $service = $this->oidentity; $image = $service->getImage($id); $options = Array(); @@ -134,6 +139,8 @@ class Image { * identifier of the image **/ public function delete_image($id){ + // si protected = true, demander de le mettre a false + // vérifier existence image $service = $this->oidentity; $service->getImage($id)->delete(); } @@ -145,6 +152,7 @@ class Image { * identifier of the image **/ public function reactivate_image($id){ + // vérifier existence image $service = $this->oidentity; $image = $service->getImage($id); $image->reactivate(); @@ -157,6 +165,7 @@ class Image { * identifier of the image **/ public function desactivate_image($id){ + // vérifier existence image $service = $this->oidentity; $image = $service->getImage($id); $image->deactivate(); @@ -172,6 +181,7 @@ class Image { * path of the image **/ public function upload_image($id, $file_name){ + // vérifier existence image $service = $this->oidentity; $image = $service->getImage($id); $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); // A VOIR @@ -183,12 +193,101 @@ class Image { * * @param string $id * identifier of the image - */ - public function download_image($id){ + **/ + public function download_image($id){ + // vérifier existence image $service = $this->oidentity; $image = $service->getImage($id); $stream = $image->downloadData(); return $stream; } + + /** + * Add a member to image + * + * @param string $image_id + * identifier of the image + * + * @param string $member_id + * identifier of the member + **/ + public function add_member($image_id, $member_id){ + // vérifier existence image + // on doit être le proprio de l'image + // vérifier membre existe + $service = $this->oidentity; + $member_id = $service>getImage($image_id)->addMember($member_id); + } + + + /** + * List members of an image + * + * @param string $image_id + * identifier of the image + **/ + public function list_member($image_id, $member_id){ + // vérifier existence image + $service = $this->oidentity; + $image = $service->getImage($image_id); + $members = $image->listMembers(); + return $members; + } + + /** + * Show details of a member of an image + * + * @param string $image_id + * identifier of the image + * + * @param string $member_id + * identifier of the member + **/ + public function detail_member($image_id, $member_id){ + // vérifier existence image + // on doit être le proprio de l'image + // vérifier membre existe + $service = $this->oidentity; + $member = $service>getImage($image_id)->getMember($member_id); + return $member; + } + + /** + * Remove a member of an image + * + * @param string $image_id + * identifier of the image + * + * @param string $member_id + * identifier of the member + **/ + public function remove_member($image_id, $member_id){ + // vérifier existence image + // on doit être le proprio de l'image + // vérifier membre existe + $service = $this->oidentity; + $service>getImage($image_id)->getMember($member_id)->delete(); + } + + /** + * Update a member of an image + * + * @param string $image_id + * identifier of the image + * + * @param string $member_id + * identifier of the member + * + * @param string $status + * new status for the member + **/ + public function update_member($image_id, $member_id, $status){ + // vérifier existence image + // on doit être le proprio de l'image + // vérifier membre existe + $service = $this->oidentity; + $member = $service>getImage($image_id)->getMember($member_id)->updateStatus($status); + } + } ?> From cfe4616c4af86743aa6771f427be98dc4412433b Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 7 Feb 2016 11:10:44 +0100 Subject: [PATCH 8/9] Configure http provider --- client/js/app.js | 12 ++++++++++-- client/js/requests/identity.js | 3 +-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/client/js/app.js b/client/js/app.js index 451df66..90fae89 100644 --- a/client/js/app.js +++ b/client/js/app.js @@ -6,9 +6,11 @@ var mainApp=angular.module("mainApp",['ngRoute', 'ngSanitize']); /** - * Configure the router + * Configure routeProvider */ mainApp.config(['$routeProvider', function($routeProvider){ + + $routeProvider. when('/home',{ templateUrl: 'partials/home/main.html', @@ -22,5 +24,11 @@ mainApp.config(['$routeProvider', function($routeProvider){ }); }]); - +/** + * Configure httpProvider + */ +mainApp.config(['$httpProvider', function($httpProvider){ + $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8'; + +}]); diff --git a/client/js/requests/identity.js b/client/js/requests/identity.js index b2c7273..be3f4f8 100644 --- a/client/js/requests/identity.js +++ b/client/js/requests/identity.js @@ -28,8 +28,7 @@ identity.requestParser = {}; */ identity.request.login=function($http,username, password,projectname){ return $http.post('../server/index.php', - $.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname}), - {headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}}); + $.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname})); }; From 1cd1ae92f414573942262f65dc1644e8ff9bb8f6 Mon Sep 17 00:00:00 2001 From: EoleDev Date: Sun, 7 Feb 2016 22:42:33 +0100 Subject: [PATCH 9/9] Structure identity Class, beginning of descriptions. --- server/core/Identity.php | 929 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 920 insertions(+), 9 deletions(-) diff --git a/server/core/Identity.php b/server/core/Identity.php index d607957..7b6293c 100755 --- a/server/core/Identity.php +++ b/server/core/Identity.php @@ -1,28 +1,939 @@ ] + * + * @return identity + */ public function __construct($app){ $this->app = $app; - if($app->getOptions("Identity")) $this->libClass = $app->getLibClass("Identity"); - } + } - public function action($action){ + $credentials = array(); + + /** + * Add a credential for the given user/project. + * + * Create a secret/access pair for use with ec2 style auth. + * This operation will generates a new set of credentials that map the user/project pair. + * + * @throws [Type] [] + * + * @return void + */ + $credentials["addCredential"] = function(){ - //To be Complete } - public function genToken(){ - - //To be Complete + /** + * List the credentials for a given user. + * + * @throws [Type] [] + * + * @return void + */ + $credentials["listCredentials"] = function(){ + } + + /** + * Retrieve a user’s access/secret pair by the access key. + * + * @throws [Type] [] + * + * @return void + */ + $credentials["showCredential"] = function(){ + + + } + + /** + * Update a user’s access/secret pair. + * + * @throws [Type] [] + * + * @return void + */ + $credentials["updateCredential"] = function(){ + + + } + + /** + * Delete a user’s access/secret pair. + * + * @throws [Type] [] + * + * @return void + */ + $credentials["deleteCredential"] = function(){ + + + } + + $domains = array(); + + /** + * Add a domain to an OpenStack instance. + * + * @throws [Type] [] + * + * @return void + */ + $domains["addDomain"] = function(){ + + + } + + /** + * Retrieve the different domain's list. + * + * @throws [Type] [] + * + * @return void + */ + $domains["listDomains"] = function(){ + + + } + + /** + * Retrieve the details of a given domain. + * + * @throws [Type] [] + * + * @return void + */ + $domains["showDomain"] = function(){ + + + } + + /** + * Update the given domain. + * + * @throws [Type] [] + * + * @return void + */ + $domains["updateDomain"] = function(){ + + + } + + /** + * Delete the given domain. + * + * @throws [Type] [] + * + * @return void + */ + $domains["deleteDomain"] = function(){ + + + } + + /** + * Retrieve the different roles of a given user in a domain. + * + * @throws [Type] [] + * + * @return void + */ + $domains["listRolesDomainUser"] = function(){ + + + } + + /** + * Grant a role to a given user in a domain. + * + * @throws [Type] [] + * + * @return void + */ + $domains["grantRoleDomainUser"] = function(){ + + + } + + /** + * Verify that a user has a given role in a domain. + * + * @throws [Type] [] + * + * @return void + */ + $domains["checkRoleDomainUser"] = function(){ + + + } + + /** + * Delete a role for a given user in a domain. + * + * @throws [Type] [] + * + * @return void + */ + $domains["revokeRoleDomainUser"] = function(){ + + + } + + /** + * Retrieve the roles of a given group in a domain. + * + * @throws [Type] [] + * + * @return void + */ + $domains["listRolesDomainGroup"] = function(){ + + + } + + /** + * Add a role to a given group in a domain. + * + * @throws [Type] [] + * + * @return void + */ + $domains["grantRoleDomainGroup"] = function(){ + + + } + + /** + * Verify that a role is associated with a given group in a domain. + * + * @throws [Type] [] + * + * @return void + */ + $domains["checkRoleDomainGroup"] = function(){ + + + } + + /** + * Delete a role for a given group in a domain. + * + * A *description*, that can span multiple lines, to go _in-depth_ into the details of this element + * and to provide some background information or textual references. + * + * @param string $myArgument With a *description* of this argument, these may also + * span multiple lines. + * + * @throws [Type] [] + * + * @return void + */ + $domains["revokeRoleDomainGroup"] = function(){ + + + } + + $endpoints = array(); + + /** + * Add an endpoint to the Openstack instance + * + * @throws [Type] [] + * + * @return void + */ + $endpoints["addEndpoint"] = function(){ + + + } + + /** + * Retrieve the endpoint for the given id + * + * @throws [Type] [] + * + * @return void + */ + $endpoints["getEndpoint"] = function(){ + + + } + + /** + * Retrieve the list of the different endpoints + * + * @throws [Type] [] + * + * @return void + */ + $endpoints["listEndpoints"] = function(){ + + + } + + /** + * Update a given endpoint + * + * @throws [Type] [] + * + * @return void + */ + $endpoints["updateEndpoint"] = function(){ + + + } + + /** + * Delete a given endpoint + * + * @throws [Type] [] + * + * @return void + */ + $endpoints["deleteEndpoint"] = function(){ + + + } + + $groups = array(); + + /** + * Add a group. + * + * @throws [Type] [] + * + * @return void + */ + $groups["addGroup"] = function(){ + + + } + + /** + * Retrieve the group's list. + * + * @throws [Type] [] + * + * @return void + */ + $groups["listGroups"] = function(){ + + + } + + /** + * Retrieve the details of a given group. + * + * @throws [Type] [] + * + * @return void + */ + $groups["showGroup"] = function(){ + + + } + + /** + * Update a given group. + * + * @throws [Type] [] + * + * @return void + */ + $groups["updateGroup"] = function(){ + + + } + + /** + * Delete the given group. + * + * @throws [Type] [] + * + * @return void + */ + $groups["deleteGroup"] = function(){ + + + } + + /** + * Retrieve the users of a given group. + * + * @throws [Type] [] + * + * @return void + */ + $groups["listGroupUsers"] = function(){ + + + } + + /** + * Add a user to a group. + * + * @throws [Type] [] + * + * @return void + */ + $groups["addGroupUser"] = function(){ + + + } + + /** + * Remove a user from a given group. + * + * @throws [Type] [] + * + * @return void + */ + $groups["removeGroupUser"] = function(){ + + + } + + /** + * Check if a group contains a given user. + * + * @throws [Type] [] + * + * @return void + */ + $groups["checkGroupUser"] = function(){ + + + } + + $policies = array(); + + /** + * @todo + * + * @throws [Type] [] + * + * @return void + */ + $policies["addPolicies"] = function(){ + + + } + + /** + * @todo + * + * @throws [Type] [] + * + * @return void + */ + $policies["listPolicies"] = function(){ + + + } + + /** + * @todo + * + * @throws [Type] [] + * + * @return void + */ + $policies["showPolicie"] = function(){ + + + } + + /** + * @todo + * + * @throws [Type] [] + * + * @return void + */ + $policies["updatePolicies"] = function(){ + + + } + + /** + * @todo + * + * @throws [Type] [] + * + * @return void + */ + $policies["deletePolicies"] = function(){ + + + } + + $projects = array(); + + /** + * Add a project. + * + * @throws [Type] [] + * + * @return void + */ + $projects["addProject"] = function(){ + + + } + + /** + * Retrieve the different projects. + * + * @throws [Type] [] + * + * @return void + */ + $projects["listProjects"] = function(){ + + + } + + /** + * Retrieve the details of a given project. + * + * @throws [Type] [] + * + * @return void + */ + $projects["showProject"] = function(){ + + + } + + /** + * Update a given project. + * + * @throws [Type] [] + * + * @return void + */ + $projects["updateProject"] = function(){ + + + } + + /** + * Delete a given project. + * + * @throws [Type] [] + * + * @return void + */ + $projects["deleteProject"] = function(){ + + + } + + /** + * List the roles of a given user in a project. + * + * @throws [Type] [] + * + * @return void + */ + $projects["listRolesProjectUser"] = function(){ + + + } + + /** + * Grant a role to an user in a project. + * + * @throws [Type] [] + * + * @return void + */ + $projects["grantRoleProjectUser"] = function(){ + + + } + + /** + * Check if a given user has a role in a project. + * + * @throws [Type] [] + * + * @return void + */ + $projects["checkRoleProjectUser"] = function(){ + + + } + + /** + * Delete a role for a given user in a project. + * + * @throws [Type] [] + * + * @return void + */ + $projects["revokeRoleProjectUser"] = function(){ + + + } + + /** + * List the roles of a group in a project. + * + * @throws [Type] [] + * + * @return void + */ + $projects["listRolesProjectGroup"] = function(){ + + + } + + /** + * Add a role to a group in a project. + * + * @throws [Type] [] + * + * @return void + */ + $projects["grantRoleProjectGroup"] = function(){ + + + } + + /** + * Check if a group has a given role in a project. + * + * @throws [Type] [] + * + * @return void + */ + $projects["checkRoleProjectGroup"] = function(){ + + + } + + /** + * Delete a role for a group in a project. + * + * @throws [Type] [] + * + * @return void + */ + $projects["revokeRoleProjectGroup"] = function(){ + + + } + + $roles = array(); + + /** + * Add a role. + * + * @throws [Type] [] + * + * @return void + */ + $roles["addRole"] = function(){ + + + } + + /** + * List the different roles + * + * @throws [Type] [] + * + * @return void + */ + $roles["listRoles"] = function(){ + + + } + + /** + * @todo + * + * @throws [Type] [] + * + * @return void + */ + $roles["listRoleAssignements"] = function(){ + + + } + + $services = array(); + + /** + * Add a service. + * + * @throws [Type] [] + * + * @return void + */ + $services["addService"] = function(){ + + + } + + /** + * Retrieve the different services. + * + * @throws [Type] [] + * + * @return void + */ + $services["listServices"] = function(){ + + + } + + /** + * Retrieve the details for a given service. + * + * @throws [Type] [] + * + * @return void + */ + $services["showService"] = function(){ + + + } + + /** + * Delete a given service. + * + * @throws [Type] [] + * + * @return void + */ + $services["deleteService"] = function(){ + + + } + + $tokens = array(); + + /** + * Generate a new token for a given user id. + * + * @throws [Type] [] + * + * @return void + */ + $tokens["genTokenUserID"] = function(){ + + + } + + /** + * Generate a new token for a given user name. + * + * @throws [Type] [] + * + * @return void + */ + $tokens["genTokenUserName"] = function(){ + + + } + + /** + * Generate a new token from another token ID. + * + * @throws [Type] [] + * + * @return void + */ + $tokens["geneTokenID"] = function(){ + + + } + + /** + * Generate a new token scoped by a project ID. + * + * @throws [Type] [] + * + * @return void + */ + $tokens["genTokenScopedProjectID"] = function(){ + + + } + + /** + * Generate a new token scoped by a project name. + * + * @throws [Type] [] + * + * @return void + */ + $tokens["genTokenScopedProjectName"] = function(){ + + + } + + /** + * Check if a token is validate. + * + * @throws [Type] [] + * + * @return void + */ + $tokens["validateToken"] = function(){ + + + } + + /** + * Delete a given token. + * + * @throws [Type] [] + * + * @return void + */ + $tokens["revokeToken"] = function(){ + + + } + + $users = array(); + + /** + * Add a new user. + * + * @throws [Type] [] + * + * @return void + */ + $users["addUser"] = function(){ + + + } + + /** + * Retrieve the different users. + * + * @throws [Type] [] + * + * @return void + */ + $users["listUsers"] = function(){ + + + } + + /** + * Retrieve the details of a given user. + * + * @throws [Type] [] + * + * @return void + */ + $users["showUser"] = function(){ + + + } + + /** + * Update a given user. + * + * @throws [Type] [] + * + * @return void + */ + $users["updateUser"] = function(){ + + + } + + /** + * Delete a given user. + * + * @throws [Type] [] + * + * @return void + */ + $users["deleteUser"] = function(){ + + + } + + /** + * Retrieve the groups which contains a given user. + * + * @throws [Type] [] + * + * @return void + */ + $users["listUserGroups"] = function(){ + + + } + + /** + * Retrieve the projects which contains a given user. + * + * @throws [Type] [] + * + * @return void + */ + $users["listUserProjects"] = function(){ + + + } + + $actions["Credentials"] = $credentials; + $actions["Domains"] = $domains; + $actions["Endpoints"] = $endpoints; + $actions["Groups"] = $groups; + $actions["Policies"] = $policies; + $actions["Projects"] = $projects; + $actions["Roles"] = $roles; + $actions["Services"] = $services; + $actions["Tokens"] = $tokens; + $actions["Users"] = $users; }