Skip to content
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.

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

API groups to teams mapper #266

Merged
merged 2 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,9 @@ APP_DEMO=0
###> LaF ###
laF_version=2.0.0-dev
###< LaF ###

### Group Mapper API ###
GROUP_API_URI=http://localhost
GROUP_API_KEY=CHANGEME
GROUP_API_ROLE=CHANGEME
GROUP_API_USER_ID=CHANGEME
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,5 @@ docker.conf
###> phpstan/phpstan ###
phpstan.neon
###< phpstan/phpstan ###

.php-version
7 changes: 7 additions & 0 deletions config/packages/framework.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ framework:
cookie_secure: auto
cookie_samesite: lax

http_client:
scoped_clients:
group.client:
base_uri: '%env(GROUP_API_URI)%'
headers:
'X-API-KEY': '%env(default::GROUP_API_KEY)%'

#esi: true
#fragments: true
php_errors:
Expand Down
7 changes: 7 additions & 0 deletions config/services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ parameters:
KEYCLOAK_SECRET: '%env(OAUTH_KEYCLOAK_CLIENT_SECRET)%'
KEYCLOAK_ID: '%env(OAUTH_KEYCLOAK_CLIENT_ID)%'
superAdminRole: '%env(superAdminRole)%'
group_api_user_id: '%env(default::GROUP_API_USER_ID)%'
group_api_role: '%env(default::GROUP_API_ROLE)%'
services:
# default configuration for services in *this* file
_defaults:
Expand Down Expand Up @@ -57,3 +59,8 @@ services:
connection: default
calls:
- [ setAnnotationReader, [ "@annotation_reader" ] ]

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Für was benötigen wir einen Keycloak authenticaor?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Der KeycloakAuthenticator ist nicht neu. Er wurde hier eingeführt: b0e7a20

Neu sind nur die beiden Parameter:

App\Security\KeycloakAuthenticator:
        arguments:
            $groupApiUserId: '%group_api_user_id%'
            $groupApiRole: '%group_api_role%'

Bei mir sehen die zum Beispiel so aus im env.local:

GROUP_API_USER_ID=user_identifier
GROUP_API_ROLE=585127

Mit dem ersten Parameter wählst du eine OIDC User Claim, der als UserID an die API gesendet wird. Der zweite gibt eine Rollen ID an. Wir brauchen die Rollen ID, weil wir die Anforderung haben, dass nur spezielle User mit der Rolle ODC Redakteur als Team Mitglieder hinzugefügt werden. Wer die Rolle nicht hat, der wird keinem Team zugeteilt.

Allgemein könnten wir natürlich auch über die aktuell verwendete OIDC Libs sprechen. Symfony unterstützt OIDC eigentlich von alleine seit 6.3. https://symfony.com/blog/new-in-symfony-6-3-openid-connect-token-handler
Da sehe ich schon Potential den Keycloakauthenticator komplett auszutauschen.

Aber das ist vielleicht out of scope für diesen PR?

App\Security\KeycloakAuthenticator:
arguments:
$groupApiUserId: '%group_api_user_id%'
$groupApiRole: '%group_api_role%'
3 changes: 1 addition & 2 deletions src/Controller/SettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ public function manage(
$errors = array();

if ($form->isSubmitted() && $form->isValid()) {
$newSettings = $form->getData();
$settings->setUseKeycloakGroups($newSettings->getUseKeycloakGroups());
$settings = $form->getData();
$errors = $validator->validate($settings);
if (count($errors) == 0) {
$em->persist($settings);
Expand Down
15 changes: 7 additions & 8 deletions src/Controller/TeamController.php
Original file line number Diff line number Diff line change
Expand Up @@ -348,15 +348,14 @@ public function edit(

$availableTeams = $currentTeamService->getTeamsWithoutCurrentHierarchy($user, $team);

$form = $this->createForm(
TeamType::class,
$team,
['teams' => $availableTeams,]
);
$form = $this->createForm(TeamType::class, $team, [
'teams' => $availableTeams,
'disabled' => $team->isImmutable(),
]);
$form->handleRequest($request);

$errors = array();
if ($form->isSubmitted() && $form->isValid()) {
if ($form->isSubmitted() && $form->isValid() && !$team->isImmutable()) {
$nTeam = $form->getData();
$errors = $validator->validate($nTeam);
if (count($errors) == 0) {
Expand Down Expand Up @@ -391,7 +390,7 @@ public function manage(
{
$user = $this->getUser();
$settings = $settingsRepository->findOne();
$useKeycloakGroups = $settings ? $settings->getUseKeycloakGroups() : false;
$useKeycloakGroups = $settings && $settings->getUseKeycloakGroups();

if (!$securityService->superAdminCheck($user)) {
return $this->redirectToRoute('dashboard');
Expand Down Expand Up @@ -440,7 +439,7 @@ public function teamDelete(
$teamId = $request->get('id');
$team = $teamId ? $teamRepository->find($teamId) : $currentTeamService->getCurrentAdminTeam($user);

if ($securityService->superAdminCheck($user) === false) {
if ($securityService->superAdminCheck($user) === false || $team->isImmutable()) {
return $this->redirectToRoute('dashboard');
}

Expand Down
2 changes: 1 addition & 1 deletion src/Controller/TeamMemberController.php
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public function mitgliederAdd(
$teamId = $request->get('id');
$currentTeam = null;
$settings = $settingsRepository->findOne();
$useKeycloakGroups = $settings ? $settings->getUseKeycloakGroups() : false;
$useKeycloakGroups = $settings && $settings->getUseKeycloakGroups();
$this->setBackButton($this->generateUrl('manage_teams'));

if ($teamId) {
Expand Down
32 changes: 24 additions & 8 deletions src/Entity/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,47 @@
namespace App\Entity;

use App\Repository\SettingsRepository;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;

#[ORM\Entity(repositoryClass: SettingsRepository::class)]
class Settings
{
const NO_GROUP_MAPPING = 0;

const KEYCLOAK_GROUP_MAPPING = 1;

const API_GROUP_MAPPING = 2;

#[ORM\Id]
#[ORM\GeneratedValue]
#[ORM\Column(type: 'integer')]
private $id;

#[ORM\Column(type: 'boolean', nullable: true)]
private $useKeycloakGroups;
#[ORM\Column(options: [
'default' => 0,
])]
#[Assert\Choice([
self::NO_GROUP_MAPPING,
self::KEYCLOAK_GROUP_MAPPING,
self::API_GROUP_MAPPING,
])]
private int $groupMapping = 0;

public function getUseKeycloakGroups(): ?bool
public function getGroupMapping(): int
{
return $this->useKeycloakGroups;
return $this->groupMapping;
}

public function setUseKeycloakGroups(?bool $useKeycloakGroups): self
public function setGroupMapping(int $groupMapping): static
{
$this->useKeycloakGroups = $useKeycloakGroups;
$this->groupMapping = $groupMapping;

return $this;
}

public function getUseKeycloakGroups(): bool
{
return $this->groupMapping === self::KEYCLOAK_GROUP_MAPPING;
}
}
25 changes: 22 additions & 3 deletions src/Entity/Team.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
use Gedmo\Tree\Entity\Repository\NestedTreeRepository;
use phpDocumentor\Reflection\Types\Boolean;
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
use Symfony\Component\Validator\Constraints as Assert;
use Gedmo\Mapping\Annotation as Gedmo;

#[Gedmo\Tree(type: 'nested')]
#[ORM\Entity(repositoryClass: NestedTreeRepository::class)]
#[UniqueEntity('slug')]
#[ORM\UniqueConstraint(name: 'UNQ_team_name_and_immutable', columns: ['name', 'immutable'])]
class Team
{
#[ORM\Id]
#[ORM\GeneratedValue]
#[ORM\Column(type: 'integer')]
private $id;

#[ORM\Column(type: 'string', length: 255, unique: true)]
#[ORM\Column(type: 'string', length: 255)]
#[Assert\NotBlank]
private $name;

Expand Down Expand Up @@ -233,6 +233,11 @@ class Team
#[ORM\ManyToMany(targetEntity: AuditTomZiele::class, mappedBy: 'ignoredInTeams')]
private $ignoredAuditGoals;

#[ORM\Column(options: [
'default' => 0,
])]
private bool $immutable = false;

public function __construct()
{
$this->members = new ArrayCollection();
Expand Down Expand Up @@ -1393,9 +1398,11 @@ public function getRoot(): ?self
return $this->root;
}

public function setParent(self $parent = null): void
public function setParent(self $parent = null): static
{
$this->parent = $parent;

return $this;
}

public function getParent(): ?self
Expand Down Expand Up @@ -1659,4 +1666,16 @@ public function removeIgnoredProduct(Produkte $product): self

return $this;
}

public function isImmutable(): bool
{
return $this->immutable;
}

public function setImmutable(bool $immutable): static
{
$this->immutable = $immutable;

return $this;
}
}
26 changes: 16 additions & 10 deletions src/Form/Type/SettingsType.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,10 @@

namespace App\Form\Type;

use App\Entity\AuditTom;
use App\Entity\AuditTomAbteilung;
use App\Entity\AuditTomStatus;
use App\Entity\AuditTomZiele;
use App\Entity\Settings;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;

Expand All @@ -28,8 +20,22 @@ class SettingsType extends AbstractType
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
->add('useKeycloakGroups', CheckboxType::class, ['label' => 'useKeycloakGroups', 'help'=> 'useKeycloakGroupsHelp', 'required' => false, 'translation_domain' => 'form'])
->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'save', 'translation_domain' => 'form']);
->add('groupMapping', ChoiceType::class, [
'label' => 'groupMapping',
'help'=> 'groupMappingHelp',
'translation_domain' => 'form',
'expanded' => true,
'choices' => [
'noGroupMapping' => Settings::NO_GROUP_MAPPING,
'useKeycloakGroups' => Settings::KEYCLOAK_GROUP_MAPPING,
'useApiGroups' => Settings::API_GROUP_MAPPING,
]
])
->add('save', SubmitType::class, [
'attr' => array('class' => 'btn'),
'label' => 'save',
'translation_domain' => 'form'
]);
}

public function configureOptions(OptionsResolver $resolver)
Expand Down
37 changes: 37 additions & 0 deletions src/Migrations/Version20240807153157.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?php

declare(strict_types=1);

namespace DoctrineMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20240807153157 extends AbstractMigration
{
public function getDescription(): string
{
return 'Add API group mapping option';
}

public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE settings ADD group_mapping INT DEFAULT 0 NOT NULL');
$this->addSql('UPDATE settings SET group_mapping = use_keycloak_groups WHERE use_keycloak_groups IS NOT NULL');
$this->addSql('ALTER TABLE settings DROP use_keycloak_groups');
$this->addSql('ALTER TABLE team ADD immutable TINYINT(1) DEFAULT 0 NOT NULL');
}

public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE settings ADD use_keycloak_groups TINYINT(1) DEFAULT NULL');
$this->addSql('UPDATE settings SET use_keycloak_groups = group_mapping WHERE group_mapping = 1');
$this->addSql('ALTER TABLE settings DROP group_mapping');
$this->addSql('ALTER TABLE team DROP immutable');
}
}
33 changes: 33 additions & 0 deletions src/Migrations/Version20240816105509.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

declare(strict_types=1);

namespace DoctrineMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20240816105509 extends AbstractMigration
{
public function getDescription(): string
{
return 'Avoid name conflicts for API generated teams by modifying the team unique constraint';
}

public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('DROP INDEX UNQ_team_name ON team');
$this->addSql('CREATE UNIQUE INDEX UNQ_team_name_and_immutable ON team (name, immutable)');
}

public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('DROP INDEX UNQ_team_name_and_immutable ON team');
$this->addSql('CREATE UNIQUE INDEX UNQ_team_name ON team (name)');
}
}
Loading
Loading