diff --git a/.env b/.env
index d86fbb5715a95697867f65879cb2053b7c9bb0a3..5a8f1a6c5c46720e304c44cc85a7644272e15d48 100644
--- a/.env
+++ b/.env
@@ -15,32 +15,19 @@
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_SERVER_URL=https://auth-dev.tugraz.at/auth
KEYCLOAK_REALM=tugraz
-KEYCLOAK_CLIENT_ID=auth-dev-mw-dev
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
# for this audience ('api-gw' for example)
KEYCLOAK_AUDIENCE=api-gw
-
-# Set to true to enable local access token validation
+# Set to true to enable local access token validation, non-local
+# requires a client and secret for remote validation
KEYCLOAK_LOCAL_VALIDATION=true
+KEYCLOAK_CLIENT_ID=
+KEYCLOAK_CLIENT_SECRET=
# Deployment related
APP_BUILDINFO=unknown # a git hash or something identifying the build
-APP_BUILDINFO_URL='#'
-
-# 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
+APP_BUILDINFO_URL='#'
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 59052a00cfdfb8632cd4726a54200386f44c8ba9..fe19c9eae3fdb74336162072e5aca1c9cbedfdcc 100644
--- a/composer.json
+++ b/composer.json
@@ -3,6 +3,7 @@
"license": "AGPL-3.0-or-later",
"require": {
"php": "^7.3",
+ "api-platform/core": "<2.6",
"dbp/api-core-bundle": "@dev",
"dbp/api-starter-bundle": "@dev",
"symfony/apache-pack": "^1.0",
diff --git a/composer.lock b/composer.lock
index 3a0d3a6961a765c725a5111e13a15ba6d3c7db58..5c34eb896580bd8b6647c8e71351c376006d09d5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "f316125123858eef6044de806b7dfde5",
+ "content-hash": "73e463d077be545cbe07ef6decd7824c",
"packages": [
{
"name": "adldap2/adldap2",
@@ -289,12 +289,13 @@
"source": {
"type": "git",
"url": "git@gitlab.tugraz.at:dbp/middleware/dbp-api/api-core-bundle.git",
- "reference": "ad48fd1e1c2fbe838c91b8f905ede37cb884a9f4"
+ "reference": "531f0d230f2bd263c3129c1a227cfe078bd7e3f7"
},
"require": {
"adldap2/adldap2": "^10.0",
"api-platform/core": "^2.5",
"doctrine/annotations": "^1.0",
+ "ext-simplexml": "*",
"guzzlehttp/guzzle": "^7.0",
"kevinrob/guzzle-cache-middleware": "^3.3",
"league/uri": "^6.3",
@@ -317,7 +318,6 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.17",
- "mockery/mockery": "^1.2",
"phpstan/phpstan": "^0.12.33",
"phpstan/phpstan-phpunit": "^0.12.13",
"symfony/browser-kit": "^4.4",
@@ -367,7 +367,7 @@
"license": [
"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",
@@ -375,7 +375,7 @@
"source": {
"type": "git",
"url": "git@gitlab.tugraz.at:dbp/middleware/dbp-api/api-starter-bundle.git",
- "reference": "5daf9c1ef880767ea207bdeaec46ae19c4f5db7a"
+ "reference": "20ea844d6721138376968ad878e86e800c580a57"
},
"require": {
"api-platform/core": "^2.5",
@@ -432,7 +432,7 @@
"license": [
"AGPL-3.0-or-later"
],
- "time": "2021-02-01T09:35:50+00:00"
+ "time": "2021-02-15T10:15:13+00:00"
},
{
"name": "doctrine/annotations",
@@ -761,16 +761,16 @@
},
{
"name": "fig/link-util",
- "version": "1.1.1",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/link-util.git",
- "reference": "c038ee75ca13663ddc2d1f185fe6f7533c00832a"
+ "reference": "5d7b8d04ed3393b4b59968ca1e906fb7186d81e8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/link-util/zipball/c038ee75ca13663ddc2d1f185fe6f7533c00832a",
- "reference": "c038ee75ca13663ddc2d1f185fe6f7533c00832a",
+ "url": "https://api.github.com/repos/php-fig/link-util/zipball/5d7b8d04ed3393b4b59968ca1e906fb7186d81e8",
+ "reference": "5d7b8d04ed3393b4b59968ca1e906fb7186d81e8",
"shasum": ""
},
"require": {
@@ -802,7 +802,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common utility implementations for HTTP links",
@@ -816,9 +816,9 @@
],
"support": {
"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",
@@ -1054,7 +1054,7 @@
},
{
"name": "illuminate/contracts",
- "version": "v8.25.0",
+ "version": "v8.27.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
@@ -6031,16 +6031,16 @@
},
{
"name": "twig/twig",
- "version": "v3.2.1",
+ "version": "v3.3.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "f795ca686d38530045859b0350b5352f7d63447d"
+ "reference": "1f3b7e2c06cc05d42936a8ad508ff1db7975cdc5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/f795ca686d38530045859b0350b5352f7d63447d",
- "reference": "f795ca686d38530045859b0350b5352f7d63447d",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/1f3b7e2c06cc05d42936a8ad508ff1db7975cdc5",
+ "reference": "1f3b7e2c06cc05d42936a8ad508ff1db7975cdc5",
"shasum": ""
},
"require": {
@@ -6055,7 +6055,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.2-dev"
+ "dev-master": "3.3-dev"
}
},
"autoload": {
@@ -6091,7 +6091,7 @@
],
"support": {
"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": [
{
@@ -6103,20 +6103,20 @@
"type": "tidelift"
}
],
- "time": "2021-01-05T15:40:36+00:00"
+ "time": "2021-02-08T09:54:36+00:00"
},
{
"name": "web-token/jwt-checker",
- "version": "v2.2.7",
+ "version": "v2.2.8",
"source": {
"type": "git",
"url": "https://github.com/web-token/jwt-checker.git",
- "reference": "d2026ff6f9cc0d74107c1bddfe730b84a0f14cf7"
+ "reference": "568c801ebf4209da3747e5df1b0c0aef443aa5b9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/web-token/jwt-checker/zipball/d2026ff6f9cc0d74107c1bddfe730b84a0f14cf7",
- "reference": "d2026ff6f9cc0d74107c1bddfe730b84a0f14cf7",
+ "url": "https://api.github.com/repos/web-token/jwt-checker/zipball/568c801ebf4209da3747e5df1b0c0aef443aa5b9",
+ "reference": "568c801ebf4209da3747e5df1b0c0aef443aa5b9",
"shasum": ""
},
"require": {
@@ -6163,7 +6163,7 @@
"symfony"
],
"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": [
{
@@ -6171,20 +6171,20 @@
"type": "patreon"
}
],
- "time": "2020-12-13T16:35:27+00:00"
+ "time": "2021-01-21T19:18:03+00:00"
},
{
"name": "web-token/jwt-core",
- "version": "v2.2.7",
+ "version": "v2.2.8",
"source": {
"type": "git",
"url": "https://github.com/web-token/jwt-core.git",
- "reference": "e68c4940da62682426e78eafb1e3a3ba4c7cbabe"
+ "reference": "1365422ff1f147d2d4c5cb4473c28c9996fca84b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/web-token/jwt-core/zipball/e68c4940da62682426e78eafb1e3a3ba4c7cbabe",
- "reference": "e68c4940da62682426e78eafb1e3a3ba4c7cbabe",
+ "url": "https://api.github.com/repos/web-token/jwt-core/zipball/1365422ff1f147d2d4c5cb4473c28c9996fca84b",
+ "reference": "1365422ff1f147d2d4c5cb4473c28c9996fca84b",
"shasum": ""
},
"require": {
@@ -6239,7 +6239,7 @@
"symfony"
],
"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": [
{
@@ -6247,20 +6247,20 @@
"type": "patreon"
}
],
- "time": "2020-12-13T16:35:27+00:00"
+ "time": "2021-01-21T19:18:03+00:00"
},
{
"name": "web-token/jwt-easy",
- "version": "v2.2.7",
+ "version": "v2.2.8",
"source": {
"type": "git",
"url": "https://github.com/web-token/jwt-easy.git",
- "reference": "e4b659ef6749bc1dca74c7c4118c8746ed199731"
+ "reference": "b4d1a4581a796244fdd69694548766403daeca97"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/web-token/jwt-easy/zipball/e4b659ef6749bc1dca74c7c4118c8746ed199731",
- "reference": "e4b659ef6749bc1dca74c7c4118c8746ed199731",
+ "url": "https://api.github.com/repos/web-token/jwt-easy/zipball/b4d1a4581a796244fdd69694548766403daeca97",
+ "reference": "b4d1a4581a796244fdd69694548766403daeca97",
"shasum": ""
},
"require": {
@@ -6324,7 +6324,7 @@
"symfony"
],
"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": [
{
@@ -6332,20 +6332,20 @@
"type": "patreon"
}
],
- "time": "2020-12-13T16:35:27+00:00"
+ "time": "2021-01-21T19:18:03+00:00"
},
{
"name": "web-token/jwt-encryption",
- "version": "v2.2.7",
+ "version": "v2.2.8",
"source": {
"type": "git",
"url": "https://github.com/web-token/jwt-encryption.git",
- "reference": "93dc13ea5332d857f3d72307a3ebc8e263a06b18"
+ "reference": "c244eeec3a0f817f8ce5c3d1858fa05e0366f650"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/web-token/jwt-encryption/zipball/93dc13ea5332d857f3d72307a3ebc8e263a06b18",
- "reference": "93dc13ea5332d857f3d72307a3ebc8e263a06b18",
+ "url": "https://api.github.com/repos/web-token/jwt-encryption/zipball/c244eeec3a0f817f8ce5c3d1858fa05e0366f650",
+ "reference": "c244eeec3a0f817f8ce5c3d1858fa05e0366f650",
"shasum": ""
},
"require": {
@@ -6403,7 +6403,7 @@
"symfony"
],
"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": [
{
@@ -6411,20 +6411,20 @@
"type": "patreon"
}
],
- "time": "2020-12-13T16:35:27+00:00"
+ "time": "2021-01-21T19:18:03+00:00"
},
{
"name": "web-token/jwt-signature",
- "version": "v2.2.7",
+ "version": "v2.2.8",
"source": {
"type": "git",
"url": "https://github.com/web-token/jwt-signature.git",
- "reference": "cad4f3c51d9e3537c5f45f26ae2c61d08fd5ffd2"
+ "reference": "de624b8384b6c1bcbd699de95656181ce255fe39"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/web-token/jwt-signature/zipball/cad4f3c51d9e3537c5f45f26ae2c61d08fd5ffd2",
- "reference": "cad4f3c51d9e3537c5f45f26ae2c61d08fd5ffd2",
+ "url": "https://api.github.com/repos/web-token/jwt-signature/zipball/de624b8384b6c1bcbd699de95656181ce255fe39",
+ "reference": "de624b8384b6c1bcbd699de95656181ce255fe39",
"shasum": ""
},
"require": {
@@ -6479,7 +6479,7 @@
"symfony"
],
"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": [
{
@@ -6487,20 +6487,20 @@
"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",
- "version": "v2.2.7",
+ "version": "v2.2.8",
"source": {
"type": "git",
"url": "https://github.com/web-token/jwt-signature-algorithm-rsa.git",
- "reference": "96588136dd01cf842b0c7107fc63aebc8332d97f"
+ "reference": "513ad90eb5ef1886ff176727a769bda4618141b0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-rsa/zipball/96588136dd01cf842b0c7107fc63aebc8332d97f",
- "reference": "96588136dd01cf842b0c7107fc63aebc8332d97f",
+ "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-rsa/zipball/513ad90eb5ef1886ff176727a769bda4618141b0",
+ "reference": "513ad90eb5ef1886ff176727a769bda4618141b0",
"shasum": ""
},
"require": {
@@ -6553,7 +6553,7 @@
"symfony"
],
"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": [
{
@@ -6561,7 +6561,7 @@
"type": "patreon"
}
],
- "time": "2020-12-13T16:35:27+00:00"
+ "time": "2021-01-21T19:18:03+00:00"
},
{
"name": "webmozart/assert",
diff --git a/config/packages/dbp_core.yaml b/config/packages/dbp_core.yaml
index 8d4ab503506ad3a7eac8490bd54621d98486230e..0f354e3f14da1b62180094c24c78e12d61586e80 100644
--- a/config/packages/dbp_core.yaml
+++ b/config/packages/dbp_core.yaml
@@ -6,14 +6,6 @@ dbp_core:
client_secret: '%env(KEYCLOAK_CLIENT_SECRET)%'
audience: '%env(KEYCLOAK_AUDIENCE)%'
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:
keycloak_client_id: '%env(KEYCLOAK_FRONTEND_CLIENT_ID)%'
build_info: '%env(APP_BUILDINFO)%'