airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [06/50] [abbrv] airavata-php-gateway git commit: AIRAVATA-2342 Fix adding realm role to user
Date Fri, 16 Jun 2017 20:36:09 GMT
AIRAVATA-2342 Fix adding realm role to user


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

Branch: refs/heads/develop
Commit: ee4e98a785eca23674c4ef19b3d022f65410cad2
Parents: 471b380
Author: Marcus Christie <machrist@iu.edu>
Authored: Thu Mar 23 15:21:39 2017 -0400
Committer: Marcus Christie <machrist@iu.edu>
Committed: Thu Mar 23 15:32:21 2017 -0400

----------------------------------------------------------------------
 app/libraries/Keycloak/API/RoleMapper.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ee4e98a7/app/libraries/Keycloak/API/RoleMapper.php
----------------------------------------------------------------------
diff --git a/app/libraries/Keycloak/API/RoleMapper.php b/app/libraries/Keycloak/API/RoleMapper.php
index e79246e..738012b 100644
--- a/app/libraries/Keycloak/API/RoleMapper.php
+++ b/app/libraries/Keycloak/API/RoleMapper.php
@@ -1,6 +1,7 @@
 <?php
 namespace Keycloak\API;
 
+use Exception;
 use Log;
 
 /**
@@ -55,7 +56,6 @@ class RoleMapper {
         return $result;
     }
 
-    // TODO: change this to an Array of role representations
     public function addRealmRoleMappingsToUser($realm, $user_id, $role_representations) {
 
         // get access token for admin API
@@ -66,27 +66,23 @@ class RoleMapper {
         curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($r, CURLOPT_ENCODING, 1);
         curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
-        curl_setopt($r, CURLOPT_HTTPHEADER, array(
-            "Authorization: Bearer " . $access_token
-        ));
 
         curl_setopt($r, CURLOPT_POST, true);
         $data = json_encode($role_representations);
+        // Log::debug("addRealmRoleMappingsToUser data=$data");
         curl_setopt($r, CURLOPT_HTTPHEADER, array(
+            "Authorization: Bearer " . $access_token,
             'Content-Type: application/json',
             'Content-Length: ' . strlen($data))
         );
         curl_setopt($r, CURLOPT_POSTFIELDS, $data);
 
         $response = curl_exec($r);
-        if ($response == false) {
-            Log::error("Failed to add realm role mapping to user");
-            die("curl_exec() failed. Error: " . curl_error($r));
-        }
-        $result = json_decode($response);
         $info = curl_getinfo($r);
-        // Log::debug("addRealmRoleMappingsToUser result", array($result, $info));
-        return $result;
+        if ($info['http_code'] != 200 && $info['http_code'] != 204) {
+            throw new Exception("Failed to add realm role mapping to user");
+        }
+        return;
     }
 
     // TODO: factor this out into base class?


Mime
View raw message