AIRAVATA-2156 Using CredentialSummary with token, description
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/6496e54b Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6496e54b Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6496e54b Branch: refs/heads/develop Commit: 6496e54b45aacf82129add534e5bfb085a9b6884 Parents: 127653f Author: Marcus Christie <[email protected]> Authored: Wed Oct 26 11:43:35 2016 -0400 Committer: Marcus Christie <[email protected]> Committed: Wed Oct 26 16:45:13 2016 -0400 ---------------------------------------------------------------------- app/controllers/AccountController.php | 7 ++++--- app/libraries/URPUtilities.php | 24 +---------------------- app/views/account/credential-store.blade.php | 12 ++++++------ 3 files changed, 11 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6496e54b/app/controllers/AccountController.php ---------------------------------------------------------------------- diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index 6ac13f3..ccd3305 100644 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -489,7 +489,7 @@ class AccountController extends BaseController URPUtilities::update_user_resource_profile($userResourceProfile); $credentialSummaryMap = $this->create_credential_summary_map(URPUtilities::get_all_ssh_pub_keys_summary_for_user()); - $description = $credentialSummaryMap[$defaultToken]["description"]; + $description = $credentialSummaryMap[$defaultToken]->description; return Redirect::to("account/credential-store")->with("message", "SSH Key '$description' is now the default"); } @@ -498,18 +498,19 @@ class AccountController extends BaseController $credentialStoreToken = Input::get("credentialStoreToken"); $credentialSummaryMap = $this->create_credential_summary_map(URPUtilities::get_all_ssh_pub_keys_summary_for_user()); - $description = $credentialSummaryMap[$credentialStoreToken]["description"]; + $description = $credentialSummaryMap[$credentialStoreToken]->description; if (AdminUtilities::remove_ssh_token($credentialStoreToken)) { return Redirect::to("account/credential-store")->with("message", "SSH Key '$description' is was deleted"); } } + // TODO: move to URPUtilities? private function create_credential_summary_map($credentialSummaries) { $credentialSummaryMap = array(); foreach ($credentialSummaries as $csIndex => $credentialSummary) { - $credentialSummaryMap[$credentialSummary["credentialStoreToken"]] = $credentialSummary; + $credentialSummaryMap[$credentialSummary->token] = $credentialSummary; } return $credentialSummaryMap; } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6496e54b/app/libraries/URPUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/URPUtilities.php b/app/libraries/URPUtilities.php index 62c2318..fccf63e 100644 --- a/app/libraries/URPUtilities.php +++ b/app/libraries/URPUtilities.php @@ -56,29 +56,7 @@ class URPUtilities $userId = Session::get('username'); $gatewayId = Session::get('gateway_id'); - // TODO use the real method once it has the credentialStoreToken in it - // $credSummaries = Airavata::getAllSSHPubKeysSummaryForUserInGateway(Session::get('authz-token'), $gatewayId, $userId); - $userResourceProfile = URPUtilities::get_or_create_user_resource_profile(); - $publicKey = AdminUtilities::get_pubkey_from_token($userResourceProfile->credentialStoreToken); - $credSummaries = array( - array( - "publicKey" => $publicKey, - "description" => "Default SSH Public Key", - "credentialStoreToken" => $userResourceProfile->credentialStoreToken - ), - array( - "publicKey" => "dummy public key", - "description" => "Public Key #2", - "credentialStoreToken" => "abc123" - ), - array( - "publicKey" => "dummy public key", - "description" => "Public Key #3", - "credentialStoreToken" => "def456" - ) - ); - - return $credSummaries; + return Airavata::getAllSSHPubKeysSummaryForUserInGateway(Session::get('authz-token'), $gatewayId, $userId); } // Only used for testing http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6496e54b/app/views/account/credential-store.blade.php ---------------------------------------------------------------------- diff --git a/app/views/account/credential-store.blade.php b/app/views/account/credential-store.blade.php index 20eadcd..a29d7f7 100644 --- a/app/views/account/credential-store.blade.php +++ b/app/views/account/credential-store.blade.php @@ -22,10 +22,10 @@ <select class="form-control" id="defaultToken" name="defaultToken"> @foreach ($credentialSummaries as $credentialSummary) <option - @if ($credentialSummary["credentialStoreToken"] == $defaultCredentialSummary["credentialStoreToken"]) + @if ($credentialSummary->token == $defaultCredentialSummary->token) selected @endif - value="{{ $credentialSummary["credentialStoreToken"] }}">{{ $credentialSummary["description"] }}</option> + value="{{ $credentialSummary->token }}">{{ $credentialSummary->description }}</option> @endforeach </select> </div> @@ -45,14 +45,14 @@ @foreach ($credentialSummaries as $credentialSummary) <tr> <td> - {{ $credentialSummary["description"] }} + {{ $credentialSummary->description }} </td> <td> - {{ $credentialSummary["publicKey"] }} + {{ $credentialSummary->publicKey }} </td> <td> - <span data-token="{{$credentialSummary["credentialStoreToken"]}}" - data-description="{{$credentialSummary["description"]}}" + <span data-token="{{$credentialSummary->token}}" + data-description="{{$credentialSummary->description}}" class="glyphicon glyphicon-trash delete-credential"></span> </td> </tr>
