Merge pull request #1009 from joshunrau/permissions

joshunrau · web-flow · commit 6d87f74cb05b · 2024-10-29T18:35:47.000-04:00
diff --git a/apps/api/prisma/schema.prisma b/apps/api/prisma/schema.prisma
@@ -160,19 +160,45 @@ enum BasePermissionLevel {
   STANDARD
 }
 
+enum AppSubject {
+  all
+  Assignment
+  Group
+  Instrument
+  InstrumentRecord
+  Session
+  Subject
+  Summary
+  User
+}
+
+enum AppAction {
+  create
+  delete
+  manage
+  read
+  update
+}
+
+type AuthRule {
+  action  AppAction
+  subject AppSubject
+}
+
 model UserModel {
-  createdAt           DateTime             @default(now()) @db.Date
-  updatedAt           DateTime             @updatedAt @db.Date
-  id                  String               @id @default(auto()) @map("_id") @db.ObjectId
-  basePermissionLevel BasePermissionLevel?
-  firstName           String
-  groupIds            String[]             @db.ObjectId
-  groups              GroupModel[]         @relation(fields: [groupIds], references: [id])
-  lastName            String
-  password            String
-  username            String
-  sex                 Sex?
-  dateOfBirth         DateTime?            @db.Date
+  createdAt             DateTime             @default(now()) @db.Date
+  updatedAt             DateTime             @updatedAt @db.Date
+  id                    String               @id @default(auto()) @map("_id") @db.ObjectId
+  basePermissionLevel   BasePermissionLevel?
+  additionalPermissions AuthRule[]
+  firstName             String
+  groupIds              String[]             @db.ObjectId
+  groups                GroupModel[]         @relation(fields: [groupIds], references: [id])
+  lastName              String
+  password              String
+  username              String
+  sex                   Sex?
+  dateOfBirth           DateTime?            @db.Date
 }
 
 enum SessionType {
diff --git a/apps/api/src/ability/__tests__/ability.factory.spec.ts b/apps/api/src/ability/__tests__/ability.factory.spec.ts
@@ -15,6 +15,7 @@ describe('AbilityFactory', () => {
 
     abilityFactory = module.get(AbilityFactory);
     userModelStub = {
+      additionalPermissions: [],
       basePermissionLevel: null,
       createdAt: new Date(),
       dateOfBirth: null,
diff --git a/apps/api/src/ability/ability.factory.ts b/apps/api/src/ability/ability.factory.ts
@@ -40,13 +40,17 @@ export class AbilityFactory {
         ability.can('create', 'Subject');
         ability.can('read', 'Subject', { groupIds: { hasSome: user.groupIds } });
     }
-    return ability.build({
+    user.additionalPermissions.forEach(({ action, subject }) => {
+      ability.can(action, subject);
+    });
+    const appAbility = ability.build({
       detectSubjectType: (object: { [key: string]: any }) => {
         if (object.__model__) {
           return object.__model__ as AppSubjectName;
         }
         return detectSubjectType(object) as AppSubjectName;
       }
     });
+    return appAbility;
   }
 }
diff --git a/apps/api/src/users/users.service.ts b/apps/api/src/users/users.service.ts
@@ -49,6 +49,7 @@ export class UsersService {
 
     return this.userModel.create({
       data: {
+        additionalPermissions: [],
         basePermissionLevel,
         dateOfBirth,
         firstName,
diff --git a/apps/web/src/features/admin/hooks/useUpdateUserMutation.ts b/apps/web/src/features/admin/hooks/useUpdateUserMutation.ts
@@ -0,0 +1,18 @@
+import { useNotificationsStore } from '@douglasneuroinformatics/libui/hooks';
+import type { UpdateUserData } from '@opendatacapture/schemas/user';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import axios from 'axios';
+
+export function useUpdateUserMutation() {
+  const queryClient = useQueryClient();
+  const addNotification = useNotificationsStore((store) => store.addNotification);
+  return useMutation({
+    mutationFn: async ({ data, id }: { data: UpdateUserData; id: string }) => {
+      await axios.patch(`/v1/users/${id}`, data);
+    },
+    onSuccess() {
+      addNotification({ type: 'success' });
+      void queryClient.invalidateQueries({ queryKey: ['users'] });
+    }
+  });
+}
diff --git a/apps/web/src/features/admin/pages/ManageUsersPage.tsx b/apps/web/src/features/admin/pages/ManageUsersPage.tsx
@@ -1,25 +1,30 @@
 import { useState } from 'react';
 
 import { snakeToCamelCase } from '@douglasneuroinformatics/libjs';
-import { Button, ClientTable, Heading, SearchBar, Sheet } from '@douglasneuroinformatics/libui/components';
+import { Button, ClientTable, Form, Heading, SearchBar, Sheet } from '@douglasneuroinformatics/libui/components';
 import { useTranslation } from '@douglasneuroinformatics/libui/hooks';
-import type { User } from '@opendatacapture/schemas/user';
+import { $UpdateUserData, type User } from '@opendatacapture/schemas/user';
 import { Link } from 'react-router-dom';
 
 import { PageHeader } from '@/components/PageHeader';
 import { useSearch } from '@/hooks/useSearch';
+import { useSetupState } from '@/hooks/useSetupState';
 import { useAppStore } from '@/store';
 
 import { useDeleteUserMutation } from '../hooks/useDeleteUserMutation';
+import { useUpdateUserMutation } from '../hooks/useUpdateUserMutation';
 import { useUsersQuery } from '../hooks/useUsersQuery';
 
+// eslint-disable-next-line max-lines-per-function
 export const ManageUsersPage = () => {
   const currentUser = useAppStore((store) => store.currentUser);
   const { t } = useTranslation();
   const usersQuery = useUsersQuery();
   const deleteUserMutation = useDeleteUserMutation();
+  const updateUserMutation = useUpdateUserMutation();
   const [selectedUser, setSelectedUser] = useState<null | User>(null);
   const { filteredData, searchTerm, setSearchTerm } = useSearch(usersQuery.data ?? [], 'username');
+  const setupStateQuery = useSetupState();
 
   const currentUserIsSelected = selectedUser?.username === currentUser?.username;
 
@@ -86,26 +91,129 @@ export const ManageUsersPage = () => {
             })}
           </Sheet.Description>
         </Sheet.Header>
-        <Sheet.Body className="grid gap-4"></Sheet.Body>
-        <Sheet.Footer>
-          <Button
-            className="w-full"
-            disabled={currentUserIsSelected}
-            type="button"
-            variant="danger"
-            onClick={() => {
-              deleteUserMutation.mutate({ id: selectedUser!.id });
-              setSelectedUser(null);
-            }}
-          >
-            {t('core.delete')}
-          </Button>
-          <Sheet.Close asChild>
-            <Button disabled className="w-full" type="submit">
-              {t('core.save')}
-            </Button>
-          </Sheet.Close>
-        </Sheet.Footer>
+        <Sheet.Body className="grid gap-4">
+          {setupStateQuery.data?.isExperimentalFeaturesEnabled && (
+            <Form
+              additionalButtons={{
+                left: (
+                  <Button
+                    className="w-full"
+                    disabled={currentUserIsSelected}
+                    type="button"
+                    variant="danger"
+                    onClick={() => {
+                      deleteUserMutation.mutate({ id: selectedUser!.id });
+                      setSelectedUser(null);
+                    }}
+                  >
+                    {t('core.delete')}
+                  </Button>
+                )
+              }}
+              content={{
+                additionalPermissions: {
+                  fieldset: {
+                    action: {
+                      kind: 'string',
+                      label: t({
+                        en: 'Action',
+                        fr: 'Action'
+                      }),
+                      options: {
+                        create: t({
+                          en: 'Create',
+                          fr: 'Créer'
+                        }),
+                        delete: t({
+                          en: 'Delete',
+                          fr: 'Effacer'
+                        }),
+                        manage: t({
+                          en: 'Manage (All)',
+                          fr: 'Gérer (Tout)'
+                        }),
+                        read: t({
+                          en: 'Read',
+                          fr: 'Lire'
+                        }),
+                        update: t({
+                          en: 'Update',
+                          fr: 'Mettre à jour'
+                        })
+                      },
+                      variant: 'select'
+                    },
+                    subject: {
+                      kind: 'string',
+                      label: t({
+                        en: 'Resource',
+                        fr: 'Resource'
+                      }),
+                      options: {
+                        all: t({
+                          en: 'All',
+                          fr: 'Tous'
+                        }),
+                        Assignment: t({
+                          en: 'Assignment',
+                          fr: 'Devoir'
+                        }),
+                        Group: t({
+                          en: 'Group',
+                          fr: 'Groupe'
+                        }),
+                        Instrument: t({
+                          en: 'Instrument',
+                          fr: 'Instrument'
+                        }),
+                        InstrumentRecord: t({
+                          en: 'Instrument Record',
+                          fr: "Enregistrement de l'instrument"
+                        }),
+                        Session: t({
+                          en: 'Session',
+                          fr: 'Session'
+                        }),
+                        Subject: t({
+                          en: 'Subject',
+                          fr: 'Client'
+                        }),
+                        Summary: t({
+                          en: 'Summary',
+                          fr: 'Résumé'
+                        }),
+                        User: t({
+                          en: 'User',
+                          fr: 'Utilisateur'
+                        })
+                      },
+                      variant: 'select'
+                    }
+                  },
+                  kind: 'record-array',
+                  label: t({
+                    en: 'Permission',
+                    fr: 'Autorisations supplémentaires'
+                  })
+                }
+              }}
+              initialValues={
+                selectedUser?.additionalPermissions.length
+                  ? {
+                      additionalPermissions: selectedUser.additionalPermissions
+                    }
+                  : undefined
+              }
+              submitBtnLabel={t('core.save')}
+              validationSchema={$UpdateUserData.pick({ additionalPermissions: true }).required()}
+              onSubmit={(data) => {
+                void updateUserMutation.mutateAsync({ data, id: selectedUser!.id }).then(() => {
+                  setSelectedUser(null);
+                });
+              }}
+            />
+          )}
+        </Sheet.Body>
       </Sheet.Content>
     </Sheet>
   );
diff --git a/apps/web/src/testing/stubs.ts b/apps/web/src/testing/stubs.ts
@@ -7,6 +7,7 @@ import type { User } from '@opendatacapture/schemas/user';
 import type { CurrentUser } from '@/store/types';
 
 export const adminUser: User = Object.freeze({
+  additionalPermissions: [],
   basePermissionLevel: 'ADMIN',
   createdAt: new Date(),
   firstName: 'David',
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "opendatacapture",
   "type": "module",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "private": true,
   "packageManager": "pnpm@9.11.0",
   "license": "Apache-2.0",
diff --git a/packages/schemas/src/core/core.ts b/packages/schemas/src/core/core.ts
@@ -5,18 +5,21 @@ import type { Json, JsonLiteral, Language } from '@opendatacapture/runtime-core'
 import type { Simplify } from 'type-fest';
 import { z } from 'zod';
 
-export type AppAction = 'create' | 'delete' | 'manage' | 'read' | 'update';
-
-export type AppSubjectName =
-  | 'all'
-  | 'Assignment'
-  | 'Group'
-  | 'Instrument'
-  | 'InstrumentRecord'
-  | 'Session'
-  | 'Subject'
-  | 'Summary'
-  | 'User';
+export type AppAction = z.infer<typeof $AppAction>;
+export const $AppAction = z.enum(['create', 'delete', 'manage', 'read', 'update']);
+
+export type AppSubjectName = z.infer<typeof $AppSubjectName>;
+export const $AppSubjectName = z.enum([
+  'all',
+  'Assignment',
+  'Group',
+  'Instrument',
+  'InstrumentRecord',
+  'Session',
+  'Subject',
+  'Summary',
+  'User'
+]);
 
 export type BaseAppAbility = PureAbility<[AppAction, AppSubjectName]>;
 
diff --git a/packages/schemas/src/user/user.ts b/packages/schemas/src/user/user.ts
@@ -1,14 +1,22 @@
 import { z } from 'zod';
 
-import { $BaseModel } from '../core/core.js';
+import { $AppAction, $AppSubjectName, $BaseModel } from '../core/core.js';
 import { $Sex } from '../subject/subject.js';
 
 export const $BasePermissionLevel = z.enum(['ADMIN', 'GROUP_MANAGER', 'STANDARD']);
 
 export type BasePermissionLevel = z.infer<typeof $BasePermissionLevel>;
 
+const $AdditionalPermissions = z.array(
+  z.object({
+    action: $AppAction,
+    subject: $AppSubjectName
+  })
+);
+
 export type User = z.infer<typeof $User>;
 export const $User = $BaseModel.extend({
+  additionalPermissions: $AdditionalPermissions,
   basePermissionLevel: $BasePermissionLevel.nullable(),
   dateOfBirth: z.coerce.date().nullish(),
   firstName: z.string().min(1),
@@ -35,4 +43,6 @@ export const $CreateUserData = $User
   });
 
 export type UpdateUserData = z.infer<typeof $UpdateUserData>;
-export const $UpdateUserData = $CreateUserData.partial();
+export const $UpdateUserData = $CreateUserData.partial().extend({
+  additionalPermissions: $AdditionalPermissions.optional()
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -40,13 +40,17 @@ export class AbilityFactory {`
`40`	`40`	`ability.can('create', 'Subject');`
`41`	`41`	`ability.can('read', 'Subject', { groupIds: { hasSome: user.groupIds } });`
`42`	`42`	`}`
`43`		`- return ability.build({`
	`43`	`+ user.additionalPermissions.forEach(({ action, subject }) => {`
	`44`	`+ ability.can(action, subject);`
	`45`	`+ });`
	`46`	`+ const appAbility = ability.build({`
`44`	`47`	`detectSubjectType: (object: { [key: string]: any }) => {`
`45`	`48`	`if (object.__model__) {`
`46`	`49`	`return object.__model__ as AppSubjectName;`
`47`	`50`	`}`
`48`	`51`	`return detectSubjectType(object) as AppSubjectName;`
`49`	`52`	`}`
`50`	`53`	`});`
	`54`	`+ return appAbility;`
`51`	`55`	`}`
`52`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "opendatacapture",`
`3`	`3`	`"type": "module",`
`4`		`- "version": "1.5.0",`
	`4`	`+ "version": "1.6.0",`
`5`	`5`	`"private": true,`
`6`	`6`	`"packageManager": "pnpm@9.11.0",`
`7`	`7`	`"license": "Apache-2.0",`