Merge branch 'b-7.4.x-2fa-OXDEV-9078' into b-7.4.x-google-provider-OXDEV-9885

Author: NikolaIvanovski

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Extracted reusable Twig code into captcha.html.twig and password.html.twig
+- Facebook login OAuth-provider
 
 ### Changed
 - Show multiple errors on invalid password

assets/out/src/css/providers.css

@@ -0,0 +1,9 @@
+.sign-in-providers {
+    padding: 10px 0;
+}
+
+.card-body {
+    .sign-in-providers {
+        text-align: center;
+    }
+}

services.yaml

@@ -2,6 +2,7 @@ imports:
   - { resource: src/Captcha/services.yaml }
   - { resource: src/PasswordPolicy/services.yaml }
   - { resource: src/Authentication/services.yaml }
+  - { resource: src/Shared/services.yaml }
 
 services:
   _defaults:

src/Authentication/OAuth2/Controller/OAuthController.php

@@ -19,7 +19,6 @@ public function login(): void
         $providerCollector = $this->getService(ProviderCollectorInterface::class);
 
         $provider = $providerCollector->getProvider($_GET['provider']);
-        $provider->getClient();
 
         Registry::getUtils()->redirect($provider->getAuthorizationUrl());
     }
@@ -31,8 +30,8 @@ public function redirect(): void
             ->getService(ProviderCollectorInterface::class)
             ->getProvider('google');
 
-        $provider->getClient();
         $accessToken = $provider->getAccessToken($_GET['code']);
+
         $userDTO = $provider->getUserInfo($accessToken);
 
         $this

src/Authentication/OAuth2/DTO/OAuth2UserDTO.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+declare(strict_types=1);
+
+namespace OxidEsales\SecurityModule\Authentication\OAuth2\DTO;
+
+readonly class OAuth2UserDTO implements OAuth2UserDTOInterface
+{
+    public function __construct(
+        private ?string $firstName,
+        private ?string $lastName,
+        private ?string $email,
+    ) {
+    }
+
+    public function getFirstName(): ?string
+    {
+        return $this->firstName;
+    }
+
+    public function getLastName(): ?string
+    {
+        return $this->lastName;
+    }
+
+    public function getEmail(): ?string
+    {
+        return $this->email;
+    }
+}

src/Authentication/OAuth2/DTO/OAuth2UserDTOInterface.php

@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+namespace OxidEsales\SecurityModule\Authentication\OAuth2\DTO;
+
+interface OAuth2UserDTOInterface
+{
+    public function getFirstName(): ?string;
+
+    public function getLastName(): ?string;
+
+    public function getEmail(): ?string;
+}

src/Authentication/OAuth2/DTO/UserDTO.php

@@ -12,24 +12,18 @@
 class UserDTO implements UserDTOInterface
 {
     public function __construct(
-        private readonly ?string $firstName,
-        private readonly ?string $lastName,
-        private readonly ?string $email,
+        private readonly string $userId,
+        private readonly bool $isBlocked
     ) {
     }
 
-    public function getFirstName(): ?string
+    public function getId(): string
     {
-        return $this->firstName;
+        return $this->userId;
     }
 
-    public function getLastName(): ?string
+    public function isBlocked(): bool
     {
-        return $this->lastName;
-    }
-
-    public function getEmail(): ?string
-    {
-        return $this->email;
+        return $this->isBlocked;
     }
 }

src/Authentication/OAuth2/DTO/UserDTOInterface.php

@@ -9,9 +9,7 @@
 
 interface UserDTOInterface
 {
-    public function getFirstName(): ?string;
+    public function getId(): string;
 
-    public function getLastName(): ?string;
-
-    public function getEmail(): ?string;
+    public function isBlocked(): bool;
 }

src/Authentication/OAuth2/Factory/services.yaml

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+declare(strict_types=1);
+
+namespace OxidEsales\SecurityModule\Authentication\OAuth2\Infrastructure\Factory;
+
+use League\OAuth2\Client\Provider\FacebookUser;
+use OxidEsales\SecurityModule\Authentication\OAuth2\DTO\OAuth2UserDTO;
+use OxidEsales\SecurityModule\Authentication\OAuth2\DTO\OAuth2UserDTOInterface;
+
+class OAuth2UserDTOFactory implements OAuth2UserDTOFactoryInterface
+{
+    public function createFromFacebookUser(FacebookUser $facebookUser): OAuth2UserDTOInterface
+    {
+        return new OAuth2UserDTO(
+            $facebookUser->getFirstName(),
+            $facebookUser->getLastName(),
+            $facebookUser->getEmail(),
+        );
+    }
+}