Merge pull request #27 from itk-dev/feature/oidc-cleanup

Used oidc-provider-mock docker image

Author: rimi-itk

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* [PR-27](https://github.com/itk-dev/rpa-process-overview/pull/27)
+  Added pre-defined users in OIDC mock
 * [PR-24](https://github.com/itk-dev/rpa-process-overview/pull/24)
   Remove search from url
 * [PR-25](https://github.com/itk-dev/rpa-process-overview/pull/25)

README.md

@@ -102,13 +102,7 @@ For local testing of OIDC login, we use [OpenID Provider Mock](https://github.co
 [`docker-compose.oidc.yml`](docker-compose.oidc.yml)) and the mock is running on
 <https://idp.rpa-process-overview.local.itkdev.dk/>.
 
-To load users into the mock, run
-
-``` shell
-task oidc:mock:load-users
-```
-
-This will create the following users:
+The following users are defined in the mock (cf. [`docker-compose.oidc.yml`](docker-compose.oidc.yml)):
 
 | Username (sub)   | Roles            |
 |------------------|------------------|

Taskfile.yml

@@ -134,9 +134,3 @@ tasks:
     vars:
       BUILD_DIR: widgets/static/dist/
       PUBLIC_DIR: public/widgets
-
-  oidc:mock:load-users:
-    cmds:
-      - |-
-        curl "http://$(task --silent compose -- port oidc-idp 80)/users/user" --request PUT --header 'content-type: application/json' --data '{"email": "[email protected]", "roles": ["user"]}'
-        curl "http://$(task --silent compose -- port oidc-idp 80)/users/overview-manager" --request PUT --header 'content-type: application/json' --data '{"email": "overview-manager", "roles": ["overview-manager"]}'

docker-compose.oidc.yml

@@ -4,14 +4,17 @@ services:
       - ${DOCKER_OIDC_DISABLE:-}
     # Let this container be accessible both internally and externally on the same domain.
     container_name: idp.${COMPOSE_DOMAIN}
-    build:
-      # https://github.com/geigerzaehler/oidc-provider-mock
-      dockerfile_inline: |
-        FROM python:3.13-slim-trixie
-        RUN pip install --root-user-action=ignore pipx
-
-        # https://github.com/geigerzaehler/oidc-provider-mock/blob/main/src/oidc_provider_mock/__main__.py
-        ENTRYPOINT ["/usr/local/bin/pipx", "run", "oidc-provider-mock", "--host", "0.0.0.0", "--port", "80"]
+    image: ghcr.io/geigerzaehler/oidc-provider-mock:latest
+    # https://docs.docker.com/reference/compose-file/services/#command
+    command:
+      [
+        "--port",
+        "80",
+        "--user-claims",
+        '{"sub": "user", "email": "[email protected]", "roles": ["user"]}',
+        "--user-claims",
+        '{"sub": "overview-manager", "email": "[email protected]", "roles": ["overview-manager"]}',
+      ]
     ports:
       - "80"
     networks:
@@ -21,4 +24,3 @@ services:
       - "traefik.enable=true"
       - "traefik.docker.network=frontend"
       - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-idp.rule=Host(`idp.${COMPOSE_DOMAIN}`)"
-      # - "traefik.http.services.${COMPOSE_PROJECT_NAME}-idp.loadbalancer.server.port=9400"