COmanage Developers List

Author: benno
Date: 2013-02-09 19:22:03 -0500 (Sat, 09 Feb 2013)
New Revision: 437

Modified:
   registry/trunk/app/Controller/Component/RoleComponent.php
Log:
Temporary patch to restore REST authnz

Modified: registry/trunk/app/Controller/Component/RoleComponent.php
===================================================================
--- registry/trunk/app/Controller/Component/RoleComponent.php   2013-02-05 
20:34:23 UTC (rev 436)
+++ registry/trunk/app/Controller/Component/RoleComponent.php   2013-02-10 
00:22:03 UTC (rev 437)
@@ -261,6 +261,20 @@
       $username = $this->Session->read('Auth.User.username');
     }
     
+    // API user or Org Person?
+    
+    if($this->Session->check('Auth.User.api_user_id')) {
+      $ret['apiuser'] = true;
+      $ret['cmadmin'] = true;  // API users are currently platform admins 
(CO-91)
+      
+      // Return here to avoid triggering a bunch of RoleComponent queries 
that
+      // may fail since api users are not currently enrolled in any CO.
+      
+      return $ret;
+    } elseif($this->Session->check('Auth.User.org_identities')) {
+      $ret['orgidentities'] = 
$this->Session->read('Auth.User.org_identities');
+    }
+    
     // Is this user a CMP admin?
     
     if($username != null) {
@@ -334,15 +348,6 @@
       $ret['user'] = true;
     }
     
-    // API user or Org Person?
-    
-    if($this->Session->check('Auth.User.api_user_id')) {
-      $ret['apiuser'] = true;
-      $ret['cmadmin'] = true;  // API users are currently platform admins
-    } elseif($this->Session->check('Auth.User.org_identities')) {
-      $ret['orgidentities'] = 
$this->Session->read('Auth.User.org_identities');
-    }
-    
     return $ret;
   }