airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata-php-gateway] branch develop updated: Fixing missing user_id variable error
Date Tue, 02 Oct 2018 18:52:46 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git


The following commit(s) were added to refs/heads/develop by this push:
     new 73bbc2f  Fixing missing user_id variable error
     new 60b4c19  Merge branch 'iu-ldap-cybergateway-group' into develop
73bbc2f is described below

commit 73bbc2f37f8c8167c88ceebd0198f4974f34a466
Author: Marcus Christie <machrist@iu.edu>
AuthorDate: Tue Oct 2 14:52:06 2018 -0400

    Fixing missing user_id variable error
---
 app/libraries/URPUtilities.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/libraries/URPUtilities.php b/app/libraries/URPUtilities.php
index da22b98..48dca96 100644
--- a/app/libraries/URPUtilities.php
+++ b/app/libraries/URPUtilities.php
@@ -209,7 +209,7 @@ class URPUtilities
                         // it was attempted to be setup. We'll try to set it up again.
                         // Also, the setup may be incomplete in which case we
                         // should also try to setup it up again.
-                        if (!$userComputeResourcePreference->validated || !URPUtilities::is_ssh_account_setup_complete($user_id,
$computeResourceId, $userComputeResourcePreference)) {
+                        if (!$userComputeResourcePreference->validated || !URPUtilities::is_ssh_account_setup_complete($computeResourceId,
$userComputeResourcePreference)) {
                             $userComputeResourcePreference = URPUtilities::setup_ssh_account($gatewayId,
$userId, $computeResourceId, $hostname, $userComputeResourcePreference);
                         }
                     } else if ($sshAccountProvisioner->canCreateAccount) {
@@ -247,7 +247,7 @@ class URPUtilities
         return $sshAccountProvisionersByName;
     }
 
-    private static function is_ssh_account_setup_complete($userId, $computeResourceId, $userComputeResourcePreference)
+    private static function is_ssh_account_setup_complete($computeResourceId, $userComputeResourcePreference)
     {
         return Airavata::isSSHSetupCompleteForUserComputeResourcePreference(
             Sesssion::get('authz-token'),


Mime
View raw message