-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merging AppGroup changes into 2.x branch (#869)
* Checking if the organisation is ApigeeX for AppGroup (#803) * Fix organisation exception (#806) * Changes for Appgroup listing/view/edit/delete page (#805) * Changes for Appgroup listing/view/edit/delete page * Update composer.json * Update composer.json * AppGroup-App implementation for list, view, edit, delete apps (#813) * Merge 2.x into appgroup (#829) * Warrant that queues executed by cron (#808) * Sort API Product listings on App (#812) * Update endpoints to use constants from ClientInterface (#810) * Sort API products on app forms by API product display name (#815) * Sort API Products (#818) * Sort API Products TypeError: array_map(): Argument #2 ($array) must be of type array * Removed test case * App creation fails without API Products (#809) * App creation fails without API Products caused by features.keymanagement.disable.unbounded.permissions flag * Update minimum version of apigee-client-php * Make sure that cron runner starts executing the job (#814) * Checking if the organisation is ApigeeX for AppGroup (#803) * Fix organisation exception (#806) * Changes for Appgroup listing/view/edit/delete page (#805) * Changes for Appgroup listing/view/edit/delete page * Update composer.json * Update composer.json * AppGroup-App implementation for list, view, edit, delete apps (#813) --------- Co-authored-by: Dezső BICZÓ <[email protected]> Co-authored-by: Shishir <[email protected]> Co-authored-by: phdhiren <[email protected]> Co-authored-by: Divyajose <[email protected]> * Support for Add AppGroup/team and update team App credentials with ApiProduct (#824) * Support for AppGroup membership (#825) * The Apigee Edge and X Teams module requirements (#826) * Checking ApigeeX org from OrganizationController and removed from SDKController (#832) * If team not available on Apigee avoid null value exception (#833) * Added admin config setting for Team prefix and channelID (#839) * Implemented AppGroup membership feature for ApigeeX (#843) * Merge 2.x into appgroup branch (#859) * Warrant that queues executed by cron (#808) * Sort API Product listings on App (#812) * Update endpoints to use constants from ClientInterface (#810) * Sort API products on app forms by API product display name (#815) * Sort API Products (#818) * Sort API Products TypeError: array_map(): Argument #2 ($array) must be of type array * Removed test case * App creation fails without API Products (#809) * App creation fails without API Products caused by features.keymanagement.disable.unbounded.permissions flag * Update minimum version of apigee-client-php * Make sure that cron runner starts executing the job (#814) * Update the storage defination of App entity (#831) * Fix issue which removes users from all team (#840) * Drop PHP 7 support again (#816) * Revert "Support for PHP 7.4 (#800)" This reverts commit b71f8a9. * Clearly specify the currently supported PHP versions * Update outdated info.yml * Added accessCheck on entity queries (#842) * added accessCheck on entity queries Co-authored-by: Vladimir Roudakov <[email protected]> * added comment --------- Co-authored-by: Vladimir Roudakov <[email protected]> * Fix for jQuery.once() is deprecated in Drupal 9.3 (#851) Co-authored-by: Vladimir Roudakov <[email protected]> * fix for phpcs failing in github action (#858) * PHPCS FIX --------- Co-authored-by: Shishir <[email protected]> Co-authored-by: Dezső BICZÓ <[email protected]> Co-authored-by: Gitesh Koli <[email protected]> Co-authored-by: Divyajose <[email protected]> Co-authored-by: Vladimir Roudakov <[email protected]> * Implemented AppGroup Team Membership Sync (#853) * Get AppGroup team members from DB (#864) * Get AppGroup team members from DB and fix recurring teams api call * Declaring abstract method * Fix action module getTeam method argument * Fix for team sync issue when DB is empty * Added team member sync note for ApigeeX (#867) --------- Co-authored-by: Shishir <[email protected]> Co-authored-by: Divyajose <[email protected]> Co-authored-by: Gitesh Koli <[email protected]> Co-authored-by: Dezső BICZÓ <[email protected]> Co-authored-by: Vladimir Roudakov <[email protected]>
- Loading branch information
5 people
authored
Jun 23, 2023
1 parent
386c83f
commit ea6a45f
Showing
52 changed files
with
1,628 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
modules/apigee_edge_teams/config/install/apigee_edge_teams.team_settings.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
209 changes: 209 additions & 0 deletions
209
modules/apigee_edge_teams/src/AppGroupMembersController.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,209 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * Copyright 2023 Google Inc. | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * version 2 as published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, | ||
| * MA 02110-1301, USA. | ||
| */ | ||
|
|
||
| namespace Drupal\apigee_edge_teams; | ||
|
|
||
| use Apigee\Edge\Api\ApigeeX\Controller\AppGroupMembersController as ApigeeXAppGroupMembersController; | ||
| use Apigee\Edge\Api\ApigeeX\Structure\AppGroupMembership; | ||
| use Drupal\apigee_edge\Entity\Controller\OrganizationController; | ||
| use Drupal\apigee_edge\SDKConnectorInterface; | ||
| use Drupal\apigee_edge_teams\Entity\Form\TeamForm; | ||
| use Drupal\apigee_edge_teams\Entity\TeamInvitationInterface; | ||
| use Drupal\apigee_edge_teams\Entity\TeamMemberRoleInterface; | ||
| use Drupal\Component\Serialization\Json; | ||
|
|
||
| /** | ||
| * Definition of the AppGroup members controller service. | ||
| * | ||
| * @internal You should use the team membership manager service instead of this. | ||
| */ | ||
| final class AppGroupMembersController implements AppGroupMembersControllerInterface { | ||
|
|
||
| /** | ||
| * Name of a appgroup. | ||
| * | ||
| * @var string | ||
| */ | ||
| private $appGroup; | ||
|
|
||
| /** | ||
| * The SDK connector service. | ||
| * | ||
| * @var \Drupal\apigee_edge\SDKConnectorInterface | ||
| */ | ||
| private $connector; | ||
|
|
||
| /** | ||
| * The appgroup membership object cache. | ||
| * | ||
| * @var \Drupal\apigee_edge_teams\AppGroupMembershipObjectCacheInterface | ||
| */ | ||
| private $appGroupMembershipObjectCache; | ||
|
|
||
| /** | ||
| * AppGroupMembersController constructor. | ||
| * | ||
| * @param string $appGroup | ||
| * The name of the appgroup. | ||
| * @param \Drupal\apigee_edge\SDKConnectorInterface $connector | ||
| * The SDK connector service. | ||
| * @param \Drupal\apigee_edge_teams\AppGroupMembershipObjectCacheInterface $appgroup_membership_object_cache | ||
| * The appgroup membership object cache. | ||
| */ | ||
| public function __construct(string $appGroup, SDKConnectorInterface $connector, AppGroupMembershipObjectCacheInterface $appgroup_membership_object_cache) { | ||
| $this->appGroup = $appGroup; | ||
| $this->connector = $connector; | ||
| $this->appGroupMembershipObjectCache = $appgroup_membership_object_cache; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the decorated appgroup members controller from the SDK. | ||
| * | ||
| * @return \Apigee\Edge\Api\ApigeeX\Controller\AppGroupMembersController | ||
| * The initialized appgroup members controller. | ||
| */ | ||
| private function decorated(): ApigeeXAppGroupMembersController { | ||
| return new ApigeeXAppGroupMembersController($this->appGroup, $this->connector->getOrganization(), $this->connector->getClient()); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getAppGroup(): string { | ||
| return $this->decorated()->getAppGroup(); | ||
| } | ||
|
|
||
| /** | ||
| * Syncs the appgroup team members email and roles in database. | ||
| * | ||
| * @return \Apigee\Edge\Api\ApigeeX\Structure\AppGroupMembership | ||
| * Array of developers with their optional roles in the appgroup. | ||
| */ | ||
| public function syncAppGroupMembers(): AppGroupMembership { | ||
| $membership = $this->decorated()->getMembers(); | ||
|
|
||
| $developer_exist = TRUE; | ||
| foreach ($membership->getMembers() as $developer_id => $roles) { | ||
| $roles = is_array($roles) ? $roles : []; | ||
|
|
||
| /** @var \Drupal\user\Entity\User $account */ | ||
| $account = user_load_by_mail($developer_id); | ||
|
|
||
| if (!$account) { | ||
| $developer_exist = FALSE; | ||
| /** @var \Drupal\apigee_edge_teams\Entity\Storage\TeamInvitationStorageInterface $teamInvitationStorage */ | ||
| $teamInvitationStorage = \Drupal::entityTypeManager()->getStorage('team_invitation'); | ||
|
|
||
| $pending_invitations = array_filter($teamInvitationStorage->loadByRecipient($developer_id, $this->appGroup), function (TeamInvitationInterface $team_invitation) { | ||
| return $team_invitation->isPending(); | ||
| }); | ||
|
|
||
| // Checking if this developer has already pending invite to prevent multiple invites. | ||
| if (count($pending_invitations) === 0) { | ||
| $teamInvitationStorage->create([ | ||
| 'team' => ['target_id' => $this->appGroup], | ||
| 'team_roles' => array_values(array_map(function (string $role) { | ||
| return ['target_id' => $role]; | ||
| }, $roles)), | ||
| 'recipient' => $developer_id, | ||
| ])->save(); | ||
| } | ||
| } | ||
| else { | ||
| /** @var \Drupal\apigee_edge_teams\Entity\TeamInterface|null $team_entity */ | ||
| $team_entity = \Drupal::entityTypeManager()->getStorage('team')->load($this->appGroup); | ||
| /** @var \Drupal\apigee_edge_teams\Entity\Storage\TeamMemberRoleStorageInterface $team_member_role_storage */ | ||
| $team_member_role_storage = \Drupal::entityTypeManager()->getStorage('team_member_role'); | ||
| $team_member_role_storage->addTeamRoles($account, $team_entity, $roles); | ||
| } | ||
| } | ||
| // Caching the membership only if all the developer exists in Drupal | ||
| // to avoid team member without access. | ||
| if ($developer_exist) { | ||
| $this->appGroupMembershipObjectCache->saveMembership($this->appGroup, $membership); | ||
| } | ||
|
|
||
| return $membership; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getMembers(): AppGroupMembership { | ||
| $membership = $this->appGroupMembershipObjectCache->getMembership($this->appGroup); | ||
| if ($membership === NULL) { | ||
| /** @var \Drupal\apigee_edge_teams\Entity\TeamInterface|null $team_entity */ | ||
| $team_entity = \Drupal::entityTypeManager()->getStorage('team')->load($this->appGroup); | ||
| // Load team_member_role object. | ||
| $team_member_role_storage = \Drupal::entityTypeManager()->getStorage('team_member_role'); | ||
| $members = array_reduce($team_member_role_storage->loadByTeam($team_entity), function ($carry, TeamMemberRoleInterface $developer_role) { | ||
| $carry[$developer_role->getDeveloper()->getEmail()] = $developer_role->getDeveloper()->getEmail(); | ||
| return $carry; | ||
| }, | ||
| []); | ||
| $membership = new AppGroupMembership($members); | ||
| $this->appGroupMembershipObjectCache->saveMembership($team_entity->id(), $membership); | ||
| } | ||
|
|
||
| return $membership; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function setMembers(AppGroupMembership $members): AppGroupMembership { | ||
| // Get the existing members and roles from ApigeeX. | ||
| $apigeeReservedMembers = $this->decorated()->getMembers(); | ||
| // Getting all developers including the newly added one. | ||
| $developers = array_merge($apigeeReservedMembers->getMembers(), $members->getMembers()); | ||
|
|
||
| foreach ($developers as $developer => $roles) { | ||
| $members->setMember($developer, $roles); | ||
| } | ||
| // Storing membership info on appgroups __apigee_reserved__developer_details attribute for ApigeeX. | ||
| $result = $this->decorated()->setMembers($members); | ||
|
|
||
| // Returned membership does not contain all actual members of the appGroup, | ||
| // so it is easier to remove the membership object from the cache and | ||
| // enforce reload in getMembers(). | ||
| $this->appGroupMembershipObjectCache->removeMembership($this->appGroup); | ||
| return $result; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function removeMember(string $email): void { | ||
| // Get the existing members and roles from ApigeeX. | ||
| $apigeeReservedMembers = $this->decorated()->getMembers(); | ||
|
|
||
| foreach ($apigeeReservedMembers->getMembers() as $developer => $roles) { | ||
| if ($developer === $email) { | ||
| $apigeeReservedMembers->removeMember($developer); | ||
| } | ||
| } | ||
| // Storing membership info on appgroups __apigee_reserved__developer_details attribute for ApigeeX. | ||
| // Removing and updating the member on appgroups __apigee_reserved__developer_details attribute for ApigeeX. | ||
| $result = $this->decorated()->setMembers($apigeeReservedMembers); | ||
|
|
||
| $this->appGroupMembershipObjectCache->removeMembership($this->appGroup); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.