Merge pull request #14 from kurozumi/fix

Github Actions のプラグインのチェックアウトの参照先をプルリクエストのHEADコミットに変更

.github/workflows/phpstan.yaml

@@ -48,10 +48,10 @@ jobs:
           composer require auth0/auth0-php
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: app/Plugin/${{ env.PLUGIN_CODE }}
-          ref: ${{ env.PLUGIN_BRANCH }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: PHPStan
         run: |

.github/workflows/test.yaml

@@ -56,7 +56,7 @@ jobs:
 
     steps:
       - name: Checkout EC-CUBE
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: EC-CUBE/ec-cube
           ref: ${{ matrix.eccube-versions }}
@@ -89,10 +89,10 @@ jobs:
           composer require auth0/auth0-php
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: app/Plugin/${{ env.PLUGIN_CODE }}
-          ref: ${{ env.PLUGIN_BRANCH }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Setup EC-CUBE
         run: |

Controller/Admin/ConfigController.php

@@ -63,7 +63,7 @@ public function index(Request $request, CacheUtil $cacheUtil)
                 'OAUTH_AUTH0_CLIENT_ID' => $Config->getClientId(),
                 'OAUTH_AUTH0_CLIENT_SECRET' => $Config->getClientSecret(),
                 'OAUTH_AUTH0_CUSTOM_DOMAIN' => $Config->getCustomDomain(),
-                'OAUTH_AUTH0_COOKIE_SECRET' => shell_exec('openssl rand -hex 32')
+                'OAUTH_AUTH0_COOKIE_SECRET' => shell_exec('openssl rand -hex 32'),
             ]);
 
             file_put_contents($envFile, $env);

Controller/Auth0Controller.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of Auth0
  *
@@ -12,7 +13,6 @@
 
 namespace Plugin\Auth0\Controller;
 
-
 use Eccube\Controller\AbstractController;
 use KnpU\OAuth2ClientBundle\Client\ClientRegistry;
 use Plugin\Auth0\Repository\ConfigRepository;
@@ -21,14 +21,14 @@
 
 /**
  * Class Auth0Controller
- * @package Plugin\Auth0\Controller
  *
  * @Route("/auth0")
  */
 class Auth0Controller extends AbstractController
 {
     /**
      * @param ClientRegistry $clientRegistry
+     *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      *
      * @Route("/connect", name="auth0_connect")

DependencyInjection/SocialLoginExtension.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of Auth0
  *
@@ -12,28 +13,27 @@
 
 namespace Plugin\Auth0\DependencyInjection;
 
-
 use Eccube\DependencyInjection\EccubeExtension;
 use Plugin\Auth0\Security\Authenticator\Auth0Authenticator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class SocialLoginExtension extends EccubeExtension
 {
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function load(array $configs, ContainerBuilder $container)
     {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function prepend(ContainerBuilder $container)
     {
         $plugins = $container->getParameter('eccube.plugins.enabled');
 
-        if(!in_array('Auth0', $plugins)) {
+        if (!in_array('Auth0', $plugins)) {
             return;
         }
 
@@ -42,10 +42,10 @@ public function prepend(ContainerBuilder $container)
         $extensionConfigsRefl->setAccessible(true);
         $extensionConfigs = $extensionConfigsRefl->getValue($container);
 
-        foreach($extensionConfigs["security"] as $key => $security) {
-            if(isset($security["firewalls"])) {
-                $extensionConfigs["security"][$key]["firewalls"]["customer"]["entry_point"] = Auth0Authenticator::class;
-                $extensionConfigs["security"][$key]["firewalls"]["customer"]["custom_authenticators"][] = Auth0Authenticator::class;
+        foreach ($extensionConfigs['security'] as $key => $security) {
+            if (isset($security['firewalls'])) {
+                $extensionConfigs['security'][$key]['firewalls']['customer']['entry_point'] = Auth0Authenticator::class;
+                $extensionConfigs['security'][$key]['firewalls']['customer']['custom_authenticators'][] = Auth0Authenticator::class;
             }
         }
 

Entity/Config.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of Auth0
  *
@@ -71,6 +72,7 @@ public function getClientId(): ?string
 
     /**
      * @param string $client_id
+     *
      * @return $this
      */
     public function setClientId(string $client_id): self
@@ -90,6 +92,7 @@ public function getClientSecret(): ?string
 
     /**
      * @param string $client_secret
+     *
      * @return $this
      */
     public function setClientSecret(string $client_secret): self
@@ -109,6 +112,7 @@ public function getCustomDomain(): ?string
 
     /**
      * @param string $custom_domain
+     *
      * @return $this
      */
     public function setCustomDomain(string $custom_domain): self

Entity/Connection.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of Auth0
  *
@@ -12,13 +13,11 @@
 
 namespace Plugin\Auth0\Entity;
 
-
 use Doctrine\ORM\Mapping as ORM;
 use Eccube\Entity\Customer;
 
 /**
  * Class Connection
- * @package Plugin\Auth0\Entity
  *
  * @ORM\Table(name="plg_social_login_connection", uniqueConstraints={@ORM\UniqueConstraint(name="user_id", columns={"user_id", "customer_id"})})
  * @ORM\Entity(repositoryClass="Plugin\Auth0\Repository\ConnectionRepository")
@@ -68,6 +67,7 @@ public function getUserId(): string
 
     /**
      * @param string $user_id
+     *
      * @return $this
      */
     public function setUserId(string $user_id): self
@@ -87,6 +87,7 @@ public function getCustomer(): Customer
 
     /**
      * @param Customer $Customer
+     *
      * @return $this
      */
     public function setCustomer(Customer $Customer): self

Entity/CustomerTrait.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of Auth0
  *
@@ -19,7 +20,6 @@
 
 /**
  * Class CustomerTrait
- * @package Plugin\Auth0\Entity
  *
  * @EntityExtension("Eccube\Entity\Customer")
  */
@@ -35,7 +35,7 @@ trait CustomerTrait
      */
     public function getConnections(): Collection
     {
-        if(null === $this->Connections) {
+        if (null === $this->Connections) {
             $this->Connections = new ArrayCollection();
         }
 
@@ -44,15 +44,16 @@ public function getConnections(): Collection
 
     /**
      * @param Connection $connection
+     *
      * @return $this
      */
     public function addConnection(Connection $connection): self
     {
-        if(null === $this->Connections) {
+        if (null === $this->Connections) {
             $this->Connections = new ArrayCollection();
         }
 
-        if(false === $this->Connections->contains($connection)) {
+        if (false === $this->Connections->contains($connection)) {
             $this->Connections->add($connection);
             $connection->setCustomer($this);
         }
@@ -62,17 +63,18 @@ public function addConnection(Connection $connection): self
 
     /**
      * @param Connection $connection
+     *
      * @return $this
      */
     public function removeConnection(Connection $connection): self
     {
-        if(null === $this->Connections) {
+        if (null === $this->Connections) {
             $this->Connections = new ArrayCollection();
         }
 
-        if($this->Connections->contains($connection)) {
+        if ($this->Connections->contains($connection)) {
             $this->Connections->removeElement($connection);
-            if($connection->getCustomer() === $this) {
+            if ($connection->getCustomer() === $this) {
                 $connection->setCustomer(null);
             }
         }

EventSubscriber/Admin/Customer/DeleteSubscriber.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of Auth0
  *
@@ -30,7 +31,7 @@ public function __construct(EntityManagerInterface $entityManager)
     public static function getSubscribedEvents()
     {
         return [
-            EccubeEvents::ADMIN_CUSTOMER_DELETE_COMPLETE => 'onAdminCustomerDeleteComplete'
+            EccubeEvents::ADMIN_CUSTOMER_DELETE_COMPLETE => 'onAdminCustomerDeleteComplete',
         ];
     }
 

EventSubscriber/EntrySubscriber.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of Auth0
  *
@@ -12,7 +13,6 @@
 
 namespace Plugin\Auth0\EventSubscriber;
 
-
 use Doctrine\ORM\EntityManagerInterface;
 use Eccube\Entity\Customer;
 use Eccube\Event\EccubeEvents;
@@ -39,34 +39,33 @@ class EntrySubscriber implements EventSubscriberInterface
     public function __construct(
         SessionInterface $session,
         EntityManagerInterface $entityManager
-    )
-    {
+    ) {
         $this->session = $session;
         $this->entityManager = $entityManager;
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public static function getSubscribedEvents()
     {
         return [
-            EccubeEvents::FRONT_ENTRY_INDEX_COMPLETE => 'onFrontEntryIndexComplete'
+            EccubeEvents::FRONT_ENTRY_INDEX_COMPLETE => 'onFrontEntryIndexComplete',
         ];
     }
 
     public function onFrontEntryIndexComplete(EventArgs $args)
     {
         $request = $args->getRequest();
-        if(null === $request) {
+        if (null === $request) {
             return;
         }
 
         /** @var Customer $Customer */
         $Customer = $args->getArgument('Customer');
 
         $userInfo = $this->getUserInfoFromSession($request);
-        if($userInfo) {
+        if ($userInfo) {
             $Connection = new Connection();
             $Connection->setUserId($userInfo['sub']);
             $Connection->setCustomer($Customer);

EventSubscriber/Mypage/WithdrawSubscriber.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of Auth0
  *
@@ -27,11 +28,10 @@ public function __construct(EntityManagerInterface $entityManager)
         $this->entityManager = $entityManager;
     }
 
-
     public static function getSubscribedEvents()
     {
         return [
-            EccubeEvents::FRONT_MYPAGE_WITHDRAW_INDEX_COMPLETE => 'onFrontMyPageWithdrawIndexComplete'
+            EccubeEvents::FRONT_MYPAGE_WITHDRAW_INDEX_COMPLETE => 'onFrontMyPageWithdrawIndexComplete',
         ];
     }
 

Form/Extension/EntryTypeExtension.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of Auth0
  *
@@ -12,7 +13,6 @@
 
 namespace Plugin\Auth0\Form\Extension;
 
-
 use Eccube\Form\Type\Front\EntryType;
 use Eccube\Form\Type\RepeatedEmailType;
 use KnpU\OAuth2ClientBundle\Security\Helper\FinishRegistrationBehavior;
@@ -33,8 +33,7 @@ class EntryTypeExtension extends AbstractTypeExtension
 
     public function __construct(
         RequestStack $requestStack
-    )
-    {
+    ) {
         $this->requestStack = $requestStack;
     }
 
@@ -44,7 +43,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         if ($userInfo) {
             $builder
                 ->add('email', RepeatedEmailType::class, [
-                    'attr' => ["readonly" => "readonly"]
+                    'attr' => ['readonly' => 'readonly'],
                 ]);
 
             // メールアドレスをセット
@@ -57,7 +56,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function getExtendedType()
     {

Form/Type/Admin/ConfigType.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of Auth0
  *