From 7ccc7bf5f9738668bd4f4ff96715008a095ce06d Mon Sep 17 00:00:00 2001 From: Simon Leary Date: Wed, 24 Sep 2025 11:52:12 -0400 Subject: [PATCH] rename UnityGroup::userExists to memberExists --- resources/lib/UnityGroup.php | 6 +++--- test/functional/NewUserTest.php | 18 +++++++++--------- test/functional/PIMemberRequestTest.php | 2 +- test/functional/PiMemberApproveTest.php | 10 +++++----- test/functional/PiMemberDenyTest.php | 4 ++-- test/functional/PiRemoveUserTest.php | 12 ++++++------ webroot/panel/ajax/get_group_members.php | 2 +- webroot/panel/groups.php | 2 +- workers/remove-users-from-group.php | 2 +- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php index 2c509f6f..34e6ef02 100644 --- a/resources/lib/UnityGroup.php +++ b/resources/lib/UnityGroup.php @@ -312,7 +312,7 @@ public function denyUser($new_user, $send_mail = true) public function removeUser($new_user, $send_mail = true) { - if (!$this->userExists($new_user)) { + if (!$this->memberExists($new_user)) { return; } if ($new_user->uid == $this->getOwner()->uid) { @@ -348,7 +348,7 @@ public function newUserRequest( $org, $send_mail = true ) { - if ($this->userExists($new_user)) { + if ($this->memberExists($new_user)) { UnityHTTPD::errorLog("warning", "user '$new_user' already in group"); return; } @@ -490,7 +490,7 @@ private function removeUserFromGroup($old_user) $this->REDIS->removeCacheArray($old_user->uid, "groups", $this->gid); } - public function userExists($user) + public function memberExists($user) { return in_array($user->uid, $this->getGroupMemberUIDs()); } diff --git a/test/functional/NewUserTest.php b/test/functional/NewUserTest.php index d06ca3de..268d5190 100644 --- a/test/functional/NewUserTest.php +++ b/test/functional/NewUserTest.php @@ -146,9 +146,9 @@ private function ensureOrgGroupDoesNotExist() private function ensureUserNotInPIGroup(UnityGroup $pi_group) { global $USER, $REDIS; - if ($pi_group->userExists($USER)) { + if ($pi_group->memberExists($USER)) { $pi_group->removeUser($USER); - assert(!$pi_group->userExists($USER)); + assert(!$pi_group->memberExists($USER)); } $REDIS->removeCacheArray($pi_group->gid, "members", $USER->uid); } @@ -177,7 +177,7 @@ public function testCreateUserByJoinGoupByPI($user_to_create_args, $expected_uid $newOrg = new UnityOrg($SSO["org"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK); $this->assertTrue(!$newOrg->exists()); $this->assertTrue($pi_group->exists()); - $this->assertTrue(!$pi_group->userExists($USER)); + $this->assertTrue(!$pi_group->memberExists($USER)); $this->assertRequestedMembership(false, $gid); try { $this->requestGroupMembership($pi_group->gid); @@ -208,7 +208,7 @@ public function testCreateUserByJoinGoupByPI($user_to_create_args, $expected_uid $this->assertTrue(!$pi_group->requestExists($USER)); $this->assertRequestedMembership(false, $gid); - $this->assertTrue($pi_group->userExists($USER)); + $this->assertTrue($pi_group->memberExists($USER)); $this->assertTrue($USER->exists()); $this->assertTrue($newOrg->exists()); @@ -247,18 +247,18 @@ public function testCreateMultipleUsersByJoinGoupByPI() foreach ($users_to_create_args as $user_to_create_args) { switchUser(...$user_to_create_args); $this->assertTrue(!$USER->exists()); - $this->assertTrue(!$pi_group->userExists($USER)); + $this->assertTrue(!$pi_group->memberExists($USER)); $this->assertRequestedMembership(false, $gid); $this->requestGroupMembership($pi_group->gid); $this->assertRequestedMembership(true, $gid); $approve_uid = $USER->uid; switchUser(...$pi_user_args); - // $this->assertTrue(!$pi_group->userExists($USER)); + // $this->assertTrue(!$pi_group->memberExists($USER)); $this->approveUserByPI($approve_uid); switchUser(...$user_to_create_args); $this->assertTrue(!$pi_group->requestExists($USER)); $this->assertRequestedMembership(false, $gid); - $this->assertTrue($pi_group->userExists($USER)); + $this->assertTrue($pi_group->memberExists($USER)); $this->assertTrue($USER->exists()); } } finally { @@ -282,7 +282,7 @@ public function testCreateUserByJoinGoupByAdmin($user_to_create_args, $expected_ $newOrg = new UnityOrg($SSO["org"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK); $this->assertTrue(!$newOrg->exists()); $this->assertTrue($pi_group->exists()); - $this->assertTrue(!$pi_group->userExists($USER)); + $this->assertTrue(!$pi_group->memberExists($USER)); $this->assertRequestedMembership(false, $gid); try { $this->requestGroupMembership($pi_group->gid); @@ -313,7 +313,7 @@ public function testCreateUserByJoinGoupByAdmin($user_to_create_args, $expected_ $this->assertTrue(!$pi_group->requestExists($USER)); $this->assertRequestedMembership(false, $gid); - $this->assertTrue($pi_group->userExists($USER)); + $this->assertTrue($pi_group->memberExists($USER)); $this->assertTrue($USER->exists()); $this->assertTrue($newOrg->exists()); diff --git a/test/functional/PIMemberRequestTest.php b/test/functional/PIMemberRequestTest.php index 51e76e79..7b31e01b 100644 --- a/test/functional/PIMemberRequestTest.php +++ b/test/functional/PIMemberRequestTest.php @@ -37,7 +37,7 @@ public function testRequestMembership() $uid = $USER->uid; $this->assertFalse($USER->isPI()); $this->assertFalse($SQL->requestExists($uid, UnitySQL::REQUEST_BECOME_PI)); - $this->assertFalse($pi_group->userExists($USER)); + $this->assertFalse($pi_group->memberExists($USER)); try { $this->requestMembership($gid); $this->assertTrue($SQL->requestExists($uid, $gid)); diff --git a/test/functional/PiMemberApproveTest.php b/test/functional/PiMemberApproveTest.php index cfb9e80f..020675ef 100644 --- a/test/functional/PiMemberApproveTest.php +++ b/test/functional/PiMemberApproveTest.php @@ -63,16 +63,16 @@ public function testApproveRequest() try { switchUser(...$userSwitchArgs); $this->requestJoinPI($piGroup->gid); - $this->assertFalse($piGroup->userExists($user)); + $this->assertFalse($piGroup->memberExists($user)); switchUser(...$piSwitchArgs); $this->approveUser($uid); $this->assertTrue(!$piGroup->requestExists($user)); $this->assertEmpty($piGroup->getRequests()); $this->assertGroupMembers($piGroup, [$piUID, $uid]); - $this->assertTrue($piGroup->userExists($user)); + $this->assertTrue($piGroup->memberExists($user)); } finally { - if ($piGroup->userExists($user)) { + if ($piGroup->memberExists($user)) { $piGroup->removeUser($user); } if ($piGroup->requestExists($user)) { @@ -94,13 +94,13 @@ public function testApproveNonexistentRequest() $this->assertTrue($piGroup->exists()); $this->assertGroupMembers($piGroup, [$piUID]); $this->assertEmpty($piGroup->getRequests()); - $this->assertFalse($piGroup->userExists($user)); + $this->assertFalse($piGroup->memberExists($user)); $this->assertEmpty($piGroup->getRequests()); try { $this->expectException(Exception::class); $piGroup->approveUser($user); } finally { - if ($piGroup->userExists($user)) { + if ($piGroup->memberExists($user)) { $piGroup->removeUser($user); } } diff --git a/test/functional/PiMemberDenyTest.php b/test/functional/PiMemberDenyTest.php index a3738bc6..08b944d3 100644 --- a/test/functional/PiMemberDenyTest.php +++ b/test/functional/PiMemberDenyTest.php @@ -44,7 +44,7 @@ public function testDenyRequest() $requestedUser->getMail(), $requestedUser->getOrg(), ); - $this->assertFalse($piGroup->userExists($requestedUser)); + $this->assertFalse($piGroup->memberExists($requestedUser)); $piGroup->denyUser($requestedUser); $this->assertEmpty($piGroup->getRequests()); @@ -54,7 +54,7 @@ public function testDenyRequest() $piGroup->getGroupMemberUIDs() ) ); - $this->assertFalse($piGroup->userExists($requestedUser)); + $this->assertFalse($piGroup->memberExists($requestedUser)); } finally { $SQL->removeRequest(self::$requestUid, $piGroup->gid); } diff --git a/test/functional/PiRemoveUserTest.php b/test/functional/PiRemoveUserTest.php index ab1de450..dc4e7773 100644 --- a/test/functional/PiRemoveUserTest.php +++ b/test/functional/PiRemoveUserTest.php @@ -37,12 +37,12 @@ public function testRemoveUser() } } $this->assertNotEquals($pi->uid, $memberToDelete->uid); - $this->assertTrue($piGroup->userExists($memberToDelete)); + $this->assertTrue($piGroup->memberExists($memberToDelete)); try { $this->removeUser($memberToDelete->uid); - $this->assertFalse($piGroup->userExists($memberToDelete)); + $this->assertFalse($piGroup->memberExists($memberToDelete)); } finally { - if (!$piGroup->userExists($memberToDelete)) { + if (!$piGroup->memberExists($memberToDelete)) { $piGroup->newUserRequest( $memberToDelete, $memberToDelete->getFirstname(), @@ -62,13 +62,13 @@ public function testRemovePIFromTheirOwnGroup() $pi = $USER; $piGroup = $USER->getPIGroup(); $this->assertTrue($piGroup->exists()); - $this->assertTrue($piGroup->userExists($pi)); + $this->assertTrue($piGroup->memberExists($pi)); $this->expectException(Exception::class); try { $this->removeUser($pi->uid); - $this->assertTrue($piGroup->userExists($pi)); + $this->assertTrue($piGroup->memberExists($pi)); } finally { - if (!$piGroup->userExists($pi)) { + if (!$piGroup->memberExists($pi)) { $piGroup->newUserRequest( $pi, $pi->getFirstname(), diff --git a/webroot/panel/ajax/get_group_members.php b/webroot/panel/ajax/get_group_members.php index 45ff6bd3..878f703a 100644 --- a/webroot/panel/ajax/get_group_members.php +++ b/webroot/panel/ajax/get_group_members.php @@ -10,7 +10,7 @@ } $group = new UnityGroup($_GET["gid"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK); -if (!$group->userExists($USER)) { +if (!$group->memberExists($USER)) { UnityHTTPD::forbidden("not a group member"); } $members = $group->getGroupMembers(); diff --git a/webroot/panel/groups.php b/webroot/panel/groups.php index 0c7c104b..18b210c8 100644 --- a/webroot/panel/groups.php +++ b/webroot/panel/groups.php @@ -22,7 +22,7 @@ if ($pi_account->requestExists($USER)) { array_push($modalErrors, "You\'ve already requested this"); } - if ($pi_account->userExists($USER)) { + if ($pi_account->memberExists($USER)) { array_push($modalErrors, "You\'re already in this PI group"); } if ($USER->uid != $SSO["user"]) { diff --git a/workers/remove-users-from-group.php b/workers/remove-users-from-group.php index 9edb3e15..b293b841 100755 --- a/workers/remove-users-from-group.php +++ b/workers/remove-users-from-group.php @@ -27,7 +27,7 @@ function _die($msg) { while (($line = fgets($handle)) !== false) { $uid = trim($line); $user = new UnityUser($uid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK); - if (!$group->userExists($user)) { + if (!$group->memberExists($user)) { print("Skipping '$uid' who doesn't appear to be in '$gid'\n"); continue; }