Merge pull request #76 from lblod/feature/acmidm-refactor

acm idm roles
2021-12-06 11:05:49 +01:00
parent 566ec39d9a a47c9c384d
commit f9b17ced4c
10 changed files with 211 additions and 70 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,5 @@ DS_STORE

 source.json
 out.json
-security.yml
+security.yml
+config/proxy-https/proxy_ssl.conf
--- a/config/authorization/config.ex
+++ b/config/authorization/config.ex
@@ -59,7 +59,8 @@ defmodule Acl.UserGroups.Config do
 ]
  defp access_by_role( group_string ) do
    %AccessByQuery{
-      vars: ["session_group","session_role"],
+#      vars: ["session_group","session_role"], todo we might have to  create multiple graph depending on role
+       vars: [],
      query: sparql_query_for_access_role( group_string ) }
  end

@@ -76,20 +77,38 @@ defmodule Acl.UserGroups.Config do
  def user_groups do
    [
       %GroupSpec{
-        name: "acmidm",
-        useage: [:read, :write, :read_for_write],
-        access: %AccessByQuery{
-          query: "PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
-                  PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
-                  PREFIX session: <http://mu.semte.ch/vocabularies/session/>
-                  SELECT ?account WHERE {
-                    <SESSION_ID> session:account ?account.
-                  } LIMIT 1",
-          vars: []
-        },
+        name: "acmidm-lezer",
+        useage: [:read],
+        access: access_by_role( "ABBOrganisatiePortaalGebruiker-lezer" ),
        graphs: [
          %GraphSpec{
-            graph: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin",
+            graph: "http://mu.semte.ch/graphs/organisatieportaal",
+            constraint: %ResourceConstraint{
+              resource_types: @protected_resource_type
+            }
+          }
+        ]
+      },
+       %GroupSpec{
+        name: "acmidm-editeerder",
+        useage: [:read, :write, :read_for_write],
+        access: access_by_role( "ABBOrganisatiePortaalGebruiker-editeerder" ),
+        graphs: [
+          %GraphSpec{
+            graph: "http://mu.semte.ch/graphs/organisatieportaal",
+            constraint: %ResourceConstraint{
+              resource_types: @protected_resource_type
+            }
+          }
+        ]
+      },
+       %GroupSpec{
+        name: "acmidm-beheerder",
+        useage: [:read, :write, :read_for_write],
+        access: access_by_role( "ABBOrganisatiePortaalGebruiker-beheerder" ),
+        graphs: [
+          %GraphSpec{
+            graph: "http://mu.semte.ch/graphs/organisatieportaal",
            constraint: %ResourceConstraint{
              resource_types: @protected_resource_type
            }
@@ -97,11 +116,27 @@ defmodule Acl.UserGroups.Config do
        ]
      },
           %GroupSpec{
-        name: "ch-admin",
-        useage: [:read, :write, :read_for_write],
-        access: access_by_role( "ChAdmin" ),
+        name: "ch-lezer",
+        useage: [:read],
+        access: access_by_role( "ABBOrganisatiePortaalGebruiker-lezer" ),
        graphs: [ %GraphSpec{
-                    graph: "http://mu.semte.ch/graphs/contacthub/",
+                    graph: "http://mu.semte.ch/graphs/organisatieportaal",
+                    constraint: %ResourceConstraint{
+                      resource_types: @protected_resource_type } } ] },
+           %GroupSpec{
+        name: "ch-editeerder",
+        useage: [:read, :write, :read_for_write],
+        access: access_by_role( "ABBOrganisatiePortaalGebruiker-editeerder" ),
+        graphs: [ %GraphSpec{
+                    graph: "http://mu.semte.ch/graphs/organisatieportaal",
+                    constraint: %ResourceConstraint{
+                      resource_types: @protected_resource_type } } ] },
+           %GroupSpec{
+        name: "ch-beheerder",
+        useage: [:read, :write, :read_for_write],
+        access: access_by_role( "ABBOrganisatiePortaalGebruiker-beheerder" ),
+        graphs: [ %GraphSpec{
+                    graph: "http://mu.semte.ch/graphs/organisatieportaal",
                    constraint: %ResourceConstraint{
                      resource_types: @protected_resource_type } } ] },
      %GroupSpec{
--- a/config/delta-producer/administrative-units/export.json
+++ b/config/delta-producer/administrative-units/export.json
@@ -3,7 +3,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/BestuurseenheidClassificatieCode",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal"
      ],
      "properties": [
        "http://mu.semte.ch/vocabularies/core/uuid",
@@ -14,7 +14,7 @@
    {
      "type": "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal"
      ],
      "properties": [
        "http://mu.semte.ch/vocabularies/core/uuid",
@@ -27,7 +27,7 @@
    {
      "type": "http://data.vlaanderen.be/ns/besluit#Bestuursorgaan",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal"
      ],
      "properties": [
        "http://mu.semte.ch/vocabularies/core/uuid",
@@ -42,7 +42,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/BestuursorgaanClassificatieCode",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal"
      ],
      "properties": [
        "http://mu.semte.ch/vocabularies/core/uuid",
@@ -53,7 +53,7 @@
    {
      "type": "http://www.w3.org/ns/prov#Location",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal"
      ],
      "properties": [
        "http://mu.semte.ch/vocabularies/core/uuid",
--- a/config/delta-producer/organizations/export.json
+++ b/config/delta-producer/organizations/export.json
@@ -3,7 +3,7 @@
    {
      "type": "http://www.w3.org/ns/person#Person",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [ 
        "http://xmlns.com/foaf/0.1/givenName",
@@ -16,7 +16,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/MandatarisStatusCode",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -26,7 +26,7 @@
      "type": "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris",
      "strictTypeExport": "true",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://data.lblod.info/vocabularies/contacthub/startdatum",
@@ -46,7 +46,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/HelftVerkiezing",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -55,7 +55,7 @@
    {
      "type": "http://schema.org/ContactPoint",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://schema.org/email",
@@ -67,7 +67,7 @@
    {
      "type": "http://data.vlaanderen.be/ns/mandaat#Mandaat",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/ns/org#role",
@@ -78,7 +78,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/BestuursfunctieCode",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -87,7 +87,7 @@
    {
      "type": "http://www.w3.org/ns/org#Role",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -96,7 +96,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/BestuurseenheidClassificatieCode",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -105,7 +105,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/TypeEredienst",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -115,7 +115,7 @@
      "type": "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst",
      "strictTypeExport": "true",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel",
@@ -141,7 +141,7 @@
      "type": "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst",
      "strictTypeExport": "true",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel",
@@ -164,7 +164,7 @@
      "type": "http://data.lblod.info/vocabularies/erediensten/RepresentatiefOrgaan",
      "strictTypeExport": "true",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel",
@@ -185,7 +185,7 @@
      "type": "http://data.vlaanderen.be/ns/besluit#Bestuursorgaan",
      "strictTypeExport": "true",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://data.vlaanderen.be/ns/mandaat#bindingEinde",
@@ -199,7 +199,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/BestuursorgaanClassificatieCode",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -208,7 +208,7 @@
    {
      "type": "http://data.lblod.info/vocabularies/erediensten/BetrokkenLokaleBesturen",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://data.lblod.info/vocabularies/erediensten/financieringspercentage",
@@ -219,7 +219,7 @@
    {
      "type": "http://www.w3.org/ns/adms#Identifier",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#notation",
@@ -229,7 +229,7 @@
    {
      "type": "https://data.vlaanderen.be/ns/generiek#GestructureerdeIdentificator",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "https://data.vlaanderen.be/ns/generiek#lokaleIdentificator"
@@ -238,7 +238,7 @@
    {
      "type": "http://www.w3.org/ns/locn#Address",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "https://data.vlaanderen.be/ns/adres#Adresvoorstelling.huisnummer",
@@ -256,7 +256,7 @@
    {
      "type": "http://www.w3.org/ns/org#Site",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/ns/org#siteAddress",
@@ -267,7 +267,7 @@
    {
      "type": "http://www.w3.org/ns/org#ChangeEvent",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://purl.org/dc/terms/date",
@@ -280,7 +280,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/Veranderingsgebeurtenis",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -289,7 +289,7 @@
    {
      "type": "http://www.w3.org/2004/02/skos/core#Concept",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -298,7 +298,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/OrganisatieStatusCode",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -307,7 +307,7 @@
    {
      "type": "http://www.w3.org/ns/prov#Location",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2000/01/rdf-schema#label",
@@ -318,7 +318,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/TypeBetrokkenheid",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -327,7 +327,7 @@
    {
      "type": "http://data.lblod.info/vocabularies/erediensten/RolBedienaar", 
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://data.lblod.info/vocabularies/contacthub/startdatum",
@@ -342,7 +342,7 @@
    {
      "type": "http://data.lblod.info/vocabularies/erediensten/VoorwaardenBedienaar",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://data.lblod.info/vocabularies/erediensten/voldaan",
@@ -352,7 +352,7 @@
    },{
      "type": "http://publications.europa.eu/ontology/euvoc#Country",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel",
@@ -361,7 +361,7 @@
    },{
      "type": "http://data.lblod.info/vocabularies/erediensten/PositieBedienaar",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/ns/org#role",
@@ -373,7 +373,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/EredienstBeroepen",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -382,7 +382,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/BedienaarFinanceringCode",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -391,7 +391,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/VoorwaardenBedienaarCriterium",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -400,7 +400,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/BedienaarCriteriumBewijsstuk",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
@@ -409,7 +409,7 @@
    {
      "type": "http://lblod.data.gift/vocabularies/organisatie/TypeVestiging",
      "graphsFilter": [
-        "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+        "http://mu.semte.ch/graphs/organisatieportaal/"
      ],
      "properties": [
        "http://www.w3.org/2004/02/skos/core#prefLabel"
--- a/config/delta/rules.js
+++ b/config/delta/rules.js
@@ -3,7 +3,7 @@ export default [
      match: {
        graph: {
          type: "uri",
-          value: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+          value: "http://mu.semte.ch/graphs/organisatieportaal"
        }
      },
      callback: {
--- a/config/migrations/2022212411511111121112333224-bestuur-admidm.sparql
+++ b/config/migrations/2022212411511111121112333224-bestuur-admidm.sparql
@@ -0,0 +1,13 @@
+PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX dcterms: <http://purl.org/dc/terms/>
+PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+
+INSERT DATA {
+  GRAPH <http://mu.semte.ch/graphs/contacthub/accounts> {
+    <http://data.lblod.info/id/bestuurseenheden/141d9d6b-54af-4d17-b313-8d1c30bc3f5b> a besluit:Bestuurseenheid ;
+       mu:uuid "141d9d6b-54af-4d17-b313-8d1c30bc3f5b" ;
+       skos:prefLabel "Agentschap Binnenlands Bestuur" ;
+       dcterms:identifier "OVO001835" .
+  }
+}
--- a/config/migrations/2022212411511111121112333225-clear-mock-data.sparql
+++ b/config/migrations/2022212411511111121112333225-clear-mock-data.sparql
@@ -0,0 +1,3 @@
+
+CLEAR GRAPH  <http://mu.semte.ch/graphs/public> ;
+CLEAR GRAPH <http://mu.semte.ch/graphs/organizations/141d9d6b-54af-4d17-b313-8d1c30bc3f5b>;
--- a/config/migrations/2022212411511111121112333226-mock-user-roles.sparql
+++ b/config/migrations/2022212411511111121112333226-mock-user-roles.sparql
@@ -0,0 +1,83 @@
+PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX dcterms: <http://purl.org/dc/terms/>
+PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX ext:<http://mu.semte.ch/vocabularies/ext/>
+ INSERT DATA {
+    GRAPH  <http://mu.semte.ch/graphs/public> {
+       <http://data.lblod.info/id/bestuurseenheden/141d9d6b-54af-4d17-b313-8d1c30bc3f5b> a besluit:Bestuurseenheid ;
+          mu:uuid "141d9d6b-54af-4d17-b313-8d1c30bc3f5b" ;
+          skos:prefLabel "Agentschap Binnenlands Bestuur" ;
+          dcterms:identifier "OVO001835" .
+
+      <http://data.lblod.info/id/persoon/d39fe09e-d339-4e43-8680-dbbcfb3d3470> a foaf:Person ;
+          mu:uuid "d39fe09e-d339-4e43-8680-dbbcfb3d3470" ;
+          foaf:firstName "Josephine" ;
+          foaf:familyName "Lezer" ;
+          foaf:member <http://data.lblod.info/id/bestuurseenheden/141d9d6b-54af-4d17-b313-8d1c30bc3f5b> ;
+          foaf:account <http://data.lblod.info/id/account/3a91ff60-07c1-4136-ac5e-55cf401e0989> .
+      <http://data.lblod.info/id/account/3a91ff60-07c1-4136-ac5e-55cf401e0989> a foaf:OnlineAccount ;
+          mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0989" ;
+          foaf:accountServiceHomepage <https://github.com/lblod/mock-login-service>;
+          ext:sessionRole "ABBOrganisatiePortaalGebruiker-lezer".
+
+      <http://data.lblod.info/id/persoon/d39fe09e-d339-4e43-8680-dbbcfb3d3471> a foaf:Person ;
+          mu:uuid "d39fe09e-d339-4e43-8680-dbbcfb3d3471" ;
+          foaf:firstName "Josephine" ;
+          foaf:familyName "Editeerder" ;
+          foaf:member <http://data.lblod.info/id/bestuurseenheden/141d9d6b-54af-4d17-b313-8d1c30bc3f5b> ;
+          foaf:account <http://data.lblod.info/id/account/3a91ff60-07c1-4136-ac5e-55cf401e0957> .
+      <http://data.lblod.info/id/account/3a91ff60-07c1-4136-ac5e-55cf401e0957> a foaf:OnlineAccount ;
+          mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0957" ;
+          foaf:accountServiceHomepage <https://github.com/lblod/mock-login-service>;
+          ext:sessionRole "ABBOrganisatiePortaalGebruiker-editeerder".
+          
+      <http://data.lblod.info/id/persoon/d39fe09e-d339-4e43-8680-dbbcfb3d3472> a foaf:Person ;
+          mu:uuid "d39fe09e-d339-4e43-8680-dbbcfb3d3472" ;
+          foaf:firstName "Josephine" ;
+          foaf:familyName "Beheerder" ;
+          foaf:member <http://data.lblod.info/id/bestuurseenheden/141d9d6b-54af-4d17-b313-8d1c30bc3f5b> ;
+          foaf:account <http://data.lblod.info/id/account/3a91ff60-07c1-4136-ac5e-55cf401e0958> .
+      <http://data.lblod.info/id/account/3a91ff60-07c1-4136-ac5e-55cf401e0958> a foaf:OnlineAccount ;
+          mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0958" ;
+          foaf:accountServiceHomepage <https://github.com/lblod/mock-login-service>;
+          ext:sessionRole "ABBOrganisatiePortaalGebruiker-beheerder".
+    }
+
+    GRAPH <http://mu.semte.ch/graphs/organizations/141d9d6b-54af-4d17-b313-8d1c30bc3f5b> {
+      
+      <http://data.lblod.info/id/persoon/d39fe09e-d339-4e43-8680-dbbcfb3d3470> a foaf:Person ;
+          mu:uuid "d39fe09e-d339-4e43-8680-dbbcfb3d3470" ;
+          foaf:firstName "Josephine" ;
+          foaf:familyName "Lezer" ;
+          foaf:member <http://data.lblod.info/id/bestuurseenheden/141d9d6b-54af-4d17-b313-8d1c30bc3f5b> ;
+          foaf:account <http://data.lblod.info/id/account/3a91ff60-07c1-4136-ac5e-55cf401e0989> .
+      <http://data.lblod.info/id/account/3a91ff60-07c1-4136-ac5e-55cf401e0989> a foaf:OnlineAccount ;
+          mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0989" ;
+          foaf:accountServiceHomepage <https://github.com/lblod/mock-login-service>;
+          ext:sessionRole "ABBOrganisatiePortaalGebruiker-lezer".
+
+      <http://data.lblod.info/id/persoon/d39fe09e-d339-4e43-8680-dbbcfb3d3471> a foaf:Person ;
+          mu:uuid "d39fe09e-d339-4e43-8680-dbbcfb3d3471" ;
+          foaf:firstName "Josephine" ;
+          foaf:familyName "Editeerder" ;
+          foaf:member <http://data.lblod.info/id/bestuurseenheden/141d9d6b-54af-4d17-b313-8d1c30bc3f5b> ;
+          foaf:account <http://data.lblod.info/id/account/3a91ff60-07c1-4136-ac5e-55cf401e0957> .
+      <http://data.lblod.info/id/account/3a91ff60-07c1-4136-ac5e-55cf401e0957> a foaf:OnlineAccount ;
+          mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0957" ;
+          foaf:accountServiceHomepage <https://github.com/lblod/mock-login-service>;
+          ext:sessionRole "ABBOrganisatiePortaalGebruiker-editeerder".
+          
+      <http://data.lblod.info/id/persoon/d39fe09e-d339-4e43-8680-dbbcfb3d3472> a foaf:Person ;
+          mu:uuid "d39fe09e-d339-4e43-8680-dbbcfb3d3472" ;
+          foaf:firstName "Josephine" ;
+          foaf:familyName "Beheerder" ;
+          foaf:member <http://data.lblod.info/id/bestuurseenheden/141d9d6b-54af-4d17-b313-8d1c30bc3f5b> ;
+          foaf:account <http://data.lblod.info/id/account/3a91ff60-07c1-4136-ac5e-55cf401e0958> .
+      <http://data.lblod.info/id/account/3a91ff60-07c1-4136-ac5e-55cf401e0958> a foaf:OnlineAccount ;
+          mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0958" ;
+          foaf:accountServiceHomepage <https://github.com/lblod/mock-login-service>;
+          ext:sessionRole "ABBOrganisatiePortaalGebruiker-beheerder".
+    }
+  } 
--- a/config/migrations/2022212411511111121112333227-move-graph.sparql
+++ b/config/migrations/2022212411511111121112333227-move-graph.sparql
@@ -0,0 +1,8 @@
+PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX dcterms: <http://purl.org/dc/terms/>
+PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX ext:<http://mu.semte.ch/vocabularies/ext/>
+MOVE <http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin> TO 
+<http://mu.semte.ch/graphs/organisatieportaal>
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -111,17 +111,15 @@ services:
    restart: always
    logging: *default-logging
  login:
-    image: lblod/acmidm-login-service:0.9.3-organisatie_portaal
-    links:
-      - db:database
+    image: lblod/acmidm-login-service:0.9.2
    environment:
+      MU_APPLICATION_AUTH_USERID_CLAIM: "vo_id"
      MU_APPLICATION_GRAPH: "http://mu.semte.ch/graphs/contacthub/accounts"
+      MU_APPLICATION_AUTH_ROLE_CLAIM: "abb_organisatieportaal_rol_3d"
      MU_APPLICATION_AUTH_DISCOVERY_URL: "https://authenticatie-ti.vlaanderen.be/op"
      MU_APPLICATION_AUTH_CLIENT_ID: "677af572-2e2f-4e61-ad38-036723bb314c"
      MU_APPLICATION_AUTH_REDIRECT_URI: "https://organisaties.abb.lblod.info/authorization/callback"
      MU_APPLICATION_AUTH_CLIENT_SECRET: "secret"
-    links:
-      - db:database
    labels:
      - "logging=true"
    restart: always
@@ -217,7 +215,7 @@ services:
  delta-producer-bg-jobs-initiator-administrative-units:
    image: lblod/delta-producer-background-jobs-initiator:0.3.1
    environment:
-      JOBS_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+      JOBS_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal"
      DUMP_FILE_CREATION_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/administrative-units'
      INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/administrative-units'
      HEALING_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/administrative-units'
@@ -234,7 +232,7 @@ services:
    image: lblod/delta-producer-publication-graph-maintainer:0.7.0
    environment:
      MAX_BODY_SIZE: "50mb"
-      JOBS_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+      JOBS_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal"
      RELATIVE_FILE_PATH: "deltas/administrative-units"
      PUBLICATION_GRAPH: 'http://redpencil.data.gift/id/deltas/producer/administrative-units'
      HEALING_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/administrative-units'
@@ -255,7 +253,7 @@ services:
    image: lblod/delta-producer-json-diff-file-publisher:0.2.3
    environment:
      MAX_BODY_SIZE: "50mb"
-      ERROR_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+      ERROR_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal"
      RELATIVE_FILE_PATH: "deltas/administrative-units"
      PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/administrative-units"
      PUBLICATION_GRAPH: 'http://redpencil.data.gift/id/deltas/producer/administrative-units'
@@ -278,7 +276,7 @@ services:
  delta-producer-bg-jobs-initiator-organizations:
    image: lblod/delta-producer-background-jobs-initiator:0.3.1
    environment:
-      JOBS_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+      JOBS_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal"
      DUMP_FILE_CREATION_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/organizations'
      INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations'
      HEALING_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations'
@@ -295,7 +293,7 @@ services:
    image: lblod/delta-producer-publication-graph-maintainer:0.7.0
    environment:
      MAX_BODY_SIZE: "50mb"
-      JOBS_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+      JOBS_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal"
      RELATIVE_FILE_PATH: "deltas/organizations"
      PUBLICATION_GRAPH: 'http://redpencil.data.gift/id/deltas/producer/organizations'
      HEALING_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations'
@@ -316,7 +314,7 @@ services:
    image: lblod/delta-producer-json-diff-file-publisher:0.2.3
    environment:
      MAX_BODY_SIZE: "50mb"
-      ERROR_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin"
+      ERROR_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal"
      RELATIVE_FILE_PATH: "deltas/organizations"
      PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/organizations"
      PUBLICATION_GRAPH: 'http://redpencil.data.gift/id/deltas/producer/organizations'