work in progress, updated tests, functional accounts for testing

Author: nitrosx

functionalAccounts.json.test

@@ -1,32 +1,46 @@
 [
   {
       "username": "admin",
-      "email": "admin@your.site",
-      "password": "am2jf70TPNZsSan",
+      "email": "admin@scicat.project",
+      "password": "27f5fd86ae68fe740eef42b8bbd1d7d5",
       "role": "admin",
       "global": true
     },
     {
-      "username": "ingestor",
-      "email": "[email protected]",
-      "password": "aman",
-      "role": "ingestor",
+      "username": "adminIngestor",
+      "email": "[email protected]",
+      "password": "13f4242dc691a3ee3bb5ca2006edcdf7",
+      "role": "adminingestor",
       "global": false
     },
     {
       "username": "archiveManager",
-      "email": "[email protected]",
-      "password": "aman",
+      "email": "[email protected]",
+      "password": "6d3b76392e6f41b087c11f8b77e3f9de",
       "role": "archivemanager",
       "global": false
     },
+    {
+      "username": "datasetIngestor",
+      "email": "[email protected]",
+      "password": "bc35db76848cf9fbb7f40b6661644e97",
+      "role": "datasetingestor",
+      "global": false
+    },
     {
       "username": "proposalIngestor",
-      "email": "[email protected]",
-      "password": "aman",
+      "email": "[email protected]",
+      "password": "7d8cd858fb9d0e4f5d91c34fd4016167",
       "role": "proposalingestor",
       "global": false
     },
+    {
+      "username": "sampleIngestor",
+      "email": "[email protected]",
+      "password": "e4876cb39c7dc4fe957d7c4f6a34cdd8",
+      "role": "sampleingestor",
+      "global": false
+    },
     {
       "username": "user1",
       "email": "[email protected]",

src/casl/action.enum.ts

@@ -135,43 +135,45 @@ export enum Action {
   ProposalsAttachmentDeleteOwner = "proposals_attachment_delete_owner",
   ProposalsAttachmentDeleteAny = "proposals_attachment_delete_any",
 
+  // -------------------------------------
   // Samples
-  // endpoint authorization actions
-  SamplesCreate = "samples_create",
-  SamplesRead = "samples_read",
-  SamplesUpdate = "samples_update",
-  SamplesDelete = "samples_delete",
-  SamplesAttachmentCreate = "samples_attachment_create",
-  SamplesAttachmentRead = "samples_attachment_read",
-  SamplesAttachmentUpdate = "samples_attachment_update",
-  SamplesAttachmentDelete = "samples_attachment_delete",
-  SamplesDatasetRead = "samples_dataset_read",
-
-  // individual actions
-  SamplesCreateOwner = "samples_create_owner",
-  SamplesCreateAny = "samples_create_any",
-  SamplesReadManyPublic = "samples_read_many_public",
-  SamplesReadManyAccess = "samples_read_many_access",
-  SamplesReadManyOwner = "samples_read_many_owner",
-  SamplesReadOnePublic = "samples_read_one_public",
-  SamplesReadOneAccess = "samples_read_one_access",
-  SamplesReadOneOwner = "samples_read_one_owner",
-  SamplesReadAny = "samples_read_any",
+  // -------------------------------------
+  // sample endpoint authorization
+  SampleCreate = "sample_create",
+  SampleRead = "sample_read",
+  SampleUpdate = "sample_update",
+  SampleDelete = "sample_delete",
+  SampleAttachmentCreate = "sample_attachment_create",
+  SampleAttachmentRead = "sample_attachment_read",
+  SampleAttachmentUpdate = "sample_attachment_update",
+  SampleAttachmentDelete = "sample_attachment_delete",
+  SampleDatasetRead = "sample_dataset_read",
+  // -------------------------------------
+  // sample data instance authorization
+  SampleCreateOwner = "sample_create_owner",
+  SampleCreateAny = "sample_create_any",
+  SampleReadManyPublic = "sample_read_many_public",
+  SampleReadManyAccess = "sample_read_many_access",
+  SampleReadManyOwner = "sample_read_many_owner",
+  SampleReadOnePublic = "sample_read_one_public",
+  SampleReadOneAccess = "sample_read_one_access",
+  SampleReadOneOwner = "sample_read_one_owner",
+  SampleReadAny = "sample_read_any",
 
-  SamplesUpdateOwner = "samples_update_owner",
-  SamplesUpdateAny = "samples_update_any",
-  SamplesDeleteOwner = "samples_delete_owner",
-  SamplesDeleteAny = "samples_delete_any",
-  SamplesAttachmentCreateOwner = "samples_attachment_create_owner",
-  SamplesAttachmentCreateAny = "samples_attachment_create_any",
-  SamplesAttachmentReadPublic = "samples_attachment_read_public",
-  SamplesAttachmentReadAccess = "samples_attachment_read_access",
-  SamplesAttachmentReadOwner = "samples_attachment_read_owner",
-  SamplesAttachmentReadAny = "samples_attachment_read_any",
-  SamplesAttachmentUpdateOwner = "samples_attachment_update_owner",
-  SamplesAttachmentUpdateAny = "samples_attachment_update_any",
-  SamplesAttachmentDeleteOwner = "samples_attachment_delete_owner",
-  SamplesAttachmentDeleteAny = "samples_attachment_delete_any",
+  SampleUpdateOwner = "sample_update_owner",
+  SampleUpdateAny = "sample_update_any",
+  SampleDeleteOwner = "sample_delete_owner",
+  SampleDeleteAny = "sample_delete_any",
+  SampleAttachmentCreateOwner = "sample_attachment_create_owner",
+  SampleAttachmentCreateAny = "sample_attachment_create_any",
+  SampleAttachmentReadPublic = "sample_attachment_read_public",
+  SampleAttachmentReadAccess = "sample_attachment_read_access",
+  SampleAttachmentReadOwner = "sample_attachment_read_owner",
+  SampleAttachmentReadAny = "sample_attachment_read_any",
+  SampleAttachmentUpdateOwner = "sample_attachment_update_owner",
+  SampleAttachmentUpdateAny = "sample_attachment_update_any",
+  SampleAttachmentDeleteOwner = "sample_attachment_delete_owner",
+  SampleAttachmentDeleteAny = "sample_attachment_delete_any",
 
   // --------------
   // Jobs