Skip to content
This repository was archived by the owner on Sep 19, 2022. It is now read-only.

Commit 660ba85

Browse files
committed
fix: Swaps getUsersGroupsOnSp and getUsersGroupsOnFacility methods
1 parent e5a63ba commit 660ba85

6 files changed

Lines changed: 11 additions & 11 deletions

File tree

lib/Adapter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,15 @@ abstract public function getFacilityByClientId($clientId, $clientIdAttr);
178178
*
179179
* @return Group[] from vo which are assigned to all facilities with spEntityId for this userId
180180
*/
181-
abstract public function getUsersGroupsOnSp($spEntityId, $userId);
181+
abstract public function getUsersGroupsOnFacility($spEntityId, $userId);
182182

183183
/**
184184
* @param Facility $facility entity id of the sp
185185
* @param int $userId
186186
*
187187
* @return Group[] from vo which are assigned to all facilities with spEntityId for this userId
188188
*/
189-
abstract public function getUsersGroupsOnFacility($facility, $userId);
189+
abstract public function getUsersGroupsOnSp($facility, $userId);
190190

191191
/**
192192
* @param <String, String> map $attribute

lib/AdapterLdap.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,14 +461,14 @@ public function setUserExtSourceAttributes($userExtSourceId, $attributes)
461461
$this->fallbackAdapter->setUserExtSourceAttributes($userExtSourceId, $attributes);
462462
}
463463

464-
public function getUsersGroupsOnSp($spEntityId, $userId)
464+
public function getUsersGroupsOnFacility($spEntityId, $userId)
465465
{
466466
$facility = $this->getFacilityByEntityId($spEntityId);
467467

468-
return self::getUsersGroupsOnFacility($facility, $userId);
468+
return self::getUsersGroupsOnSp($facility, $userId);
469469
}
470470

471-
public function getUsersGroupsOnFacility($facility, $userId)
471+
public function getUsersGroupsOnSp($facility, $userId)
472472
{
473473
if (null === $facility) {
474474
return [];

lib/AdapterRpc.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,14 +380,14 @@ public function getFacilityAttribute($facility, $attrName)
380380
return $perunAttr['value'];
381381
}
382382

383-
public function getUsersGroupsOnSp($spEntityId, $userId)
383+
public function getUsersGroupsOnFacility($spEntityId, $userId)
384384
{
385385
$facility = $this->getFacilityByEntityId($spEntityId);
386386

387-
return self::getUsersGroupsOnFacility($facility, $userId);
387+
return self::getUsersGroupsOnSp($facility, $userId);
388388
}
389389

390-
public function getUsersGroupsOnFacility($facility, $userId)
390+
public function getUsersGroupsOnSp($facility, $userId)
391391
{
392392
if (null === $facility) {
393393
return [];

lib/Auth/Process/PerunIdentity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public function process(&$request)
241241

242242
$this->checkMemberStateDefaultVo($request, $user, $uids);
243243

244-
$groups = $this->adapter->getUsersGroupsOnSp($this->spEntityId, $user->getId());
244+
$groups = $this->adapter->getUsersGroupsOnFacility($this->spEntityId, $user->getId());
245245

246246
if ($this->checkGroupMembership && empty($groups)) {
247247
if ($this->allowRegistrationToGroups) {

lib/Auth/Process/PerunUserGroups.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function process(&$request)
5252
throw new Exception(self::DEBUG_PREFIX . 'Cannot find SP EntityID');
5353
}
5454

55-
$groups = $this->adapter->getUsersGroupsOnSp($spEntityId, $user->getId());
55+
$groups = $this->adapter->getUsersGroupsOnFacility($spEntityId, $user->getId());
5656
$request[PerunConstants::PERUN][PerunConstants::USER_GROUPS] = $groups;
5757
}
5858
}

lib/Auth/Process/SpAuthorization.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public function process(&$request)
171171
return;
172172
}
173173

174-
$userGroups = $this->adapter->getUsersGroupsOnFacility($facility, $user->getId());
174+
$userGroups = $this->adapter->getUsersGroupsOnSp($facility, $user->getId());
175175
if (!empty($userGroups)) {
176176
Logger::info(self::DEBUG_PREFIX . 'User satisfies the group membership check.');
177177
} else {

0 commit comments

Comments
 (0)