diff --git a/config/authorization/config.ex b/config/authorization/config.ex index 4719e40..3e699fb 100644 --- a/config/authorization/config.ex +++ b/config/authorization/config.ex @@ -8,8 +8,9 @@ alias Acl.GroupSpec.GraphCleanup, as: GraphCleanup defmodule Acl.UserGroups.Config do @protected_resource_type [ - "http://www.w3.org/ns/org#Organization", + "http://www.w3.org/ns/org#Organization", "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", + "http://xmlns.com/foaf/0.1/OnlineAccount", "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst", "http://data.vlaanderen.be/ns/besluit#Bestuursorgaan", "http://data.lblod.info/vocabularies/erediensten/RolBedienaar", @@ -24,12 +25,13 @@ defmodule Acl.UserGroups.Config do "http://data.lblod.info/vocabularies/erediensten/VerbondenJuridischeStructuren", "http://www.w3.org/ns/prov#Location", "http://www.w3.org/ns/org#Site", - "http://www.w3.org/ns/locn#Address", + "http://www.w3.org/ns/locn#Address", + "http://xmlns.com/foaf/0.1/Person", "http://www.w3.org/ns/person#Person", "http://data.vlaanderen.be/ns/mandaat#Mandaat", "http://data.vlaanderen.be/ns/mandaat#Mandataris", "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris", - "http://schema.org/ContactPoint", + "http://schema.org/ContactPoint", "http://data.lblod.info/vocabularies/leidinggevenden/Bestuursfunctie", "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst", "http://data.lblod.info/vocabularies/erediensten/RepresentatiefOrgaan", @@ -112,7 +114,7 @@ defmodule Acl.UserGroups.Config do useage: [:read], access: %AlwaysAccessible{}, graphs: [ %GraphSpec{ - graph: "http://mu.semte.ch/graphs/public", + graph: "http://mu.semte.ch/graphs/public", # mock login only constraint: %ResourceConstraint{ resource_types: [ "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", diff --git a/config/migrations/202109241151111112111233323-remove-acmidm-account-from-public.sparql b/config/migrations/202109241151111112111233323-remove-acmidm-account-from-public.sparql new file mode 100644 index 0000000..b1c6d7e --- /dev/null +++ b/config/migrations/202109241151111112111233323-remove-acmidm-account-from-public.sparql @@ -0,0 +1,32 @@ +PREFIX mu: +PREFIX skos: +PREFIX dcterms: +PREFIX besluit: +PREFIX foaf: +PREFIX ext: + DELETE { + GRAPH { + ?s ?p ?o + } + } INSERT { + GRAPH { + a besluit:Bestuurseenheid ; + mu:uuid "141d9d6b-54af-4d17-b313-8d1c30bc3f5b" ; + skos:prefLabel "Agentschap Binnenlands Bestuur" ; + dcterms:identifier "OVO001835" . + a foaf:Person ; + mu:uuid "d39fe09e-d339-4e43-8680-dbbcfb3d3470" ; + foaf:firstName "Josephine" ; + foaf:familyName "Putseys" ; + foaf:member ; + foaf:account . + a foaf:OnlineAccount ; + mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0956" ; + foaf:accountServiceHomepage ; + ext:sessionRole "ChAdmin". + } + } WHERE { + GRAPH { + ?s ?p ?o + } + } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 1d70be0..06b83b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -98,14 +98,15 @@ services: restart: always logging: *default-logging login: - image: lblod/acmidm-login-service:0.9.2-organisatie_portaal + image: lblod/acmidm-login-service:v0.9.3-organisatie_portaal links: - db:database environment: + MU_APPLICATION_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" 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: "" + MU_APPLICATION_AUTH_CLIENT_SECRET: "secret" labels: - "logging=true" restart: always