You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/11/25 00:30:07 UTC
[1/2] airavata-php-gateway git commit: fixing username claim uri issue
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop e4e613f97 -> f072341a1
fixing username claim uri issue
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/ba6381dd
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ba6381dd
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ba6381dd
Branch: refs/heads/develop
Commit: ba6381dd33a28c925411c3673e0ce6278294b943
Parents: cce4225
Author: scnakandala <su...@gmail.com>
Authored: Tue Nov 24 18:29:54 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Nov 24 18:29:54 2015 -0500
----------------------------------------------------------------------
app/libraries/Wsis/Wsis.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ba6381dd/app/libraries/Wsis/Wsis.php
----------------------------------------------------------------------
diff --git a/app/libraries/Wsis/Wsis.php b/app/libraries/Wsis/Wsis.php
index 69c0e2f..48739e2 100755
--- a/app/libraries/Wsis/Wsis.php
+++ b/app/libraries/Wsis/Wsis.php
@@ -212,7 +212,7 @@ class Wsis {
*/
public function getUserProfileFromOAuthToken($token){
$userProfile = $this->oauthManger->getUserProfile($token);
- return array('username'=>$userProfile->username, 'email'=>$userProfile->email, 'firstname'=>$userProfile->given_name,
+ return array('username'=>$userProfile->sub, 'email'=>$userProfile->email, 'firstname'=>$userProfile->given_name,
'lastname'=>$userProfile->family_name, 'roles'=>explode(",",$userProfile->roles));
}
[2/2] airavata-php-gateway git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by sc...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
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/f072341a
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f072341a
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f072341a
Branch: refs/heads/develop
Commit: f072341a10b78757e9397cc3a038390433152057
Parents: ba6381d e4e613f
Author: scnakandala <su...@gmail.com>
Authored: Tue Nov 24 18:30:04 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Nov 24 18:30:04 2015 -0500
----------------------------------------------------------------------
app/controllers/ExperimentController.php | 5 +-
app/controllers/ResourceController.php | 2 +-
app/controllers/StorageresourceController.php | 71 +-
app/libraries/Airavata/API/Airavata.php | 420 +++++----
.../Model/AppCatalog/ComputeResource/Types.php | 943 +++----------------
.../Model/AppCatalog/StorageResource/Types.php | 6 +-
.../Airavata/Model/Experiment/Types.php | 23 +
app/libraries/Airavata/Model/Process/Types.php | 23 +
app/libraries/ExperimentUtilities.php | 114 ++-
app/libraries/SRUtilities.php | 223 +----
app/views/layout/fixed-scripts.blade.php | 2 +
app/views/partials/dashboard-block.blade.php | 4 +-
app/views/partials/experiment-info.blade.php | 135 ++-
app/views/partials/experiment-inputs.blade.php | 2 +-
app/views/resource/edit.blade.php | 25 +-
app/views/storage-resource/browse.blade.php | 16 +-
app/views/storage-resource/edit.blade.php | 706 +++-----------
17 files changed, 867 insertions(+), 1853 deletions(-)
----------------------------------------------------------------------