Sub repo public access

vtsykun · Nov 9, 2024 · b6e5fd2 · b6e5fd2
1 parent 2a6a3a2
commit b6e5fd2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Controller/ProviderController.php b/src/Controller/ProviderController.php
@@ -129,16 +129,17 @@ public function packageV2Action(Request $request, string $package): Response
     {
         $isDev = str_ends_with($package, '~dev');
         $packageName = preg_replace('/~dev$/', '', $package);
-        if (!$this->checkSubrepositoryAccess($packageName)) {
-            return $this->createNotFound();
-        }
 
         $response = new JsonResponse([]);
         $response->setLastModified($this->providerManager->getLastModify($package));
         if ($response->isNotModified($request)) {
             return $response;
         }
 
+        if (!$this->checkSubrepositoryAccess($packageName)) {
+            return $this->createNotFound();
+        }
+
         $package = $this->packageManager->getPackageV2Json($this->getUser(), $packageName, $isDev);
         if (!$package) {
             return $this->createNotFound();

diff --git a/src/Package/InMemoryDumper.php b/src/Package/InMemoryDumper.php
@@ -100,8 +100,8 @@ private function dumpRootPackages(?UserInterface $user = null, ?int $apiVersion
         $url = $this->router->generate('track_download', ['name' => 'VND/PKG']);
         $slug = $subRepo && !$this->subRepositoryHelper->isAutoHost() ? '/'. $subRepo->getSlug() : '';
 
-        $rootFile['notify'] = str_replace('VND/PKG', '%package%', $url);
-        $rootFile['notify-batch'] = $this->router->generate('track_download_batch');
+        $rootFile['notify'] = $slug . str_replace('VND/PKG', '%package%', $url);
+        $rootFile['notify-batch'] = $slug . $this->router->generate('track_download_batch');
         $rootFile['metadata-changes-url'] = $this->router->generate('metadata_changes');
         $rootFile['providers-url'] = $slug . '/p/%package%$%hash%.json';