Skip to content

A self-hosted media server and file management system

fix: categories api blocked for non admins

aminnausin05befc987cab
diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.php
index 6a996919..f2659fd4 100755
--- a/app/Http/Controllers/Api/V1/CategoryController.php
+++ b/app/Http/Controllers/Api/V1/CategoryController.php
@@ -11,6 +11,7 @@ use App\Traits\HasModelHelpers;
use App\Traits\HttpResponses;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Gate;
class CategoryController extends Controller {
use HasModelHelpers;
@@ -21,23 +22,14 @@ class CategoryController extends Controller {
*/
public function index() {
$categories = Category::orderBy('name');
- $userId = Auth::id();
- if (! $this->authorize('admin')) {
+ if (! Gate::allows('admin')) {
$categories->where('is_private', false);
}
- if ($categories->count() == 0) {
- return $this->success([]);
- }
-
- $categories = $categories->with(['folders.series', 'folders.series.primaryPoster']);
+ $categories->with(['folders.series', 'folders.series.primaryPoster']);
- return $this->success(
- $userId
- ? CategoryResource::collection($categories->get())
- : [new CategoryResource($categories->first())]
- );
+ return response()->json(CategoryResource::collection($categories->get()));
}
/**
@@ -47,6 +39,10 @@ class CategoryController extends Controller {
* @return \Illuminate\Http\Response
*/
public function show(Category $category) {
+ if (! Gate::allows('admin') && $category->is_private) {
+ abort(403);
+ }
+
$category->load(['folders.series.folderTags']);
return new CategoryResource($category);
diff --git a/resources/js/service/mediaAPI.ts b/resources/js/service/mediaAPI.ts
index f1610966..0a1c934f 100644
--- a/resources/js/service/mediaAPI.ts
+++ b/resources/js/service/mediaAPI.ts
@@ -49,7 +49,7 @@ export default {
},
};
-export function getCategories(): Promise<AxiosResponse<{ data: CategoryResource[]; message?: string }>> {
+export function getCategories(): Promise<AxiosResponse<CategoryResource[]>> {
return API.get(`/categories`);
}
diff --git a/resources/js/service/queries.ts b/resources/js/service/queries.ts
index b3105d6a..2a5be523 100644
--- a/resources/js/service/queries.ts
+++ b/resources/js/service/queries.ts
@@ -54,7 +54,7 @@ export const useGetSiteAnalytics = (period: Ref<string>) => {
};
export const useGetCategories = () => {
- return useQuery<{ data: CategoryResource[] }>({
+ return useQuery<CategoryResource[]>({
queryKey: ['categories'],
queryFn: async () => {
const { data: response } = await getCategories();
diff --git a/resources/js/stores/DashboardStore.ts b/resources/js/stores/DashboardStore.ts
index 911e6889..1fa25922 100644
--- a/resources/js/stores/DashboardStore.ts
+++ b/resources/js/stores/DashboardStore.ts
@@ -29,10 +29,10 @@ export const useDashboardStore = defineStore('Dashboard', () => {
const stateTotalLibrariesSize = ref();
watch(rawCategories, (v) => {
- stateLibraries.value = v?.data ?? [];
+ stateLibraries.value = v ?? [];
- if (!v?.data) return;
- const totalSize = v.data.reduce((total: number, library: CategoryResource) => total + library.total_size, 0);
+ if (!v) return;
+ const totalSize = v.reduce((total: number, library: CategoryResource) => total + library.total_size, 0);
if (!Number.isNaN(totalSize)) stateTotalLibrariesSize.value = formatFileSize(totalSize);
});
diff --git a/routes/api.php b/routes/api.php
index 14cde946..1cacce2d 100755
--- a/routes/api.php
+++ b/routes/api.php
@@ -96,6 +96,8 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
Route::patch('/settings', [CategoryController::class, 'updateSettings']);
});
+ Route::resource('/categories', CategoryController::class)->only(['index']);
+
Route::prefix('/series/{series}')->group(function () {
// Download Access Control
Route::put('/downloads', [SeriesController::class, 'updateDownloadSettings']);
@@ -162,7 +164,7 @@ Route::withoutMiddleware([
});
// Libraries (categories)
-Route::resource('/categories', CategoryController::class)->only(['index', 'show']);
+Route::resource('/categories', CategoryController::class)->only(['show']);
// Folder GET by Id or by Library Id
Route::resource('/folders', FolderController::class)->only(['show']);