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 2016/04/23 04:08:14 UTC

[17/23] airavata-php-gateway git commit: encoding username and password

encoding username and password


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/6e674f56
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6e674f56
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6e674f56

Branch: refs/heads/master
Commit: 6e674f56193c15751c85092f776cbf3430db19e2
Parents: 2ddf2db
Author: scnakandala <su...@gmail.com>
Authored: Tue Apr 19 12:23:48 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Apr 19 12:23:48 2016 -0400

----------------------------------------------------------------------
 app/controllers/AccountController.php     | 2 +-
 app/libraries/Wsis/Stubs/OAuthManager.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6e674f56/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 8a95992..6b0608b 100644
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -376,7 +376,7 @@ class AccountController extends BaseController
             $username = $username . "@" . $wsisConfig['tenant-domain'];
 
         $str = "Gateway Portal: " . $_SERVER['SERVER_NAME'] ."<br/>";
-        $str = $str . "Username: " . $username ."<br/>";
+        $str = $str . "Username: " . $username ."<ber/>";
         $str = $str . "Name: " . $userProfile["firstname"] . " " . $userProfile["lastname"] . "<br/>";
         $str = $str . "Email: " . $userProfile["email"];
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6e674f56/app/libraries/Wsis/Stubs/OAuthManager.php
----------------------------------------------------------------------
diff --git a/app/libraries/Wsis/Stubs/OAuthManager.php b/app/libraries/Wsis/Stubs/OAuthManager.php
index e127e18..b67c3a1 100644
--- a/app/libraries/Wsis/Stubs/OAuthManager.php
+++ b/app/libraries/Wsis/Stubs/OAuthManager.php
@@ -70,7 +70,7 @@ class OAuthManager
         ));
 
         // Assemble POST parameters for the request.
-        $post_fields = "grant_type=password&username=" . $username . "&password=" . $password . "&scope=openid";
+        $post_fields = "grant_type=password&username=" . urlencode($username) . "&password=" . urlencode($password) . "&scope=openid";
 
         // Obtain and return the access token from the response.
         curl_setopt($r, CURLOPT_POST, true);