diff --git a/app/components/layout/AppNavbar.vue b/app/components/layout/AppNavbar.vue index ee6985b..8fb0ed8 100644 --- a/app/components/layout/AppNavbar.vue +++ b/app/components/layout/AppNavbar.vue @@ -186,9 +186,9 @@ Connecté en tant que
{{ activeProfileLabel }} -
  • - - Gestion des profils +
  • + + Administration
    • @@ -214,6 +214,7 @@ import { computed } from 'vue' import { useRoute } from '#imports' import { useNavDropdown } from '~/composables/useNavDropdown' +import { usePermissions } from '~/composables/usePermissions' import { useProfileSession } from '~/composables/useProfileSession' import IconLucideMenu from '~icons/lucide/menu' import IconLucideSettings from '~icons/lucide/settings' @@ -288,6 +289,7 @@ const navGroups: NavGroup[] = [ const route = useRoute() const { openDropdown, setDropdown, scheduleDropdownClose, toggleDropdown } = useNavDropdown() const { activeProfile } = useProfileSession() +const { isAdmin } = usePermissions() const isActive = (path: string) => { if (path === '/') { diff --git a/app/components/machine/MachineDetailHeader.vue b/app/components/machine/MachineDetailHeader.vue index 4f54a17..ab797e9 100644 --- a/app/components/machine/MachineDetailHeader.vue +++ b/app/components/machine/MachineDetailHeader.vue @@ -60,6 +60,8 @@ import IconLucideSquarePen from '~icons/lucide/square-pen' import IconLucideEye from '~icons/lucide/eye' import IconLucidePrinter from '~icons/lucide/printer' +const { canEdit } = usePermissions() + defineProps<{ title: string isDetailsView: boolean diff --git a/app/components/model-types/ManagementView.vue b/app/components/model-types/ManagementView.vue index 3b96f39..65788a7 100644 --- a/app/components/model-types/ManagementView.vue +++ b/app/components/model-types/ManagementView.vue @@ -16,6 +16,7 @@ :dir="dir" :loading="loading" :show-category-tabs="allowCategorySwitch" + :can-edit="canEdit" @update:category="onCategoryChange" @update:search="onSearchInput" @update:sort="onSortChange" @@ -30,6 +31,7 @@ :limit="limit" :offset="offset" :category="selectedCategory" + :can-edit="canEdit" @related="openRelatedModal" @edit="openEditPage" @delete="confirmDelete" @@ -169,6 +171,7 @@ let activeController: AbortController | null = null; const router = useRouter(); const { showError, showSuccess } = useToast(); const { get } = useApi(); +const { canEdit } = usePermissions(); const headingText = computed(() => props.heading); const descriptionText = computed( diff --git a/app/components/model-types/ModelTypeForm.vue b/app/components/model-types/ModelTypeForm.vue index a6ac478..108ac4b 100644 --- a/app/components/model-types/ModelTypeForm.vue +++ b/app/components/model-types/ModelTypeForm.vue @@ -29,7 +29,7 @@ class="select select-bordered w-full" name="category" required - :disabled="lockCategory" + :disabled="lockCategory || isReadonly" > @@ -134,7 +134,7 @@ - @@ -176,6 +176,7 @@ const props = withDefaults(defineProps<{ disableSubmitMessage?: string restrictedMode?: boolean restrictedModeMessage?: string + readonly?: boolean }>(), { initialData: null, saving: false, @@ -187,6 +188,7 @@ const props = withDefaults(defineProps<{ disableSubmitMessage: '', restrictedMode: false, restrictedModeMessage: '', + readonly: false, }) const emit = defineEmits<{ @@ -209,7 +211,8 @@ const disableSubmitMessage = computed(() => ? props.disableSubmitMessage : 'Cette catégorie ne peut pas être modifiée car des éléments y sont déjà liés.', ) -const restrictedMode = computed(() => props.restrictedMode === true) +const isReadonly = computed(() => props.readonly === true) +const restrictedMode = computed(() => props.restrictedMode === true || isReadonly.value) const restrictedModeMessage = computed(() => (props.restrictedModeMessage && props.restrictedModeMessage.trim()) ? props.restrictedModeMessage @@ -291,7 +294,7 @@ const resetForm = () => { } const submitLabel = computed(() => (props.mode === 'edit' ? 'Enregistrer' : 'Créer')) -const isSubmitDisabled = computed(() => saving.value || structureLoading.value || disableSubmit.value) +const isSubmitDisabled = computed(() => saving.value || structureLoading.value || disableSubmit.value || isReadonly.value) const validate = () => { errors.name = undefined @@ -308,6 +311,7 @@ const validate = () => { } const handleSubmit = () => { + if (isReadonly.value) return if (!validate()) { return } diff --git a/app/components/model-types/Table.vue b/app/components/model-types/Table.vue index f119901..53718cd 100644 --- a/app/components/model-types/Table.vue +++ b/app/components/model-types/Table.vue @@ -49,7 +49,7 @@ Liés - @@ -88,7 +88,7 @@ Liés - @@ -146,6 +146,7 @@ const props = defineProps<{ limit: number; offset: number; category?: ModelCategory; + canEdit?: boolean; }>(); const emit = defineEmits<{ diff --git a/app/components/model-types/Toolbar.vue b/app/components/model-types/Toolbar.vue index be6f6a5..362e542 100644 --- a/app/components/model-types/Toolbar.vue +++ b/app/components/model-types/Toolbar.vue @@ -83,13 +83,14 @@ import type { ModelCategory } from '~/services/modelTypes'; type SortField = 'name' | 'createdAt'; type SortDirection = 'asc' | 'desc'; -const props = defineProps<{ +const props = defineProps<{ category: ModelCategory; search: string; sort: SortField; dir: SortDirection; loading?: boolean; showCategoryTabs?: boolean; + canEdit?: boolean; }>(); const emit = defineEmits<{ diff --git a/app/components/sites/SiteCard.vue b/app/components/sites/SiteCard.vue index 413d067..d2c426b 100644 --- a/app/components/sites/SiteCard.vue +++ b/app/components/sites/SiteCard.vue @@ -37,9 +37,9 @@
    -
    @@ -55,6 +55,8 @@ import IconLucidePhone from '~icons/lucide/phone' import IconLucideUser from '~icons/lucide/user' import { formatPhone } from '~/utils/formatters/phone' +const { canEdit } = usePermissions() + const props = defineProps({ site: { type: Object, diff --git a/app/components/sites/SiteContactFormFields.vue b/app/components/sites/SiteContactFormFields.vue index 7465fb2..9217d0f 100644 --- a/app/components/sites/SiteContactFormFields.vue +++ b/app/components/sites/SiteContactFormFields.vue @@ -9,11 +9,12 @@ type="text" placeholder="Nom et prénom" class="input input-bordered" + :disabled="disabled" required /> - +
    @@ -38,6 +40,7 @@ type="text" placeholder="Code postal" class="input input-bordered" + :disabled="disabled" required /> @@ -51,6 +54,7 @@ type="text" placeholder="Ville" class="input input-bordered" + :disabled="disabled" required /> @@ -77,6 +81,10 @@ const props = defineProps({ type: Object as PropType, required: true, }, + disabled: { + type: Boolean, + default: false, + }, }) const form = toRef(props, 'form') diff --git a/app/components/sites/SiteCreateModal.vue b/app/components/sites/SiteCreateModal.vue index 9b50ee6..8e7173b 100644 --- a/app/components/sites/SiteCreateModal.vue +++ b/app/components/sites/SiteCreateModal.vue @@ -12,17 +12,18 @@ type="text" placeholder="Ex: Usine principale" class="input input-bordered" + :disabled="disabled" required /> - +
    -
    @@ -53,6 +54,10 @@ const props = defineProps({ site: { type: Object as PropType, required: true + }, + disabled: { + type: Boolean, + default: false } }) diff --git a/app/components/sites/SiteEditModal.vue b/app/components/sites/SiteEditModal.vue index 224addb..12319cd 100644 --- a/app/components/sites/SiteEditModal.vue +++ b/app/components/sites/SiteEditModal.vue @@ -2,7 +2,7 @@

    - Modifier le site + {{ disabled ? 'Détails du site' : 'Modifier le site' }} {{ siteName }}

    @@ -15,11 +15,12 @@ type="text" placeholder="Nom du site" class="input input-bordered" + :disabled="disabled" required >
    - +
    @@ -37,6 +38,7 @@
    Télécharger -
    @@ -103,7 +105,7 @@ - @@ -155,6 +157,10 @@ const props = defineProps({ formatSize: { type: Function, required: true + }, + disabled: { + type: Boolean, + default: false } }) diff --git a/app/composables/useAdminProfiles.ts b/app/composables/useAdminProfiles.ts new file mode 100644 index 0000000..230eeb4 --- /dev/null +++ b/app/composables/useAdminProfiles.ts @@ -0,0 +1,80 @@ +import { ref } from 'vue' +import { useApi } from './useApi' + +export interface AdminProfile { + id: string + firstName: string + lastName: string + email: string | null + isActive: boolean + hasPassword: boolean + roles: string[] + createdAt: string + updatedAt: string +} + +export function useAdminProfiles() { + const { get, post, put } = useApi() + const profiles = ref([]) + const loading = ref(false) + + const fetchAll = async () => { + loading.value = true + try { + const result = await get('/admin/profiles') + if (result.success && result.data) { + profiles.value = result.data + } + } finally { + loading.value = false + } + } + + const createProfile = async (data: { + firstName: string + lastName: string + email?: string + password?: string + role?: string + }) => { + const result = await post('/admin/profiles', data) + if (result.success) { + await fetchAll() + } + return result + } + + const updateRole = async (id: string, role: string) => { + const result = await put(`/admin/profiles/${id}/role`, { role }) + if (result.success) { + await fetchAll() + } + return result + } + + const setPassword = async (id: string, password: string) => { + const result = await put(`/admin/profiles/${id}/password`, { password }) + if (result.success) { + await fetchAll() + } + return result + } + + const deactivateProfile = async (id: string) => { + const result = await put(`/admin/profiles/${id}/deactivate`, {}) + if (result.success) { + await fetchAll() + } + return result + } + + return { + profiles, + loading, + fetchAll, + createProfile, + updateRole, + setPassword, + deactivateProfile, + } +} diff --git a/app/composables/useApi.ts b/app/composables/useApi.ts index d9e2378..e053831 100644 --- a/app/composables/useApi.ts +++ b/app/composables/useApi.ts @@ -66,7 +66,9 @@ export function useApi() { const text = await response.text().catch(() => '') errorData = text ? { message: text } : {} } - const errorMessage = (errorData.message as string) || `Erreur ${response.status}: ${response.statusText}` + const errorMessage = response.status === 403 + ? 'Permissions insuffisantes pour cette action.' + : (errorData.message as string) || `Erreur ${response.status}: ${response.statusText}` showError(errorMessage) return { success: false, error: errorMessage, status: response.status } } diff --git a/app/composables/usePermissions.ts b/app/composables/usePermissions.ts new file mode 100644 index 0000000..a96fd5c --- /dev/null +++ b/app/composables/usePermissions.ts @@ -0,0 +1,41 @@ +import { computed } from 'vue' +import { useProfileSession } from './useProfileSession' + +const ROLE_HIERARCHY: Record = { + ROLE_ADMIN: ['ROLE_ADMIN', 'ROLE_GESTIONNAIRE', 'ROLE_VIEWER', 'ROLE_USER'], + ROLE_GESTIONNAIRE: ['ROLE_GESTIONNAIRE', 'ROLE_VIEWER', 'ROLE_USER'], + ROLE_VIEWER: ['ROLE_VIEWER', 'ROLE_USER'], + ROLE_USER: ['ROLE_USER'], +} + +export function usePermissions() { + const { activeProfile } = useProfileSession() + + const effectiveRoles = computed(() => { + const roles = (activeProfile.value?.roles as string[] | undefined) ?? ['ROLE_USER'] + const all = new Set() + for (const role of roles) { + const inherited = ROLE_HIERARCHY[role] ?? [role] + for (const r of inherited) { + all.add(r) + } + } + return [...all] + }) + + const isGranted = (role: string): boolean => { + return effectiveRoles.value.includes(role) + } + + const isAdmin = computed(() => isGranted('ROLE_ADMIN')) + const canEdit = computed(() => isGranted('ROLE_GESTIONNAIRE')) + const canView = computed(() => isGranted('ROLE_VIEWER')) + + return { + isAdmin, + canEdit, + canView, + isGranted, + effectiveRoles, + } +} diff --git a/app/composables/useProfileSession.ts b/app/composables/useProfileSession.ts index 0d4c257..1acb477 100644 --- a/app/composables/useProfileSession.ts +++ b/app/composables/useProfileSession.ts @@ -1,12 +1,9 @@ -import { useState, useRequestHeaders, useRuntimeConfig } from '#imports' +import { useState, useRuntimeConfig } from '#imports' import type { Profile } from './useProfiles' const buildUrl = (path: string): string => { const config = useRuntimeConfig() - const baseUrl = import.meta.server - ? ((config.apiBaseUrl as string) || (config.public.apiBaseUrl as string) || '') - : ((config.public.apiBaseUrl as string) || '') - const base = baseUrl.replace(/\/$/, '') + const base = ((config.public.apiBaseUrl as string) || '').replace(/\/$/, '') return `${base}${path}` } @@ -15,19 +12,12 @@ export function useProfileSession() { const sessionLoaded = useState('profileSession:loaded', () => false) const loading = useState('profileSession:loading', () => false) - const getSessionHeaders = (): Record | undefined => { - if (!import.meta.server) { return undefined } - const headers = useRequestHeaders(['cookie']) - return headers?.cookie ? { cookie: headers.cookie } : undefined - } - const fetchCurrentProfile = async (): Promise => { loading.value = true try { activeProfile.value = await $fetch(buildUrl('/session/profile'), { method: 'GET', credentials: 'include', - headers: getSessionHeaders(), }) } catch (error) { const err = error as { status?: number } @@ -51,12 +41,15 @@ export function useProfileSession() { return Promise.resolve(activeProfile.value) } - const activateProfile = async (profileId: string): Promise => { + const activateProfile = async (profileId: string, password?: string): Promise => { + const body: Record = { profileId } + if (password) { + body.password = password + } await $fetch(buildUrl('/session/profile'), { method: 'POST', credentials: 'include', - body: { profileId }, - headers: getSessionHeaders(), + body, }) await fetchCurrentProfile() } @@ -66,7 +59,6 @@ export function useProfileSession() { await $fetch(buildUrl('/session/profile'), { method: 'DELETE', credentials: 'include', - headers: getSessionHeaders(), }) } finally { activeProfile.value = null diff --git a/app/composables/useProfiles.ts b/app/composables/useProfiles.ts index 945ec4c..9c85f99 100644 --- a/app/composables/useProfiles.ts +++ b/app/composables/useProfiles.ts @@ -1,9 +1,13 @@ -import { useState, useRequestHeaders, useRuntimeConfig } from '#imports' +import { useState, useRuntimeConfig } from '#imports' export interface Profile { id: string firstName: string lastName: string + email?: string | null + isActive?: boolean + hasPassword?: boolean + roles?: string[] [key: string]: unknown } @@ -18,19 +22,12 @@ export function useProfiles() { const loadingProfiles = useState('profiles:loading', () => false) const profilesLoaded = useState('profiles:loaded', () => false) - const getSessionHeaders = (): Record | undefined => { - if (!import.meta.server) { return undefined } - const headers = useRequestHeaders(['cookie']) - return headers?.cookie ? { cookie: headers.cookie } : undefined - } - const fetchProfiles = async (): Promise => { loadingProfiles.value = true try { profiles.value = await $fetch(buildUrl('/session/profiles'), { method: 'GET', credentials: 'include', - headers: getSessionHeaders(), }) profilesLoaded.value = true } catch (error) { @@ -43,32 +40,10 @@ export function useProfiles() { return profiles.value } - const createProfile = async ({ firstName, lastName }: { firstName: string; lastName: string }): Promise => { - const profile = await $fetch(buildUrl('/session/profiles'), { - method: 'POST', - credentials: 'include', - body: { firstName, lastName }, - headers: getSessionHeaders(), - }) - await fetchProfiles() - return profile - } - - const deleteProfile = async (profileId: string): Promise => { - await $fetch(buildUrl(`/session/profiles/${profileId}`), { - method: 'DELETE', - credentials: 'include', - headers: getSessionHeaders(), - }) - await fetchProfiles() - } - return { profiles, loadingProfiles, profilesLoaded, fetchProfiles, - createProfile, - deleteProfile, } } diff --git a/app/middleware/profile.global.ts b/app/middleware/profile.global.ts index a67190c..c6ab767 100644 --- a/app/middleware/profile.global.ts +++ b/app/middleware/profile.global.ts @@ -1,8 +1,7 @@ -import { useProfileSession } from "#imports"; +import { useProfileSession, usePermissions } from "#imports"; export default defineNuxtRouteMiddleware(async (to) => { - const { ensureSession, fetchCurrentProfile, activeProfile } = - useProfileSession(); + const { ensureSession, activeProfile } = useProfileSession(); await ensureSession(); const rawPath = to?.path ?? ""; @@ -14,11 +13,21 @@ export default defineNuxtRouteMiddleware(async (to) => { fullPath.startsWith("/profiles") || routeName.startsWith("profiles"); - if (process.client && !activeProfile.value) { - await fetchCurrentProfile(); - } - - if (process.client && !activeProfile.value && !isProfilesRoute) { + // Redirect to login if no active profile + if (!activeProfile.value && !isProfilesRoute) { return navigateTo("/profiles"); } + + // Permission checks + if (activeProfile.value) { + const { isAdmin } = usePermissions(); + + // Admin-only routes + if (normalizedPath.startsWith("/admin")) { + if (!isAdmin.value) { + return navigateTo("/"); + } + } + + } }); diff --git a/app/pages/admin/index.vue b/app/pages/admin/index.vue new file mode 100644 index 0000000..c52dd3c --- /dev/null +++ b/app/pages/admin/index.vue @@ -0,0 +1,245 @@ + + + diff --git a/app/pages/component-catalog.vue b/app/pages/component-catalog.vue index 0c5169b..6325155 100644 --- a/app/pages/component-catalog.vue +++ b/app/pages/component-catalog.vue @@ -149,6 +149,7 @@ Modifier
    @@ -100,7 +100,7 @@ @@ -118,7 +118,7 @@ step="0.01" min="0" class="input input-bordered input-sm md:input-md" - :disabled="saving" + :disabled="!canEdit || saving" placeholder="Valeur indicatrice" > @@ -277,7 +277,7 @@ type="text" class="input input-bordered input-sm md:input-md" :required="field.required" - :disabled="saving" + :disabled="!canEdit || saving" > @@ -347,7 +347,7 @@ {{ selectedFiles.length }} document{{ selectedFiles.length > 1 ? 's' : '' }} prêt{{ selectedFiles.length > 1 ? 's' : '' }} à être ajouté{{ selectedFiles.length > 1 ? 's' : '' }} -
    +
    @@ -73,7 +73,7 @@
    @@ -90,7 +90,7 @@ step="0.01" min="0" class="input input-bordered input-sm md:input-md" - :disabled="submitting || !selectedType" + :disabled="!canEdit || submitting || !selectedType" placeholder="Valeur indicatrice" > @@ -244,7 +244,7 @@ type="text" class="input input-bordered input-sm md:input-md" :required="field.required" - :disabled="submitting" + :disabled="!canEdit || submitting" > @@ -314,7 +314,7 @@ {{ selectedDocuments.length }} document{{ selectedDocuments.length > 1 ? 's' : '' }} prêt{{ selectedDocuments.length > 1 ? 's' : '' }} à être ajouté{{ selectedDocuments.length > 1 ? 's' : '' }} -
    +
    (typeof route.query.typeId === 'string' ? route.query.typeId : '') const selectedTypeId = ref(initialTypeId.value) @@ -755,6 +756,7 @@ const requiredCustomFieldsFilled = computed(() => ) const canSubmit = computed(() => Boolean( + canEdit.value && selectedType.value && creationForm.name && requiredCustomFieldsFilled.value && diff --git a/app/pages/constructeurs.vue b/app/pages/constructeurs.vue index 5239785..0bfd49c 100644 --- a/app/pages/constructeurs.vue +++ b/app/pages/constructeurs.vue @@ -9,7 +9,7 @@ Gérez les fournisseurs et leurs coordonnées.

    - @@ -73,9 +73,9 @@
    -
    @@ -90,22 +90,22 @@

    - {{ editingConstructeur ? 'Modifier' : 'Nouveau' }} fournisseur + {{ editingConstructeur ? (canEdit ? 'Modifier' : 'Détails du') : 'Nouveau' }} fournisseur

    - +
    - - + +
    - @@ -117,7 +117,7 @@