Fix upload key issue for multi level api path (ankitpokhrel#33)

src/Request.php

@@ -29,14 +29,24 @@ public function method() : string
         return $this->request->method();
     }
 
+    /**
+     * Get the current path info for the request.
+     *
+     * @return string
+     */
+    public function path() : string
+    {
+        return $this->request->path();
+    }
+
     /**
      * Get upload key from url.
      *
-     * @return null|string
+     * @return string
      */
-    public function key()
+    public function key() : string
     {
-        return $this->request->segment(2);
+        return basename($this->request->path());
     }
 
     /**

src/Tus/Server.php

@@ -497,7 +497,7 @@ protected function handleGet()
     {
         $key = $this->request->key();
 
-        if (empty($key)) {
+        if ($this->request->path() === trim($this->getApiPath(), '/')) {
             return $this->response->send('400 bad request.', HttpResponse::HTTP_BAD_REQUEST);
         }
 

tests/RequestTest.php

@@ -57,6 +57,18 @@ public function it_should_return_checksum_from_request_url()
         $this->assertEquals($checksum, $this->request->key());
     }
 
+    /**
+     * @test
+     *
+     * @covers ::path
+     */
+    public function it_returns_url_path_info()
+    {
+        $this->request->getRequest()->server->set('REQUEST_URI', '/tus/files/');
+
+        $this->assertEquals('tus/files', $this->request->path());
+    }
+
     /**
      * @test
      *

tests/Tus/ServerTest.php

@@ -1650,9 +1650,11 @@ public function it_returns_400_for_request_without_hash()
             ->server
             ->add([
                 'REQUEST_METHOD' => 'GET',
-                'REQUEST_URI' => '/files',
+                'REQUEST_URI' => '/tus/files',
             ]);
 
+        $this->tusServerMock->setApiPath('/tus/files');
+
         $response = $this->tusServerMock->handleGet();
 
         $this->assertEquals(400, $response->getStatusCode());