Skip to content

A self-hosted media server and file management system

feat: is_admin check in a composable and via api

aminnausin446c0684425a
diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php
index 8f496637..0e65598d 100644
--- a/app/Http/Resources/UserResource.php
+++ b/app/Http/Resources/UserResource.php
@@ -18,6 +18,7 @@ class UserResource extends JsonResource {
'email' => $this->email,
'created_at' => $this->created_at,
'last_active' => $this->last_active,
+ 'is_admin' => $request->user()?->isAdmin() ? true : false,
];
}
}
diff --git a/app/Models/User.php b/app/Models/User.php
index c027f4d5..be85f0f8 100755
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -6,6 +6,7 @@ use App\Notifications\QueuedResetPassword;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\Gate;
use Laravel\Sanctum\HasApiTokens;
class User extends Authenticatable {
@@ -56,4 +57,8 @@ class User extends Authenticatable {
public function sendPasswordResetNotification($token) {
$this->notify(new QueuedResetPassword($token));
}
+
+ public function isAdmin(): bool {
+ return Gate::allows('admin', $this);
+ }
}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 75a3f278..c2cbee78 100755
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -39,6 +39,10 @@ class AppServiceProvider extends ServiceProvider {
'extra' => $user->email,
]);
+ Gate::define('admin', function (?User $user) {
+ return $user?->id === 1 || (config('app.env') === 'demo' && $user?->email === config('demo.auth_email'));
+ });
+
Gate::define('viewPulse', function (?User $user) {
return $user?->id === 1;
});
diff --git a/resources/js/components/dashboard/DashboardAnalytics.vue b/resources/js/components/dashboard/DashboardAnalytics.vue
index e0a78ea6..7fe81d50 100644
--- a/resources/js/components/dashboard/DashboardAnalytics.vue
+++ b/resources/js/components/dashboard/DashboardAnalytics.vue
@@ -9,6 +9,7 @@ import { handleStartTask } from '@/service/taskService';
import { periodForHumans } from '@/service/pulseUtil';
import { BreadCrumbs } from '@/components/cedar-ui/breadcrumbs';
import { BasePopover } from '@/components/cedar-ui/popover';
+import { useAuth } from '@/composables/auth/useAuth';
import PulseSlowOutgoingRequests from '@/components/cards/pulse/PulseSlowOutgoingRequests.vue';
import LucideChartNoAxesCombined from '~icons/lucide/chart-no-axes-combined';
@@ -44,6 +45,8 @@ const taskPopover = useTemplateRef('taskPopover');
const { data: stats } = useGetSiteAnalytics(period);
const { data: rawPulseData, isLoading: pulseLoading } = useGetPulse({ period });
+const { isAdmin } = useAuth();
+
const breadCrumbs = computed(() => {
const items: BreadCrumbItem[] = [
{
@@ -102,7 +105,7 @@ watch(
<DashboardTaskMenu @handle-close="taskPopover?.handleClose" :show-scan-all="false" />
</template>
</BasePopover>
- <ButtonText href="/pulse" text="Pulse" title="Detailed Analytics" class="xs:flex-initial flex-1">
+ <ButtonText v-if="isAdmin" href="/pulse" text="Pulse" title="Detailed Analytics" class="xs:flex-initial flex-1">
<template #icon><ProiconsBolt /></template>
</ButtonText>
</div>
diff --git a/resources/js/composables/auth/useAuth.ts b/resources/js/composables/auth/useAuth.ts
new file mode 100644
index 00000000..3469d0f2
--- /dev/null
+++ b/resources/js/composables/auth/useAuth.ts
@@ -0,0 +1,13 @@
+import { useAuthStore } from '@/stores/AuthStore';
+import { storeToRefs } from 'pinia';
+
+export function useAuth() {
+ const authStore = useAuthStore();
+ const { userData, isAuthenticated, isAdmin } = storeToRefs(authStore);
+
+ return {
+ userData,
+ isAuthenticated,
+ isAdmin,
+ };
+}
diff --git a/resources/js/contracts/users.ts b/resources/js/contracts/users.ts
index 1588d625..e8ba5b30 100644
--- a/resources/js/contracts/users.ts
+++ b/resources/js/contracts/users.ts
@@ -5,6 +5,7 @@ export interface UserResource {
last_active: string;
created_at: string;
avatar?: string;
+ is_admin?: boolean;
}
export interface ProfileResource {
diff --git a/resources/js/stores/AuthStore.ts b/resources/js/stores/AuthStore.ts
index 2e70c4a5..5ba21539 100644
--- a/resources/js/stores/AuthStore.ts
+++ b/resources/js/stores/AuthStore.ts
@@ -1,9 +1,9 @@
import type { UserResource } from '@/types/resources';
+import { computed, ref } from 'vue';
import { authenticate } from '@/service/authAPI';
import { defineStore } from 'pinia';
import { toast } from '@aminnausin/cedar-ui';
-import { ref } from 'vue';
// This code is not good
export const useAuthStore = defineStore('Auth', () => {
@@ -65,8 +65,13 @@ export const useAuthStore = defineStore('Auth', () => {
});
};
+ const isAuthenticated = computed(() => !!userData.value?.id);
+ const isAdmin = computed(() => userData.value?.is_admin);
+
return {
userData,
+ isAuthenticated,
+ isAdmin,
isLoadingUserData,
fetchUser,
clearAuthState,