diff --git a/services/backend/services/keycloak/README.md b/services/backend/services/keycloak/README.md index 25e76b36..f37fca42 100644 --- a/services/backend/services/keycloak/README.md +++ b/services/backend/services/keycloak/README.md @@ -19,7 +19,7 @@ Also a realm called `facility` is created with the following user and group: | Username | Password | Group | | --------- | -------- | ----- | -| oidc-user | password | aGroup| +| oidc-user | password | group1| The users' groups are passed to SciCat backend via the OIDC ID Token, in the claim named `accessGroups` (an array of strings). The name of the claim can be configured either in [login-callbacks.js](../v3/config/login-callbacks.js) for v3 or with [environment variables](../v4/config/.oidc.env) for v4. diff --git a/services/backend/services/keycloak/config/facility-realm.json b/services/backend/services/keycloak/config/facility-realm.json index ed04a41a..19a5f281 100644 --- a/services/backend/services/keycloak/config/facility-realm.json +++ b/services/backend/services/keycloak/config/facility-realm.json @@ -337,8 +337,8 @@ }, "groups" : [ { "id" : "397a50f3-8f47-4d05-8bbc-054e8160bb26", - "name" : "aGroup", - "path" : "/aGroup", + "name" : "group1", + "path" : "/group1", "subGroups" : [ ], "attributes" : { }, "realmRoles" : [ ], @@ -406,7 +406,7 @@ "requiredActions" : [ ], "realmRoles" : [ "default-roles-facility" ], "notBefore" : 0, - "groups" : [ "/aGroup" ] + "groups" : [ "/group1" ] } ], "scopeMappings" : [ { "clientScope" : "offline_access", diff --git a/services/mongodb/config/seed/Dataset.json b/services/mongodb/config/seed/Dataset.json index aa58a43e..0c81dcae 100644 --- a/services/mongodb/config/seed/Dataset.json +++ b/services/mongodb/config/seed/Dataset.json @@ -21,7 +21,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -86,7 +86,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -151,7 +151,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -216,7 +216,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -274,7 +274,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -332,7 +332,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -390,7 +390,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -448,7 +448,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -506,7 +506,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -585,7 +585,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -664,7 +664,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -742,7 +742,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -800,7 +800,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -855,7 +855,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -913,7 +913,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -969,7 +969,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -1027,7 +1027,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -1085,7 +1085,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], @@ -1141,7 +1141,7 @@ "license": "", "version": "3.1.0", "isPublished": true, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "history": [], diff --git a/services/mongodb/config/seed/OrigDatablock.json b/services/mongodb/config/seed/OrigDatablock.json index 583ef6ef..b104a292 100644 --- a/services/mongodb/config/seed/OrigDatablock.json +++ b/services/mongodb/config/seed/OrigDatablock.json @@ -9,7 +9,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "psi_df1", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -20,7 +20,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/psi_ds1" }, @@ -34,7 +34,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "psi_df2", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -45,7 +45,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/psi_ds2" }, @@ -59,7 +59,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "psi_df3", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -70,7 +70,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/psi_ds3" }, @@ -84,7 +84,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "desy_df1", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -95,7 +95,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/desy_ds1" }, @@ -109,7 +109,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "desy_df2", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -120,7 +120,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/desy_ds2" }, @@ -134,7 +134,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "desy_df3", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -145,7 +145,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/desy_ds3" }, @@ -159,7 +159,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "dls_df1", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -170,7 +170,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/dls_ds1" }, @@ -184,7 +184,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "dls_df2", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -195,7 +195,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/dls_ds2" }, @@ -209,7 +209,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "hzdr_df1", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -220,7 +220,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/hzdr_ds1" }, @@ -234,7 +234,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "maxiv_df1", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -245,7 +245,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/maxiv_ds1" }, @@ -259,7 +259,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "maxiv_df2", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -270,7 +270,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/maxiv_ds2" }, @@ -284,7 +284,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "soleil_df1", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -295,7 +295,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/soleil_ds1" }, @@ -309,7 +309,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "soleil_df2", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -320,7 +320,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/soleil_ds2" }, @@ -334,7 +334,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "ukri_df1", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -345,7 +345,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/ukri_ds1" }, @@ -359,7 +359,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "ukri_df2", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -370,7 +370,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/ukri_ds2" }, @@ -384,7 +384,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "ukri_df3", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -395,7 +395,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/ukri_ds3" }, @@ -409,7 +409,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "ukri_df4", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -420,7 +420,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/ukri_ds4" }, @@ -434,7 +434,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "ukri_df5", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -445,7 +445,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/ukri_ds5" }, @@ -459,7 +459,7 @@ "$date": "2021-06-29T16:40:55.773Z" }, "uid": "ukri_df6", - "gid": "aGroup", + "gid": "group1", "perm": "-rw-rw----" } ], @@ -470,7 +470,7 @@ "$date": "2021-06-29T16:40:55.777Z" }, "createdBy": "ingestor", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "datasetId": "PID.SAMPLE.PREFIX/ukri_ds6" } diff --git a/services/mongodb/config/seed/Proposal.json b/services/mongodb/config/seed/Proposal.json index 4b698146..9c1abce6 100644 --- a/services/mongodb/config/seed/Proposal.json +++ b/services/mongodb/config/seed/Proposal.json @@ -9,7 +9,7 @@ "lastname": "Schlepütz", "title": "Full-volume high-resolution x-ray tomographic microscopy reconstruction of a juvenile rat lung in fresh post mortem conditions; cropped to the maximum extent of the lung structure", "abstract": "", - "ownerGroup": "aGroup", + "ownerGroup": "group1", "accessGroups": [], "createdBy": "ingestor", "MeasurementPeriodList": [ diff --git a/services/mongodb/config/seed/Sample.json b/services/mongodb/config/seed/Sample.json index a4b6e70e..d877e7e9 100644 --- a/services/mongodb/config/seed/Sample.json +++ b/services/mongodb/config/seed/Sample.json @@ -6,7 +6,7 @@ "createdAt": { "$date": "2021-06-29T16:47:29.140Z" }, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "createdBy": "ingestor", "updatedAt": { "$date": "2021-06-29T16:47:29.141Z" @@ -19,7 +19,7 @@ "createdAt": { "$date": "2021-06-29T16:48:09.707Z" }, - "ownerGroup": "aGroup", + "ownerGroup": "group1", "createdBy": "ingestor", "updatedAt": { "$date": "2021-06-29T16:48:09.708Z"