From 55201e0a20e24b93b1940b89363048db862bcbb0 Mon Sep 17 00:00:00 2001 From: Bartek Wajda Date: Mon, 17 Feb 2025 15:26:40 +0100 Subject: [PATCH 1/4] IBX-9239: Added recipe for ibexa/connect package --- .../4.6/config/routes/ibexa_connect.yaml | 5 +++++ ibexa/connect/4.6/manifest.json | 18 ++++++++++++++++++ .../5.0/config/routes/ibexa_connect.yaml | 5 +++++ ibexa/connect/5.0/manifest.json | 18 ++++++++++++++++++ 4 files changed, 46 insertions(+) create mode 100644 ibexa/connect/4.6/config/routes/ibexa_connect.yaml create mode 100644 ibexa/connect/4.6/manifest.json create mode 100644 ibexa/connect/5.0/config/routes/ibexa_connect.yaml create mode 100644 ibexa/connect/5.0/manifest.json diff --git a/ibexa/connect/4.6/config/routes/ibexa_connect.yaml b/ibexa/connect/4.6/config/routes/ibexa_connect.yaml new file mode 100644 index 00000000..f8fd17be --- /dev/null +++ b/ibexa/connect/4.6/config/routes/ibexa_connect.yaml @@ -0,0 +1,5 @@ +ibexa.connect.rest.admin: + resource: '@IbexaConnectBundle/Resources/config/routing/rest_admin.yaml' + prefix: '%ibexa.rest.path_prefix%' + defaults: + siteaccess_group_whitelist: '%admin_group_name%' diff --git a/ibexa/connect/4.6/manifest.json b/ibexa/connect/4.6/manifest.json new file mode 100644 index 00000000..6d4b52b7 --- /dev/null +++ b/ibexa/connect/4.6/manifest.json @@ -0,0 +1,18 @@ +{ + "aliases": [], + "env": { + "IBEXA_CONNECT_HOST": "https://connect.ibexa.co", + "IBEXA_CONNECT_API_PATH": "/api/v2/", + "#1": "Token can be created in the user's profile in Ibexa Connect, under the 'API ACCESS' section.", + "IBEXA_CONNECT_TOKEN": "12345", + "#2": "Use the URL below to read more on Ibexa Connect teams.", + "#3": "https://doc.ibexa.co/projects/connect/en/latest/access_management/teams/", + "IBEXA_CONNECT_TEAM_ID": "12345" + }, + "bundles": { + "Ibexa\\Bundle\\Connect\\IbexaConnectBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + } +} diff --git a/ibexa/connect/5.0/config/routes/ibexa_connect.yaml b/ibexa/connect/5.0/config/routes/ibexa_connect.yaml new file mode 100644 index 00000000..f8fd17be --- /dev/null +++ b/ibexa/connect/5.0/config/routes/ibexa_connect.yaml @@ -0,0 +1,5 @@ +ibexa.connect.rest.admin: + resource: '@IbexaConnectBundle/Resources/config/routing/rest_admin.yaml' + prefix: '%ibexa.rest.path_prefix%' + defaults: + siteaccess_group_whitelist: '%admin_group_name%' diff --git a/ibexa/connect/5.0/manifest.json b/ibexa/connect/5.0/manifest.json new file mode 100644 index 00000000..6d4b52b7 --- /dev/null +++ b/ibexa/connect/5.0/manifest.json @@ -0,0 +1,18 @@ +{ + "aliases": [], + "env": { + "IBEXA_CONNECT_HOST": "https://connect.ibexa.co", + "IBEXA_CONNECT_API_PATH": "/api/v2/", + "#1": "Token can be created in the user's profile in Ibexa Connect, under the 'API ACCESS' section.", + "IBEXA_CONNECT_TOKEN": "12345", + "#2": "Use the URL below to read more on Ibexa Connect teams.", + "#3": "https://doc.ibexa.co/projects/connect/en/latest/access_management/teams/", + "IBEXA_CONNECT_TEAM_ID": "12345" + }, + "bundles": { + "Ibexa\\Bundle\\Connect\\IbexaConnectBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + } +} From 2506732f66dae43161c8459e22488d050042fdb3 Mon Sep 17 00:00:00 2001 From: mikolaj Date: Wed, 19 Feb 2025 13:55:40 +0100 Subject: [PATCH 2/4] Added SiteAccess-aware configuration to recipe --- ibexa/connect/4.6/config/packages/ibexa_connect.yaml | 8 ++++++++ ibexa/connect/5.0/config/packages/ibexa_connect.yaml | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 ibexa/connect/4.6/config/packages/ibexa_connect.yaml create mode 100644 ibexa/connect/5.0/config/packages/ibexa_connect.yaml diff --git a/ibexa/connect/4.6/config/packages/ibexa_connect.yaml b/ibexa/connect/4.6/config/packages/ibexa_connect.yaml new file mode 100644 index 00000000..5a9552d2 --- /dev/null +++ b/ibexa/connect/4.6/config/packages/ibexa_connect.yaml @@ -0,0 +1,8 @@ +ibexa: + system: + default: + connect: + client: + token: '%env(string:IBEXA_CONNECT_TOKEN)%' + host: '%env(string:IBEXA_CONNECT_HOST)%' + api_path: '%env(string:IBEXA_CONNECT_API_PATH)%' diff --git a/ibexa/connect/5.0/config/packages/ibexa_connect.yaml b/ibexa/connect/5.0/config/packages/ibexa_connect.yaml new file mode 100644 index 00000000..5a9552d2 --- /dev/null +++ b/ibexa/connect/5.0/config/packages/ibexa_connect.yaml @@ -0,0 +1,8 @@ +ibexa: + system: + default: + connect: + client: + token: '%env(string:IBEXA_CONNECT_TOKEN)%' + host: '%env(string:IBEXA_CONNECT_HOST)%' + api_path: '%env(string:IBEXA_CONNECT_API_PATH)%' From 015ecc7e98996f969bccd804c694ed60de997f32 Mon Sep 17 00:00:00 2001 From: Bartek Wajda Date: Thu, 20 Feb 2025 15:53:41 +0100 Subject: [PATCH 3/4] IBX-9239: Fixup --- ibexa/connect/4.6/config/routes/ibexa_connect.yaml | 5 ----- ibexa/connect/4.6/manifest.json | 3 --- ibexa/connect/5.0/config/routes/ibexa_connect.yaml | 5 ----- ibexa/connect/5.0/manifest.json | 3 --- 4 files changed, 16 deletions(-) delete mode 100644 ibexa/connect/4.6/config/routes/ibexa_connect.yaml delete mode 100644 ibexa/connect/5.0/config/routes/ibexa_connect.yaml diff --git a/ibexa/connect/4.6/config/routes/ibexa_connect.yaml b/ibexa/connect/4.6/config/routes/ibexa_connect.yaml deleted file mode 100644 index f8fd17be..00000000 --- a/ibexa/connect/4.6/config/routes/ibexa_connect.yaml +++ /dev/null @@ -1,5 +0,0 @@ -ibexa.connect.rest.admin: - resource: '@IbexaConnectBundle/Resources/config/routing/rest_admin.yaml' - prefix: '%ibexa.rest.path_prefix%' - defaults: - siteaccess_group_whitelist: '%admin_group_name%' diff --git a/ibexa/connect/4.6/manifest.json b/ibexa/connect/4.6/manifest.json index 6d4b52b7..7d31628a 100644 --- a/ibexa/connect/4.6/manifest.json +++ b/ibexa/connect/4.6/manifest.json @@ -11,8 +11,5 @@ }, "bundles": { "Ibexa\\Bundle\\Connect\\IbexaConnectBundle": ["all"] - }, - "copy-from-recipe": { - "config/": "%CONFIG_DIR%/" } } diff --git a/ibexa/connect/5.0/config/routes/ibexa_connect.yaml b/ibexa/connect/5.0/config/routes/ibexa_connect.yaml deleted file mode 100644 index f8fd17be..00000000 --- a/ibexa/connect/5.0/config/routes/ibexa_connect.yaml +++ /dev/null @@ -1,5 +0,0 @@ -ibexa.connect.rest.admin: - resource: '@IbexaConnectBundle/Resources/config/routing/rest_admin.yaml' - prefix: '%ibexa.rest.path_prefix%' - defaults: - siteaccess_group_whitelist: '%admin_group_name%' diff --git a/ibexa/connect/5.0/manifest.json b/ibexa/connect/5.0/manifest.json index 6d4b52b7..7d31628a 100644 --- a/ibexa/connect/5.0/manifest.json +++ b/ibexa/connect/5.0/manifest.json @@ -11,8 +11,5 @@ }, "bundles": { "Ibexa\\Bundle\\Connect\\IbexaConnectBundle": ["all"] - }, - "copy-from-recipe": { - "config/": "%CONFIG_DIR%/" } } From 48f972e92665e077a4a0ccdbd79c7692e0745b7e Mon Sep 17 00:00:00 2001 From: Bartek Wajda Date: Thu, 20 Feb 2025 15:59:16 +0100 Subject: [PATCH 4/4] IBX-9239: Fixup --- ibexa/connect/4.6/manifest.json | 3 +++ ibexa/connect/5.0/manifest.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/ibexa/connect/4.6/manifest.json b/ibexa/connect/4.6/manifest.json index 7d31628a..6d4b52b7 100644 --- a/ibexa/connect/4.6/manifest.json +++ b/ibexa/connect/4.6/manifest.json @@ -11,5 +11,8 @@ }, "bundles": { "Ibexa\\Bundle\\Connect\\IbexaConnectBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" } } diff --git a/ibexa/connect/5.0/manifest.json b/ibexa/connect/5.0/manifest.json index 7d31628a..6d4b52b7 100644 --- a/ibexa/connect/5.0/manifest.json +++ b/ibexa/connect/5.0/manifest.json @@ -11,5 +11,8 @@ }, "bundles": { "Ibexa\\Bundle\\Connect\\IbexaConnectBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" } }