Skip to content

A self-hosted media server and file management system

chore: replace hard coded api error messages with constant response

aminnausin42e522603846
diff --git a/app/Http/Controllers/Api/V1/AnalyticsController.php b/app/Http/Controllers/Api/V1/AnalyticsController.php
index 19a44b2e..78212ac3 100644
--- a/app/Http/Controllers/Api/V1/AnalyticsController.php
+++ b/app/Http/Controllers/Api/V1/AnalyticsController.php
@@ -10,11 +10,13 @@ use App\Models\Tag;
use App\Models\User;
use App\Models\Video;
use App\Traits\HasPeriod;
+use App\Traits\HttpResponses;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class AnalyticsController extends Controller {
use HasPeriod;
+ use HttpResponses;
public function index(Request $request) {
$this->period = $request->query('period', '1_hour');
@@ -23,7 +25,7 @@ class AnalyticsController extends Controller {
try {
if (! Auth::user()->id == 1) {
- return Response('Forbidden', 403);
+ return $this->forbidden();
}
$currentCounts = [
@@ -72,5 +74,7 @@ class AnalyticsController extends Controller {
}
}
- public function getDashboardStats(Request $request) {}
+ public function getDashboardStats(Request $request) {
+ // Unimplemented
+ }
}
diff --git a/app/Http/Controllers/Api/V1/CategoryController.php b/app/Http/Controllers/Api/V1/CategoryController.php
index fedd120d..c0df3214 100755
--- a/app/Http/Controllers/Api/V1/CategoryController.php
+++ b/app/Http/Controllers/Api/V1/CategoryController.php
@@ -18,7 +18,7 @@ class CategoryController extends Controller {
*/
public function index() {
if (! Auth::user()) {
- abort(403, 'Unauthorized action.');
+ $this->unauthorized();
}
try {
$categories = Category::orderBy('name');
@@ -57,7 +57,7 @@ class CategoryController extends Controller {
*/
public function update(CategoryUpdateRequest $request, Category $category) {
if (! Auth::user() || Auth::user()->id !== 1) {
- abort(403, 'Unauthorized action.');
+ $this->unauthorized();
}
try {
diff --git a/app/Http/Controllers/Api/V1/RecordController.php b/app/Http/Controllers/Api/V1/RecordController.php
index f2f03212..bc1ff60a 100644
--- a/app/Http/Controllers/Api/V1/RecordController.php
+++ b/app/Http/Controllers/Api/V1/RecordController.php
@@ -34,7 +34,7 @@ class RecordController extends Controller {
public function userViewCount(Metadata $metadata) {
if (! Auth::user()) {
- abort(403, 'Unauthorized action.');
+ $this->unauthorized();
}
try {
diff --git a/app/Http/Controllers/Api/V1/SubTaskController.php b/app/Http/Controllers/Api/V1/SubTaskController.php
index fd41edcb..a5228685 100644
--- a/app/Http/Controllers/Api/V1/SubTaskController.php
+++ b/app/Http/Controllers/Api/V1/SubTaskController.php
@@ -39,7 +39,7 @@ class SubTaskController extends Controller {
*/
public function show(Request $request, Task $task) {
if (! Auth::user() || Auth::user()->id !== 1) {
- abort(403, 'Unauthorized action.');
+ $this->unauthorized();
}
try {
diff --git a/app/Http/Controllers/Api/V1/UserController.php b/app/Http/Controllers/Api/V1/UserController.php
index da1506fd..fd27cbe4 100644
--- a/app/Http/Controllers/Api/V1/UserController.php
+++ b/app/Http/Controllers/Api/V1/UserController.php
@@ -17,7 +17,7 @@ class UserController extends Controller {
*/
public function index() {
if (! Auth::user()) {
- abort(403, 'Unauthorized action.');
+ $this->unauthorized();
}
if (Auth::user()->id !== 1) {
@@ -44,7 +44,7 @@ class UserController extends Controller {
*/
public function destroy(User $user) {
if (! Auth::user() || Auth::user()->id !== 1 || Auth::user()->id === $user->id) {
- abort(403, 'Unauthorized action.');
+ $this->unauthorized();
}
return $user->delete() ? $this->success('', 'Success', 200) : $this->error('', 'Not found', 404);
@@ -52,7 +52,7 @@ class UserController extends Controller {
public function sessionCount() {
if (! Auth::user()) {
- abort(403, 'Unauthorized action.');
+ $this->unauthorized();
}
try {
diff --git a/app/Traits/HttpResponses.php b/app/Traits/HttpResponses.php
index 47de66c3..0a434a13 100755
--- a/app/Traits/HttpResponses.php
+++ b/app/Traits/HttpResponses.php
@@ -20,4 +20,12 @@ trait HttpResponses {
'data' => $data,
], $code);
}
+
+ protected function unauthorized() {
+ abort(401, 'Unauthorized action.');
+ }
+
+ protected function forbidden() {
+ return Response('Forbidden', 403);
+ }
}