mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-21 01:25:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed error preventing the service container from compiling

Browse source
This commit is contained in:
Jan Böhmer 2023-05-27 20:46:02 +02:00
parent 55641a234c
commit c24019fd57
5 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/routes/hslavich_saml.yaml → config/routes/nbgrp_saml.yaml
View file

@ -1,4 +1,4 @@
hslavich_saml_sp: nbgrp_saml:
resource: "@HslavichOneloginSamlBundle/Resources/config/routing.yml" resource: "@NbgrpOneloginSamlBundle/Resources/config/routes.php"
# Only load the SAML routes if SAML is enabled # Only load the SAML routes if SAML is enabled
condition: "env('SAML_ENABLED') == '1' or env('SAML_ENABLED') == 'true'" condition: "env('SAML_ENABLED') == '1' or env('SAML_ENABLED') == 'true'"

4
src/Entity/UserSystem/User.php
View file

@ -30,8 +30,8 @@ use App\Security\Interfaces\HasPermissionsInterface;
use App\Validator\Constraints\Selectable; use App\Validator\Constraints\Selectable;
use App\Validator\Constraints\ValidPermission; use App\Validator\Constraints\ValidPermission;
use App\Validator\Constraints\ValidTheme; use App\Validator\Constraints\ValidTheme;
use Hslavich\OneloginSamlBundle\Security\User\SamlUserInterface;
use Jbtronics\TFAWebauthn\Model\LegacyU2FKeyInterface; use Jbtronics\TFAWebauthn\Model\LegacyU2FKeyInterface;
use Nbgrp\OneloginSamlBundle\Security\User\SamlUserInterface;
use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface; use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Serializer\Annotation\Groups;
use Webauthn\PublicKeyCredentialUserEntity; use Webauthn\PublicKeyCredentialUserEntity;
@ -967,7 +967,7 @@ class User extends AttachmentContainingDBElement implements UserInterface, HasPe
public function setSamlAttributes(array $attributes) public function setSamlAttributes(array $attributes): void
{ {
//When mail attribute exists, set it //When mail attribute exists, set it
if (isset($attributes['email'])) { if (isset($attributes['email'])) {

4
src/Helpers/LabelResponse.php
View file

@ -54,7 +54,7 @@ class LabelResponse extends Response
parent::__construct($content, $status, $headers); parent::__construct($content, $status, $headers);
} }
public function setContent($content): self public function setContent($content): static
{ {
parent::setContent($content); parent::setContent($content);
@ -64,7 +64,7 @@ class LabelResponse extends Response
return $this; return $this;
} }
public function prepare(Request $request): self public function prepare(Request $request): static
{ {
parent::prepare($request); parent::prepare($request);

3
src/Repository/UserRepository.php
View file

@ -24,6 +24,7 @@ namespace App\Repository;
use App\Entity\UserSystem\User; use App\Entity\UserSystem\User;
use Doctrine\ORM\NonUniqueResultException; use Doctrine\ORM\NonUniqueResultException;
use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
use Symfony\Component\Security\Core\User\PasswordUpgraderInterface; use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Security\Core\User\UserInterface;
@ -82,7 +83,7 @@ final class UserRepository extends NamedDBElementRepository implements PasswordU
} }
} }
public function upgradePassword(UserInterface $user, string $newHashedPassword): void public function upgradePassword(UserInterface|PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void
{ {
if ($user instanceof User) { if ($user instanceof User) {
$user->setPassword($newHashedPassword); $user->setPassword($newHashedPassword);

4
src/Security/SamlUserFactory.php
View file

@ -23,8 +23,8 @@ namespace App\Security;
use App\Entity\UserSystem\Group; use App\Entity\UserSystem\Group;
use App\Entity\UserSystem\User; use App\Entity\UserSystem\User;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Hslavich\OneloginSamlBundle\Security\Http\Authenticator\Token\SamlToken; use Nbgrp\OneloginSamlBundle\Security\Http\Authenticator\Token\SamlToken;
use Hslavich\OneloginSamlBundle\Security\User\SamlUserFactoryInterface; use Nbgrp\OneloginSamlBundle\Security\User\SamlUserFactoryInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent; use Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent;
use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Security\Core\User\UserInterface;