diff --git a/docker-compose.yaml b/docker-compose.yaml index 4e00b37..2132e66 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -25,7 +25,6 @@ services: - uploaded_data:/opt/invenio/var/instance/data - archived_data:/opt/invenio/var/instance/archive - static_files:/opt/invenio/var/instance/static - - ./invenio_assets:/opt/invenio/var/instance/static/custom_assets - ./invenio.cfg:/opt/invenio/var/instance/invenio.cfg environment: - INVENIO_THEME_LOGO @@ -182,45 +181,12 @@ services: - development ports: - "4180:4180" - environment: - - OAUTH2_PROXY_PROVIDER=oidc - - OAUTH2_PROXY_OIDC_ISSUER_URL=http://saml-idp:8080/simplesaml/saml2/idp - - OAUTH2_PROXY_CLIENT_ID=test-client - - OAUTH2_PROXY_CLIENT_SECRET=test-secret - - OAUTH2_PROXY_COOKIE_SECRET - - OAUTH2_PROXY_EMAIL_DOMAINS=* - - OAUTH2_PROXY_UPSTREAM=http://caddy:80 - - OAUTH2_PROXY_HTTP_ADDRESS=0.0.0.0:4180 - - OAUTH2_PROXY_REDIRECT_URL=http://localhost:4180/oauth2/callback - - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON=false - - OAUTH2_PROXY_INSECURE_OIDC_ALLOW_UNVERIFIED_EMAIL=true - - OAUTH2_PROXY_PASS_ACCESS_TOKEN=true - - OAUTH2_PROXY_PASS_USER_HEADERS=true - - OAUTH2_PROXY_SET_XAUTHREQUEST=true - - OAUTH2_PROXY_SKIP_AUTH_REGEX=^/health$ depends_on: - mock-oauth2: - condition: service_healthy caddy: condition: service_started networks: - invenio-network - # Mock OAuth2 server for development - saml-idp: - image: kristophjunge/test-saml-idp:latest - profiles: - - development - ports: - - "8090:8080" - environment: - - SIMPLESAMLPHP_SP_ENTITY_ID=http://localhost:4180 - - SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE=http://localhost:4180/oauth2/callback - volumes: - - ./saml/authsources.php:/var/www/simplesamlphp/config/authsources.php:ro - networks: - - invenio-network - networks: invenio-network: diff --git a/env/development/caddy/Caddyfile b/env/development/caddy/Caddyfile index e7e7be4..562f78c 100644 --- a/env/development/caddy/Caddyfile +++ b/env/development/caddy/Caddyfile @@ -8,9 +8,6 @@ localhost { file_server } - handle_path /oauth* { - } - reverse_proxy invenio-rdm:5000 { header_down Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0" header_down Pragma "no-cache" diff --git a/invenio_assets/I-Form_logo.webp b/invenio_assets/I-Form_logo.webp deleted file mode 100644 index d8f961e..0000000 Binary files a/invenio_assets/I-Form_logo.webp and /dev/null differ diff --git a/saml/authsources.php b/saml/authsources.php deleted file mode 100644 index 248ccd9..0000000 --- a/saml/authsources.php +++ /dev/null @@ -1,15 +0,0 @@ - [ - 'core:AdminPassword', - ], - - 'example-userpass' => [ - 'exampleauth:UserPass', - 'test@example.com:password' => [ - 'uid' => ['test'], - 'email' => ['test@example.com'], - 'displayName' => ['Test User'], - ], - ], -];