UnityOrg as well

Author: simonLeary42

resources/lib/UnityOrg.php

@@ -7,6 +7,7 @@
 class UnityOrg
 {
     private $orgid;
+    private $entry;
 
     private $MAILER;
     private $SQL;
@@ -17,6 +18,7 @@ class UnityOrg
     public function __construct($orgid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK)
     {
         $this->orgid = $orgid;
+        $this->entry = $LDAP->getOrgGroupEntry($this->orgid);
 
         $this->LDAP = $LDAP;
         $this->SQL = $SQL;
@@ -27,27 +29,20 @@ public function __construct($orgid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK)
 
     public function init()
     {
-        $org_group = $this->getLDAPOrgGroup();
-
-        if (!$org_group->exists()) {
+        if (!$this->entry->exists()) {
             $nextGID = $this->LDAP->getNextOrgGIDNumber($this->SQL);
 
-            $org_group->setAttribute("objectclass", UnityLDAP::POSIX_GROUP_CLASS);
-            $org_group->setAttribute("gidnumber", strval($nextGID));
-            $org_group->write();
+            $this->entry->setAttribute("objectclass", UnityLDAP::POSIX_GROUP_CLASS);
+            $this->entry->setAttribute("gidnumber", strval($nextGID));
+            $this->entry->write();
         }
 
         $this->REDIS->appendCacheArray("sorted_orgs", "", $this->getOrgID());
     }
 
     public function exists()
     {
-        return $this->getLDAPOrgGroup()->exists();
-    }
-
-    public function getLDAPOrgGroup()
-    {
-        return $this->LDAP->getOrgGroupEntry($this->orgid);
+        return $this->entry->exists();
     }
 
     public function getOrgID()
@@ -89,8 +84,7 @@ public function getOrgMemberUIDs($ignorecache = false)
         }
         $updatecache = false;
         if (!isset($members)) {
-            $org_group = $this->getLDAPOrgGroup();
-            $members = $org_group->getAttribute("memberuid");
+            $members = $this->entry->getAttribute("memberuid");
             $updatecache = true;
         }
         if (!$ignorecache && $updatecache) {
@@ -102,17 +96,15 @@ public function getOrgMemberUIDs($ignorecache = false)
 
     public function addUser($user)
     {
-        $org_group = $this->getLDAPOrgGroup();
-        $org_group->appendAttribute("memberuid", $user->getUID());
-        $org_group->write();
-        $this->REDIS->appendCacheArray($this->getOrgID(), "members", $user->getUID());
+        $this->entry->appendAttribute("memberuid", $user->getUID());
+        $this->entry->write();
+        $this->REDIS->appendCacheArray($this->getOrgID(), "members", $user->uid);
     }
 
     public function removeUser($user)
     {
-        $org_group = $this->getLDAPOrgGroup();
-        $org_group->removeAttributeEntryByValue("memberuid", $user->getUID());
-        $org_group->write();
+        $this->entry->removeAttributeEntryByValue("memberuid", $user->getUID());
+        $this->entry->write();
         $this->REDIS->removeCacheArray($this->getOrgID(), "members", $user->getUID());
     }
 }

test/functional/NewUserTest.php

@@ -84,9 +84,9 @@ private function ensureUserDoesNotExist()
     private function ensureOrgGroupDoesNotExist()
     {
         global $USER, $SSO, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK;
-        $org_group = new UnityOrg($SSO["org"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
+        $org_group = $LDAP->getOrgGroupEntry($SSO["org"]);
         if ($org_group->exists()) {
-            $org_group->getLDAPOrgGroup()->delete();
+            $org_group->delete();
             assert(!$org_group->exists());
         }
     }