A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: trying to delete self user logs them out
aminnausin21518831e708
diff --git a/app/Http/Controllers/Api/V1/UserController.php b/app/Http/Controllers/Api/V1/UserController.phpindex 232be594..aa49f1a0 100644--- a/app/Http/Controllers/Api/V1/UserController.php+++ b/app/Http/Controllers/Api/V1/UserController.php@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;use App\Http\Resources\UserResource;use App\Models\User;use App\Traits\HttpResponses;+use Exception;use Illuminate\Support\Facades\Auth;use Illuminate\Support\Facades\DB;use Illuminate\Support\Facades\Log;@@ -17,21 +18,11 @@ class UserController extends Controller {* Display a listing of the resource.*/public function index() {- if (! Auth::user()) {- $this->unauthorised();- }-- if (Auth::user()->id !== 1) {- return UserResource::collection(- User::where('id', Auth::user()->id)->get()- );- }-try {- return- UserResource::collection(- User::all()->sortBy('name')- );+ $users = Auth::id() === 1+ ? User::all()->sortBy('name')+ : User::where('id', Auth::id())->get();+ return UserResource::collection($users);} catch (\Throwable $th) {return $this->error(null, 'Unable to get list of users. Error: ' . $th->getMessage(), 500);}@@ -44,30 +35,35 @@ class UserController extends Controller {* @return \Illuminate\Http\Response*/public function destroy(User $user) {- if (! Auth::user() || Auth::user()->id !== 1 || Auth::user()->id === $user->id) {- $this->unauthorised();+ if (Auth::id() !== 1 || Auth::id() === $user->id) {+ return $this->forbidden();}return $user->delete() ? $this->success('', 'Success', 200) : $this->error('', 'Not found', 404);}public function sessionCount() {- if (! Auth::user()) {- $this->unauthorised();- }-// Try returning plausible data if api response is successfultry {- if (config('services.plausible.token') && config('services.plausible.domain') && config('services.plausible.site_id')) {+ $token = config('services.plausible.token');+ $siteId = config('services.plausible.site_id');+ $plausibleDomain = config('services.plausible.domain');++ if ($token && $siteId && $plausibleDomain) {$response = app('plausible.client')->get('/api/v1/stats/realtime/visitors', [- 'headers' => ['Authorization' => 'Bearer ' . config('services.plausible.token')],- 'query' => ['site_id' => config('services.plausible.site_id')],+ 'headers' => [+ 'Authorization' => 'Bearer ' . $token,+ ],+ 'query' => [+ 'site_id' => $siteId,+ ],]);if ($response->getStatusCode() >= 200 && $response->getStatusCode() < 300) {return json_decode($response->getBody(), true);}- Log::warning('Plausible API error: ' . $response->getBody());++ Log::warning('Plausible API responded with non-success status: ' . $response->getBody());}} catch (\Throwable $th) {Log::warning('Plausible Internal Error: ' . $th->getMessage());@@ -77,10 +73,10 @@ class UserController extends Controller {try {returnDB::table('sessions')- ->whereNotNull('user_id')- ->count();+ ->whereNotNull('user_id')+ ->count();} catch (\Throwable $th) {- return $this->error(0, 'Unable to get count of logged in of users. Error: ' . $th->getMessage(), 500);+ return $this->error(0, 'Unable to get count of logged in users. Error: ' . $th->getMessage(), 500);}}}diff --git a/resources/js/service/api.ts b/resources/js/service/api.tsindex 3dbb71a8..6e62a5b7 100644--- a/resources/js/service/api.ts+++ b/resources/js/service/api.ts@@ -21,7 +21,7 @@ const handleError = async (error: AxiosError<{ message?: string }>) => {const status = error.response?.status ?? 0;// if the server throws an error (404, 500 etc.)- const knownError = [401, 422, 500, 404, 419].includes(status);+ const knownError = [403, 422, 500, 404, 502, 401, 419].includes(status);const showToast = !error.config?.headers?.['X-Skip-Toast'];const isSessionExpired = status === 419;const isAuthError = status === 401;