Skip to content
Snippets Groups Projects
Commit 29fa400d authored by Reiter, Christoph's avatar Reiter, Christoph :snake:
Browse files

Update all bundles 

The main change is that the core bundle no longer contains tugraz
specifics, so we can remove the corresponding config.

This also pins api-platform/core since the new 2.6 release has various
breaking changes we haven't worked around yet.
parent 931b0732
Branches
Tags
No related merge requests found
Pipeline #16883 passed
Stage: test
Show whitespace changes
Inline Side-by-side
.env
+ 5
− 18
View file @ 29fa400d
...@@ -15,32 +15,19 @@ ...@@ -15,32 +15,19 @@
APP_ENV=dev APP_ENV=dev
# LDAP
LDAP_HOST=directory.tugraz.at
LDAP_USER=cn=ldap_middleware,o=tug
LDAP_BASE_DN=o=tug
LDAP_PASS=
# KEYCLOAK # KEYCLOAK
KEYCLOAK_SERVER_URL=https://auth-dev.tugraz.at/auth KEYCLOAK_SERVER_URL=https://auth-dev.tugraz.at/auth
KEYCLOAK_REALM=tugraz KEYCLOAK_REALM=tugraz
KEYCLOAK_CLIENT_ID=auth-dev-mw-dev
KEYCLOAK_FRONTEND_CLIENT_ID=auth-dev-mw-frontend-local KEYCLOAK_FRONTEND_CLIENT_ID=auth-dev-mw-frontend-local
KEYCLOAK_CLIENT_SECRET=
# If not empty gets used to check if the access token got issued # If not empty gets used to check if the access token got issued
# for this audience ('api-gw' for example) # for this audience ('api-gw' for example)
KEYCLOAK_AUDIENCE=api-gw KEYCLOAK_AUDIENCE=api-gw
# Set to true to enable local access token validation, non-local
# Set to true to enable local access token validation # requires a client and secret for remote validation
KEYCLOAK_LOCAL_VALIDATION=true KEYCLOAK_LOCAL_VALIDATION=true
KEYCLOAK_CLIENT_ID=
KEYCLOAK_CLIENT_SECRET=
# Deployment related # Deployment related
APP_BUILDINFO=unknown # a git hash or something identifying the build APP_BUILDINFO=unknown # a git hash or something identifying the build
APP_BUILDINFO_URL='#' APP_BUILDINFO_URL='#'
\ No newline at end of file
# Disable the webserver bundle (avoids deprecation warnings). Use docker instead.
DISABLE_DEV_SERVER=true
# XXX: Remove
TU_ONLINE_ORGANIZATION_API_URL=https://online.tugraz.at/tug_onlinej/ws/webservice_v1.0/cdm/organization/xml
KNOWLEDGE_BASE_API_TOKEN=
\ No newline at end of file
composer.json
+ 1
− 0
View file @ 29fa400d
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"require": { "require": {
"php": "^7.3", "php": "^7.3",
"api-platform/core": "<2.6",
"dbp/api-core-bundle": "@dev", "dbp/api-core-bundle": "@dev",
"dbp/api-starter-bundle": "@dev", "dbp/api-starter-bundle": "@dev",
"symfony/apache-pack": "^1.0", "symfony/apache-pack": "^1.0",
......
composer.lock
+ 57
− 57
View file @ 29fa400d
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "f316125123858eef6044de806b7dfde5", "content-hash": "73e463d077be545cbe07ef6decd7824c",
"packages": [ "packages": [
{ {
"name": "adldap2/adldap2", "name": "adldap2/adldap2",
...@@ -289,12 +289,13 @@ ...@@ -289,12 +289,13 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "git@gitlab.tugraz.at:dbp/middleware/dbp-api/api-core-bundle.git", "url": "git@gitlab.tugraz.at:dbp/middleware/dbp-api/api-core-bundle.git",
"reference": "ad48fd1e1c2fbe838c91b8f905ede37cb884a9f4" "reference": "531f0d230f2bd263c3129c1a227cfe078bd7e3f7"
}, },
"require": { "require": {
"adldap2/adldap2": "^10.0", "adldap2/adldap2": "^10.0",
"api-platform/core": "^2.5", "api-platform/core": "^2.5",
"doctrine/annotations": "^1.0", "doctrine/annotations": "^1.0",
"ext-simplexml": "*",
"guzzlehttp/guzzle": "^7.0", "guzzlehttp/guzzle": "^7.0",
"kevinrob/guzzle-cache-middleware": "^3.3", "kevinrob/guzzle-cache-middleware": "^3.3",
"league/uri": "^6.3", "league/uri": "^6.3",
...@@ -317,7 +318,6 @@ ...@@ -317,7 +318,6 @@
}, },
"require-dev": { "require-dev": {
"friendsofphp/php-cs-fixer": "^2.17", "friendsofphp/php-cs-fixer": "^2.17",
"mockery/mockery": "^1.2",
"phpstan/phpstan": "^0.12.33", "phpstan/phpstan": "^0.12.33",
"phpstan/phpstan-phpunit": "^0.12.13", "phpstan/phpstan-phpunit": "^0.12.13",
"symfony/browser-kit": "^4.4", "symfony/browser-kit": "^4.4",
...@@ -367,7 +367,7 @@ ...@@ -367,7 +367,7 @@
"license": [ "license": [
"AGPL-3.0-or-later" "AGPL-3.0-or-later"
], ],
"time": "2021-02-02T12:48:40+00:00" "time": "2021-02-15T09:58:39+00:00"
}, },
{ {
"name": "dbp/api-starter-bundle", "name": "dbp/api-starter-bundle",
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "git@gitlab.tugraz.at:dbp/middleware/dbp-api/api-starter-bundle.git", "url": "git@gitlab.tugraz.at:dbp/middleware/dbp-api/api-starter-bundle.git",
"reference": "5daf9c1ef880767ea207bdeaec46ae19c4f5db7a" "reference": "20ea844d6721138376968ad878e86e800c580a57"
}, },
"require": { "require": {
"api-platform/core": "^2.5", "api-platform/core": "^2.5",
...@@ -432,7 +432,7 @@ ...@@ -432,7 +432,7 @@
"license": [ "license": [
"AGPL-3.0-or-later" "AGPL-3.0-or-later"
], ],
"time": "2021-02-01T09:35:50+00:00" "time": "2021-02-15T10:15:13+00:00"
}, },
{ {
"name": "doctrine/annotations", "name": "doctrine/annotations",
...@@ -761,16 +761,16 @@ ...@@ -761,16 +761,16 @@
}, },
{ {
"name": "fig/link-util", "name": "fig/link-util",
"version": "1.1.1", "version": "1.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/link-util.git", "url": "https://github.com/php-fig/link-util.git",
"reference": "c038ee75ca13663ddc2d1f185fe6f7533c00832a" "reference": "5d7b8d04ed3393b4b59968ca1e906fb7186d81e8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/link-util/zipball/c038ee75ca13663ddc2d1f185fe6f7533c00832a", "url": "https://api.github.com/repos/php-fig/link-util/zipball/5d7b8d04ed3393b4b59968ca1e906fb7186d81e8",
"reference": "c038ee75ca13663ddc2d1f185fe6f7533c00832a", "reference": "5d7b8d04ed3393b4b59968ca1e906fb7186d81e8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -802,7 +802,7 @@ ...@@ -802,7 +802,7 @@
"authors": [ "authors": [
{ {
"name": "PHP-FIG", "name": "PHP-FIG",
"homepage": "http://www.php-fig.org/" "homepage": "https://www.php-fig.org/"
} }
], ],
"description": "Common utility implementations for HTTP links", "description": "Common utility implementations for HTTP links",
...@@ -816,9 +816,9 @@ ...@@ -816,9 +816,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/php-fig/link-util/issues", "issues": "https://github.com/php-fig/link-util/issues",
"source": "https://github.com/php-fig/link-util/tree/1.1.1" "source": "https://github.com/php-fig/link-util/tree/1.1.2"
}, },
"time": "2020-04-27T06:40:36+00:00" "time": "2021-02-03T23:36:04+00:00"
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
...@@ -1054,7 +1054,7 @@ ...@@ -1054,7 +1054,7 @@
}, },
{ {
"name": "illuminate/contracts", "name": "illuminate/contracts",
"version": "v8.25.0", "version": "v8.27.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/contracts.git", "url": "https://github.com/illuminate/contracts.git",
...@@ -6031,16 +6031,16 @@ ...@@ -6031,16 +6031,16 @@
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
"version": "v3.2.1", "version": "v3.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/twigphp/Twig.git", "url": "https://github.com/twigphp/Twig.git",
"reference": "f795ca686d38530045859b0350b5352f7d63447d" "reference": "1f3b7e2c06cc05d42936a8ad508ff1db7975cdc5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/f795ca686d38530045859b0350b5352f7d63447d", "url": "https://api.github.com/repos/twigphp/Twig/zipball/1f3b7e2c06cc05d42936a8ad508ff1db7975cdc5",
"reference": "f795ca686d38530045859b0350b5352f7d63447d", "reference": "1f3b7e2c06cc05d42936a8ad508ff1db7975cdc5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -6055,7 +6055,7 @@ ...@@ -6055,7 +6055,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.2-dev" "dev-master": "3.3-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -6091,7 +6091,7 @@ ...@@ -6091,7 +6091,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/twigphp/Twig/issues", "issues": "https://github.com/twigphp/Twig/issues",
"source": "https://github.com/twigphp/Twig/tree/v3.2.1" "source": "https://github.com/twigphp/Twig/tree/v3.3.0"
}, },
"funding": [ "funding": [
{ {
...@@ -6103,20 +6103,20 @@ ...@@ -6103,20 +6103,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-01-05T15:40:36+00:00" "time": "2021-02-08T09:54:36+00:00"
}, },
{ {
"name": "web-token/jwt-checker", "name": "web-token/jwt-checker",
"version": "v2.2.7", "version": "v2.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/web-token/jwt-checker.git", "url": "https://github.com/web-token/jwt-checker.git",
"reference": "d2026ff6f9cc0d74107c1bddfe730b84a0f14cf7" "reference": "568c801ebf4209da3747e5df1b0c0aef443aa5b9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/web-token/jwt-checker/zipball/d2026ff6f9cc0d74107c1bddfe730b84a0f14cf7", "url": "https://api.github.com/repos/web-token/jwt-checker/zipball/568c801ebf4209da3747e5df1b0c0aef443aa5b9",
"reference": "d2026ff6f9cc0d74107c1bddfe730b84a0f14cf7", "reference": "568c801ebf4209da3747e5df1b0c0aef443aa5b9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -6163,7 +6163,7 @@ ...@@ -6163,7 +6163,7 @@
"symfony" "symfony"
], ],
"support": { "support": {
"source": "https://github.com/web-token/jwt-checker/tree/v2.2.7" "source": "https://github.com/web-token/jwt-checker/tree/v2.2.8"
}, },
"funding": [ "funding": [
{ {
...@@ -6171,20 +6171,20 @@ ...@@ -6171,20 +6171,20 @@
"type": "patreon" "type": "patreon"
} }
], ],
"time": "2020-12-13T16:35:27+00:00" "time": "2021-01-21T19:18:03+00:00"
}, },
{ {
"name": "web-token/jwt-core", "name": "web-token/jwt-core",
"version": "v2.2.7", "version": "v2.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/web-token/jwt-core.git", "url": "https://github.com/web-token/jwt-core.git",
"reference": "e68c4940da62682426e78eafb1e3a3ba4c7cbabe" "reference": "1365422ff1f147d2d4c5cb4473c28c9996fca84b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/web-token/jwt-core/zipball/e68c4940da62682426e78eafb1e3a3ba4c7cbabe", "url": "https://api.github.com/repos/web-token/jwt-core/zipball/1365422ff1f147d2d4c5cb4473c28c9996fca84b",
"reference": "e68c4940da62682426e78eafb1e3a3ba4c7cbabe", "reference": "1365422ff1f147d2d4c5cb4473c28c9996fca84b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -6239,7 +6239,7 @@ ...@@ -6239,7 +6239,7 @@
"symfony" "symfony"
], ],
"support": { "support": {
"source": "https://github.com/web-token/jwt-core/tree/v2.2.7" "source": "https://github.com/web-token/jwt-core/tree/v2.2.8"
}, },
"funding": [ "funding": [
{ {
...@@ -6247,20 +6247,20 @@ ...@@ -6247,20 +6247,20 @@
"type": "patreon" "type": "patreon"
} }
], ],
"time": "2020-12-13T16:35:27+00:00" "time": "2021-01-21T19:18:03+00:00"
}, },
{ {
"name": "web-token/jwt-easy", "name": "web-token/jwt-easy",
"version": "v2.2.7", "version": "v2.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/web-token/jwt-easy.git", "url": "https://github.com/web-token/jwt-easy.git",
"reference": "e4b659ef6749bc1dca74c7c4118c8746ed199731" "reference": "b4d1a4581a796244fdd69694548766403daeca97"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/web-token/jwt-easy/zipball/e4b659ef6749bc1dca74c7c4118c8746ed199731", "url": "https://api.github.com/repos/web-token/jwt-easy/zipball/b4d1a4581a796244fdd69694548766403daeca97",
"reference": "e4b659ef6749bc1dca74c7c4118c8746ed199731", "reference": "b4d1a4581a796244fdd69694548766403daeca97",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -6324,7 +6324,7 @@ ...@@ -6324,7 +6324,7 @@
"symfony" "symfony"
], ],
"support": { "support": {
"source": "https://github.com/web-token/jwt-easy/tree/v2.2.7" "source": "https://github.com/web-token/jwt-easy/tree/v2.2.8"
}, },
"funding": [ "funding": [
{ {
...@@ -6332,20 +6332,20 @@ ...@@ -6332,20 +6332,20 @@
"type": "patreon" "type": "patreon"
} }
], ],
"time": "2020-12-13T16:35:27+00:00" "time": "2021-01-21T19:18:03+00:00"
}, },
{ {
"name": "web-token/jwt-encryption", "name": "web-token/jwt-encryption",
"version": "v2.2.7", "version": "v2.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/web-token/jwt-encryption.git", "url": "https://github.com/web-token/jwt-encryption.git",
"reference": "93dc13ea5332d857f3d72307a3ebc8e263a06b18" "reference": "c244eeec3a0f817f8ce5c3d1858fa05e0366f650"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/web-token/jwt-encryption/zipball/93dc13ea5332d857f3d72307a3ebc8e263a06b18", "url": "https://api.github.com/repos/web-token/jwt-encryption/zipball/c244eeec3a0f817f8ce5c3d1858fa05e0366f650",
"reference": "93dc13ea5332d857f3d72307a3ebc8e263a06b18", "reference": "c244eeec3a0f817f8ce5c3d1858fa05e0366f650",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -6403,7 +6403,7 @@ ...@@ -6403,7 +6403,7 @@
"symfony" "symfony"
], ],
"support": { "support": {
"source": "https://github.com/web-token/jwt-encryption/tree/v2.2.7" "source": "https://github.com/web-token/jwt-encryption/tree/v2.2.8"
}, },
"funding": [ "funding": [
{ {
...@@ -6411,20 +6411,20 @@ ...@@ -6411,20 +6411,20 @@
"type": "patreon" "type": "patreon"
} }
], ],
"time": "2020-12-13T16:35:27+00:00" "time": "2021-01-21T19:18:03+00:00"
}, },
{ {
"name": "web-token/jwt-signature", "name": "web-token/jwt-signature",
"version": "v2.2.7", "version": "v2.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/web-token/jwt-signature.git", "url": "https://github.com/web-token/jwt-signature.git",
"reference": "cad4f3c51d9e3537c5f45f26ae2c61d08fd5ffd2" "reference": "de624b8384b6c1bcbd699de95656181ce255fe39"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/web-token/jwt-signature/zipball/cad4f3c51d9e3537c5f45f26ae2c61d08fd5ffd2", "url": "https://api.github.com/repos/web-token/jwt-signature/zipball/de624b8384b6c1bcbd699de95656181ce255fe39",
"reference": "cad4f3c51d9e3537c5f45f26ae2c61d08fd5ffd2", "reference": "de624b8384b6c1bcbd699de95656181ce255fe39",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -6479,7 +6479,7 @@ ...@@ -6479,7 +6479,7 @@
"symfony" "symfony"
], ],
"support": { "support": {
"source": "https://github.com/web-token/jwt-signature/tree/v2.2.7" "source": "https://github.com/web-token/jwt-signature/tree/v2.2.8"
}, },
"funding": [ "funding": [
{ {
...@@ -6487,20 +6487,20 @@ ...@@ -6487,20 +6487,20 @@
"type": "patreon" "type": "patreon"
} }
], ],
"time": "2020-12-13T16:35:27+00:00" "time": "2021-01-21T19:18:03+00:00"
}, },
{ {
"name": "web-token/jwt-signature-algorithm-rsa", "name": "web-token/jwt-signature-algorithm-rsa",
"version": "v2.2.7", "version": "v2.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/web-token/jwt-signature-algorithm-rsa.git", "url": "https://github.com/web-token/jwt-signature-algorithm-rsa.git",
"reference": "96588136dd01cf842b0c7107fc63aebc8332d97f" "reference": "513ad90eb5ef1886ff176727a769bda4618141b0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-rsa/zipball/96588136dd01cf842b0c7107fc63aebc8332d97f", "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-rsa/zipball/513ad90eb5ef1886ff176727a769bda4618141b0",
"reference": "96588136dd01cf842b0c7107fc63aebc8332d97f", "reference": "513ad90eb5ef1886ff176727a769bda4618141b0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -6553,7 +6553,7 @@ ...@@ -6553,7 +6553,7 @@
"symfony" "symfony"
], ],
"support": { "support": {
"source": "https://github.com/web-token/jwt-signature-algorithm-rsa/tree/v2.2.7" "source": "https://github.com/web-token/jwt-signature-algorithm-rsa/tree/v2.2.8"
}, },
"funding": [ "funding": [
{ {
...@@ -6561,7 +6561,7 @@ ...@@ -6561,7 +6561,7 @@
"type": "patreon" "type": "patreon"
} }
], ],
"time": "2020-12-13T16:35:27+00:00" "time": "2021-01-21T19:18:03+00:00"
}, },
{ {
"name": "webmozart/assert", "name": "webmozart/assert",
......
config/packages/dbp_core.yaml
+ 0
− 8
View file @ 29fa400d
...@@ -6,14 +6,6 @@ dbp_core: ...@@ -6,14 +6,6 @@ dbp_core:
client_secret: '%env(KEYCLOAK_CLIENT_SECRET)%' client_secret: '%env(KEYCLOAK_CLIENT_SECRET)%'
audience: '%env(KEYCLOAK_AUDIENCE)%' audience: '%env(KEYCLOAK_AUDIENCE)%'
local_validation: '%env(bool:KEYCLOAK_LOCAL_VALIDATION)%' local_validation: '%env(bool:KEYCLOAK_LOCAL_VALIDATION)%'
ldap:
host: '%env(LDAP_HOST)%'
base_dn: '%env(LDAP_BASE_DN)%'
username: '%env(LDAP_USER)%'
password: '%env(LDAP_PASS)%'
campus_online:
api_url_organization: '%env(TU_ONLINE_ORGANIZATION_API_URL)%'
api_token: '%env(KNOWLEDGE_BASE_API_TOKEN)%'
api_docs: api_docs:
keycloak_client_id: '%env(KEYCLOAK_FRONTEND_CLIENT_ID)%' keycloak_client_id: '%env(KEYCLOAK_FRONTEND_CLIENT_ID)%'
build_info: '%env(APP_BUILDINFO)%' build_info: '%env(APP_BUILDINFO)%'
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment