Browse Source

Merge pull request #96 from simensen/github-service-prep

Accept username and API token from POST in addition to GET
Jordi Boggiano 13 years ago
parent
commit
ac17af21c5
1 changed files with 8 additions and 3 deletions
  1. 8 3
      src/Packagist/WebBundle/Controller/ApiController.php

+ 8 - 3
src/Packagist/WebBundle/Controller/ApiController.php

@@ -58,12 +58,17 @@ class ApiController extends Controller
             return new Response(json_encode(array('status' => 'error', 'message' => 'Missing or invalid payload',)), 406);
         }
 
-        $username = $request->query->get('username');
-        $apiToken = $request->query->get('apiToken');
+        $username = $request->request->has('username') ?
+            $request->request->get('username') :
+            $request->query->get('username');
+
+        $apiToken = $request->request->has('apiToken') ?
+            $request->request->get('apiToken') :
+            $request->query->get('apiToken');
 
         $doctrine = $this->get('doctrine');
         $user = $doctrine
-            ->getRepository('Packagist\WebBundle\Entity\User')
+            ->getRepository('PackagistWebBundle:User')
             ->findOneBy(array('username' => $username, 'apiToken' => $apiToken));
 
         if (!$user) {