Several fixes

mautic · Jun 9, 2021 · f9c2de0 · f9c2de0
1 parent 3afc0b3
commit f9c2de0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/app/bundles/ApiBundle/MauticApiBundle.php b/app/bundles/ApiBundle/MauticApiBundle.php
@@ -11,7 +11,6 @@
 
 namespace Mautic\ApiBundle;
 
-use Mautic\ApiBundle\DependencyInjection\Compiler\OAuthPass;
 use Mautic\ApiBundle\DependencyInjection\Compiler\SerializerPass;
 use Mautic\ApiBundle\DependencyInjection\Factory\ApiFactory;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -29,7 +28,6 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
-        $container->addCompilerPass(new OAuthPass());
         $container->addCompilerPass(new SerializerPass());
 
         $extension = $container->getExtension('security');

diff --git a/app/bundles/ApiBundle/Model/ClientModel.php b/app/bundles/ApiBundle/Model/ClientModel.php
@@ -66,9 +66,7 @@ public function setSession(Session $session)
      */
     public function getRepository(): \Mautic\ApiBundle\Entity\oAuth2\ClientRepository
     {
-        if ('oauth2' == $this->apiMode) {
-            return $this->em->getRepository(Client::class);
-        }
+        return $this->em->getRepository(Client::class);
     }
 
     /**
@@ -97,8 +95,6 @@ public function createForm($entity, $formFactory, $action = null, $options = [])
 
     /**
      * {@inheritdoc}
-     *
-     * @return Client|null
      */
     public function getEntity($id = null): ?Client
     {

diff --git a/app/bundles/ApiBundle/Translations/en_US/messages.ini b/app/bundles/ApiBundle/Translations/en_US/messages.ini
@@ -14,13 +14,10 @@ mautic.api.call.notfound="Object not found."
 mautic.api.call.batch_exception="A max of %limit% entities are supported at a time."
 mautic.api.call.id_missing="ID is missing from the payload."
 mautic.api.client.form.auth_protocol="Authorization Protocol"
-mautic.api.client.form.callback="Callback URI"
 mautic.api.client.form.clientid="Client ID"
 mautic.api.client.form.clientsecret="Client Secret"
 mautic.api.client.form.confirmdelete="Delete the API client, %name%? Applications using this client will no longer have access to Mautic's API."
 mautic.api.client.form.confirmrevoke="Revoke access for %name%?"
-mautic.api.client.form.consumerkey="Consumer Key"
-mautic.api.client.form.consumersecret="Consumer Secret"
 mautic.api.client.form.help.callback="Specify a callback URI that is allowed. Leave blank to restrict callbacks."
 mautic.api.client.form.help.requesturis="Specify the URI(s) that are allowed API access. You can submit multiple URIs by separating them with commas."
 mautic.api.client.form.name="Client Name"