A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: config option for allowing all users to view list of users
aminnausind134071053db
diff --git a/app/Http/Controllers/Api/V1/UserController.php b/app/Http/Controllers/Api/V1/UserController.phpindex 56df1dbd..4b9f5b0e 100644--- a/app/Http/Controllers/Api/V1/UserController.php+++ b/app/Http/Controllers/Api/V1/UserController.php@@ -18,6 +18,10 @@ class UserController extends Controller {*/public function index() {try {+ if (config('access.users.index')) {+ return UserResource::collection(User::all()->sortBy('name'));+ }+$users = Auth::id() === 1 || (app()->environment('demo') && Auth::user()->email === config('demo.auth_email'))? User::all()->sortBy('name'): User::where('id', Auth::id())->get();@@ -73,9 +77,9 @@ class UserController extends Controller {try {returnDB::table('sessions')- ->whereNotNull('user_id')- ->distinct()- ->count('user_id');+ ->whereNotNull('user_id')+ ->distinct()+ ->count('user_id');} catch (\Throwable $th) {return $this->error(0, 'Unable to get count of logged in users. Error: ' . $th->getMessage(), 500);}diff --git a/config/access.php b/config/access.phpnew file mode 100644index 00000000..7cafad30--- /dev/null+++ b/config/access.php@@ -0,0 +1,6 @@+<?php+return [+ "users" => [+ "index" => env("ALLOW_PUBLIC_USER_LIST", false)+ ]+];diff --git a/resources/js/components/cards/data/UserCard.vue b/resources/js/components/cards/data/UserCard.vueindex 8afaceb6..ac8962bd 100644--- a/resources/js/components/cards/data/UserCard.vue+++ b/resources/js/components/cards/data/UserCard.vue@@ -3,7 +3,9 @@ import type { UserResource } from '@/types/resources';import { toFormattedDate, toTimeSpan } from '@/service/util';import { ButtonCorner, ButtonText } from '@/components/cedar-ui/button';+import { useAuthStore } from '@/stores/AuthStore';import { BasePopover } from '@/components/cedar-ui/popover';+import { storeToRefs } from 'pinia';import LazyImage from '@/components/lazy/LazyImage.vue';@@ -12,6 +14,8 @@ import ProiconsPersonCircle from '~icons/proicons/person-circle';import ProiconsLockOpen from '~icons/proicons/lock-open';import ProiconsDelete from '~icons/proicons/delete';+const { userData } = storeToRefs(useAuthStore());+const props = defineProps<{ data: UserResource }>();</script><template>@@ -79,22 +83,24 @@ const props = defineProps<{ data: UserResource }>();</template></ButtonCorner>- <ButtonCorner- :useDefaultStyle="false"- :label="'Manage Permissions'"- class="hover:text-primary dark:hover:text-primary-muted hover:dark:bg-surface-1 hover:bg-surface-6 size-7 transition-none"- disabled- >- <template #icon>- <ProiconsLockOpen width="20" height="20" />- </template>- </ButtonCorner>- <ButtonCorner- @click.stop.prevent="$emit('clickAction')"- :useDefaultStyle="false"- :label="'Remove User'"- class="text-danger-3/80 hover:text-danger-2 hover:dark:bg-surface-1 hover:bg-surface-6 hidden size-7 transition-none *:size-5 sm:flex"- />+ <template v-if="userData?.id === 1">+ <ButtonCorner+ :useDefaultStyle="false"+ :label="'Manage Permissions'"+ class="hover:text-primary dark:hover:text-primary-muted hover:dark:bg-surface-1 hover:bg-surface-6 size-7 transition-none"+ disabled+ >+ <template #icon>+ <ProiconsLockOpen width="20" height="20" />+ </template>+ </ButtonCorner>+ <ButtonCorner+ @click.stop.prevent="$emit('clickAction')"+ :useDefaultStyle="false"+ :label="'Remove User'"+ class="text-danger-3/80 hover:text-danger-2 hover:dark:bg-surface-1 hover:bg-surface-6 hidden size-7 transition-none *:size-5 sm:flex"+ />+ </template></div></section><section class="text-foreground-1 flex w-full flex-col text-sm sm:flex-row sm:justify-between">