Handle cases in which Request is null

Author: Luis Pabon

Controller/AuthorizeController.php

@@ -152,15 +152,18 @@ protected function getClient()
                 $request = $this->container->get('request');
             }
 
-            if (null === $clientId = $request->get('client_id')) {
-                $form = $this->container->get('fos_oauth_server.authorize.form');
-                $clientId = $request->get(sprintf('%s[client_id]', $form->getName()), null, true);
+            $client = null;
+            if (null !== $request) {
+                if (null === $clientId = $request->get('client_id')) {
+                    $form = $this->container->get('fos_oauth_server.authorize.form');
+                    $clientId = $request->get(sprintf('%s[client_id]', $form->getName()), null, true);
+                }
+
+                $client = $this->container
+                    ->get('fos_oauth_server.client_manager')
+                    ->findClientByPublicId($clientId);
             }
 
-            $client = $this->container
-                ->get('fos_oauth_server.client_manager')
-                ->findClientByPublicId($clientId);
-
             if (null === $client) {
                 throw new NotFoundHttpException('Client not found.');
             }

Form/Handler/AuthorizeFormHandler.php

@@ -65,17 +65,19 @@ public function process()
             $request = $this->container->get('request');
         }
 
-        $this->form->setData(new Authorize(
-            $request->request->has('accepted'),
-            $request->query->all()
-        ));
-
-        if ('POST' === $request->getMethod()) {
-            $this->form->handleRequest($request);
-            if ($this->form->isValid()) {
-                $this->onSuccess();
-
-                return true;
+        if (null !== $request) {
+            $this->form->setData(new Authorize(
+                $request->request->has('accepted'),
+                $request->query->all()
+            ));
+
+            if ('POST' === $request->getMethod()) {
+                $this->form->handleRequest($request);
+                if ($this->form->isValid()) {
+                    $this->onSuccess();
+
+                    return true;
+                }
             }
         }