Skip to content

Update Campus Champion ACL after logging in. #1769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
aaronweeden wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update Campus Champion ACL after logging in. #1769

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion classes/XDUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2443,7 +2443,16 @@ public static function validateRID($rid)
public function postLogin() {
if (!$this->isSticky()) {
$this->updatePerson();
$this->synchronizeOrganization();
$orgHasChanged = $this->synchronizeOrganization();
// If the user hasn't changed organizations, check if they should
// be given the Campus Champion ACL (CampusChampionAclUpdater is
// defined in the xdmod-xsede module).
if (
!$orgHasChanged
&& class_exists('\User\CampusChampionAclUpdater')
) {
\User\CampusChampionAclUpdater::update($this);
}
}
$this->currentToken = XDSessionManager::recordLogin($this);
}
Expand All @@ -2457,10 +2466,14 @@ public function postLogin() {
* to the admin / user notifying them that additional steps will need to be taken before their
* former level of access is restored.
*
* @return bool whether the user's organization had been updated.
* @throws Exception
*/
public function synchronizeOrganization()
{
// Temporarily assume the user's organization has not been updated.
$orgHasChanged = false;

// This is pulled from the moddb.Users.organization_id column for this user record.
$actualOrganization = $this->getOrganizationID();

Expand All @@ -2476,6 +2489,7 @@ public function synchronizeOrganization()

// If these don't match then the user's organization has been updated. Steps need to be taken.
if ($actualOrganization !== $expectedOrganization) {
$orgHasChanged = true;
$originalAcls = $this->getAcls(true);

// if the user is currently assigned an acl that interacts with XDMoD's centers ( i.e.
Expand Down Expand Up @@ -2547,6 +2561,8 @@ public function synchronizeOrganization()
$this->setOrganizationId($expectedOrganization);
$this->saveUser();
}

return $orgHasChanged;
}

/**
Expand Down