From a34503d238f28825808638fc44a27998d3e73b94 Mon Sep 17 00:00:00 2001 From: Roman Havrylko Date: Tue, 3 Oct 2023 17:56:02 +0200 Subject: [PATCH 01/16] CC-30016: added deploy file for staging. --- deploy.spryker-b2cintt.yml | 189 +++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100644 deploy.spryker-b2cintt.yml diff --git a/deploy.spryker-b2cintt.yml b/deploy.spryker-b2cintt.yml new file mode 100644 index 0000000000..b1e4cdc54a --- /dev/null +++ b/deploy.spryker-b2cintt.yml @@ -0,0 +1,189 @@ +version: "0.1" + +namespace: spryker-cloud +tag: '1.0' + +environment: docker.production +image: + tag: spryker/php:8.1 + environment: + SPRYKER_DEFAULT_STORE: "DE" + SPRYKER_ACTIVE_STORES: "DE,AT" + SPRYKER_HOOK_BEFORE_DEPLOY: "vendor/bin/install -r EU/pre-deploy -vvv " + SPRYKER_HOOK_AFTER_DEPLOY: "true" + SPRYKER_HOOK_INSTALL: "vendor/bin/install -r EU/production --no-ansi -vvv" + SPRYKER_HOOK_DESTRUCTIVE_INSTALL: "vendor/bin/install -r EU/destructive --no-ansi -vvv" + SPRYKER_PRODUCT_CONFIGURATOR_HOST: dtc.b2c.internal-testing.demo-spryker.com + SPRYKER_PRODUCT_CONFIGURATOR_PORT: 443 + SPRYKER_YVES_HOST_DE: www.de.b2c.internal-testing.demo-spryker.com + SPRYKER_YVES_HOST_AT: www.at.b2c.internal-testing.demo-spryker.com + SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PUBLIC_KEY: 'BGqNWbv0hWM5CQ1-KwAfSQBMC6TMVFyrnh3vQp37oGCNvQ6eG_HyMjxBFJRWeCPTbzDoxcjhxLJS8Ck8r1G2oFw' + SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PRIVATE_KEY: 'UK6DywwjKITPpRHBSY9TLPIXm6BPrHX40sseIoXT9c8' + SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_SUBJECT: 'https://spryker.com' + node: + version: 18 + npm: 9 + +composer: + mode: --no-dev + autoload: --classmap-authoritative + +assets: + image: spryker/nginx-brotli:latest + mode: production + compression: + brotli: + static: on + level: 5 + +regions: + EU: + services: + mail: + sender: + name: Spryker No-Reply + email: no-reply@b2c.internal-testing.demo-spryker.com + database: + database: spryker_b2cintt #Example: environment_staging + username: spryker + password: secret + + stores: + DE: + services: + broker: + namespace: de_queue + key_value_store: + namespace: 1 + search: + namespace: de_search + session: + namespace: 2 + AT: + services: + broker: + namespace: at_queue + key_value_store: + namespace: 1 + search: + namespace: at_search + session: + namespace: 2 + +groups: + EU: + region: EU + applications: + yves: + application: yves + endpoints: + dtc.b2c.internal-testing.demo-spryker.com: + entry-point: Configurator + www.de.b2c.internal-testing.demo-spryker.com: + store: DE + www.at.b2c.internal-testing.demo-spryker.com: + store: AT + + boffice: + application: backoffice + endpoints: + backoffice.de.b2c.internal-testing.demo-spryker.com: + store: DE + backoffice.at.b2c.internal-testing.demo-spryker.com: + store: AT + backgw: + application: backend-gateway + endpoints: + backend-gateway.de.b2c.internal-testing.demo-spryker.com: + store: DE + backend-gateway.at.b2c.internal-testing.demo-spryker.com: + store: AT + backapi: + application: zed + endpoints: + backend-api.de.b2c.internal-testing.demo-spryker.com: + store: DE + entry-point: BackendApi + backend-api.at.b2c.internal-testing.demo-spryker.com: + store: AT + entry-point: BackendApi + glue: + application: glue + endpoints: + glue.de.b2c.internal-testing.demo-spryker.com: + store: DE + glue.at.b2c.internal-testing.demo-spryker.com: + store: AT + gluestorefront: + application: glue-storefront + endpoints: + glue-storefront.de.b2c.internal-testing.demo-spryker.com: + store: DE + glue-storefront.at.b2c.internal-testing.demo-spryker.com: + store: AT + gluebackend: + application: glue-backend + endpoints: + glue-backend.de.b2c.internal-testing.demo-spryker.com: + store: DE + glue-backend.at.b2c.internal-testing.demo-spryker.com: + store: + AT +services: + database: + engine: mysql + version: mariadb-10.4 + root: + username: "root" + password: "secret" + endpoints: + localhost:3306: + protocol: tcp + broker: + engine: rabbitmq + version: '3.9' + api: + username: "spryker" + password: "secret" + endpoints: + queue.b2c.internal-testing.demo-spryker.com: + localhost:5672: + protocol: tcp + session: + engine: redis + key_value_store: + engine: redis + endpoints: + localhost:16379: + protocol: tcp + search: + engine: elastic + version: '7.10' + endpoints: + localhost:9200: + protocol: tcp + scheduler: + engine: jenkins + endpoints: + scheduler.internal-testing.demo-spryker.com: + mail_catcher: + engine: mailhog + endpoints: + mail.internal-testing.demo-spryker.com: + +docker: + + ssl: + enabled: true + redirect: true + + debug: + enabled: false + xdebug: + enabled: false + + testing: + store: DE + + mount: + baked: From eed27fd1e15a641a8f56b0172d9a4d7f1e14abee Mon Sep 17 00:00:00 2001 From: Kostiantyn Kichehlov Date: Thu, 5 Oct 2023 09:47:19 +0200 Subject: [PATCH 02/16] CC-30016 Added old mailer. --- composer.json | 1 + composer.lock | 117 +++++++++++++++++- config/Shared/config_default.php | 8 ++ deploy.spryker-b2cintt.yml | 1 + ...ackendApiApplicationDependencyProvider.php | 2 + src/Pyz/Zed/Mail/MailDependencyProvider.php | 3 +- 6 files changed, 130 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index ec33be18ee..7b27a0eb7e 100644 --- a/composer.json +++ b/composer.json @@ -14,6 +14,7 @@ "ext-pgsql": "*", "ext-readline": "*", "ext-redis": "*", + "spryker-eco/authorization-picking-app-backend-api": "^0.1.0", "spryker-eco/loggly": "^0.1.1", "spryker-feature/agent-assist": "^202307.0", "spryker-feature/alternative-products": "^202307.0", diff --git a/composer.lock b/composer.lock index 9562641f6f..f536b1d3cb 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": "ce1977cb8db0bcb66a31b3613993d2e3", + "content-hash": "c02e1b6514fe741e46253c0e7c3326da", "packages": [ { "name": "async-aws/core", @@ -4791,6 +4791,74 @@ ], "time": "2020-11-03T09:10:25+00:00" }, + { + "name": "spryker-eco/authorization-picking-app-backend-api", + "version": "0.1.1", + "source": { + "type": "git", + "url": "https://github.com/spryker-eco/authorization-picking-app-backend-api.git", + "reference": "288dcc5e2a4d2a144c5f3be3eda1a6fb3c4e95ca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker-eco/authorization-picking-app-backend-api/zipball/288dcc5e2a4d2a144c5f3be3eda1a6fb3c4e95ca", + "reference": "288dcc5e2a4d2a144c5f3be3eda1a6fb3c4e95ca", + "shasum": "" + }, + "require": { + "php": ">=8.0", + "psr/http-message": "^1.0.0", + "spryker/glue-application-extension": "^1.10.0", + "spryker/guzzle": "^2.0.0", + "spryker/kernel": "^3.52.0", + "spryker/oauth": "^2.7.0", + "spryker/oauth-code-flow": "^0.1.0", + "spryker/propel-orm": "^1.16.0", + "spryker/symfony": "^3.0.0", + "spryker/transfer": "^3.33.1", + "spryker/user": "^3.9.0", + "spryker/util-encoding": "^2.1.1" + }, + "require-dev": { + "codeception/module-asserts": "^3.0.0", + "phpstan/phpstan": "1.8.10", + "phpunit/phpunit": "^9.0.0", + "spryker/application": "*", + "spryker/code-sniffer": "*", + "spryker/config": "*", + "spryker/error-handler": "*", + "spryker/glue-application": "^1.39.0", + "spryker/log": "*", + "spryker/monolog": "*", + "spryker/propel": "^3.35.1", + "spryker/queue": "*", + "spryker/testify": "^3.47.0" + }, + "suggest": { + "spryker/glue-application": "If you want to use plugins with glue application." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "SprykerEco\\": "src/SprykerEco/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "AuthorizationPickingAppBackendApi module", + "support": { + "issues": "https://github.com/spryker-eco/authorization-picking-app-backend-api/issues", + "source": "https://github.com/spryker-eco/authorization-picking-app-backend-api/tree/0.1.1" + }, + "time": "2023-04-21T16:00:21+00:00" + }, { "name": "spryker-eco/loggly", "version": "0.1.1", @@ -28753,6 +28821,53 @@ }, "time": "2022-04-26T12:27:56+00:00" }, + { + "name": "spryker/oauth-code-flow", + "version": "0.1.0", + "source": { + "type": "git", + "url": "https://github.com/spryker/oauth-code-flow.git", + "reference": "c93b7257272adba80deabcef7a2197cf31cd9076" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/oauth-code-flow/zipball/c93b7257272adba80deabcef7a2197cf31cd9076", + "reference": "c93b7257272adba80deabcef7a2197cf31cd9076", + "shasum": "" + }, + "require": { + "php": ">=8.0", + "psr/http-message": "^1.0.0", + "spryker/kernel": "^3.30.0", + "spryker/oauth": "^2.7.0", + "spryker/oauth-extension": "^1.7.0", + "spryker/transfer": "^3.25.0" + }, + "require-dev": { + "spryker/code-sniffer": "*", + "spryker/testify": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "OauthCodeFlow module", + "support": { + "source": "https://github.com/spryker/oauth-code-flow/tree/0.1.0" + }, + "time": "2022-12-12T14:47:49+00:00" + }, { "name": "spryker/oauth-cryptography", "version": "1.0.1", diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php index 6815e89323..2517c34fe4 100644 --- a/config/Shared/config_default.php +++ b/config/Shared/config_default.php @@ -547,6 +547,14 @@ $config[SymfonyMailerConstants::SMTP_USERNAME] = getenv('SPRYKER_SMTP_USERNAME') ?: null; $config[SymfonyMailerConstants::SMTP_PASSWORD] = getenv('SPRYKER_SMTP_PASSWORD') ?: null; +// >>> OLD_MAILER +$config[MailConstants::SMTP_HOST] = getenv('SPRYKER_SMTP_HOST') ?: null; +$config[MailConstants::SMTP_PORT] = getenv('SPRYKER_SMTP_PORT') ?: null; +$config[MailConstants::SMTP_ENCRYPTION] = getenv('SPRYKER_SMTP_ENCRYPTION') ?: null; +$config[MailConstants::SMTP_AUTH_MODE] = getenv('SPRYKER_SMTP_AUTH_MODE') ?: null; +$config[MailConstants::SMTP_USERNAME] = getenv('SPRYKER_SMTP_USERNAME') ?: null; +$config[MailConstants::SMTP_PASSWORD] = getenv('SPRYKER_SMTP_PASSWORD') ?: null; + // >>> FILESYSTEM $config[FileSystemConstants::FILESYSTEM_SERVICE] = [ 'files' => [ diff --git a/deploy.spryker-b2cintt.yml b/deploy.spryker-b2cintt.yml index b1e4cdc54a..07e88c9a73 100644 --- a/deploy.spryker-b2cintt.yml +++ b/deploy.spryker-b2cintt.yml @@ -20,6 +20,7 @@ image: SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PUBLIC_KEY: 'BGqNWbv0hWM5CQ1-KwAfSQBMC6TMVFyrnh3vQp37oGCNvQ6eG_HyMjxBFJRWeCPTbzDoxcjhxLJS8Ck8r1G2oFw' SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PRIVATE_KEY: 'UK6DywwjKITPpRHBSY9TLPIXm6BPrHX40sseIoXT9c8' SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_SUBJECT: 'https://spryker.com' + SPRYKER_OAUTH_CLIENT_CONFIGURATION: '[{"identifier":"frontend","secret":"3kcZT0IODXIHcaqf8YRgrUKNeFJQutQJLvtgu4rVrHK2G6Mh","isConfidential":true,"name":"Customer client","redirectUri":null,"isDefault":true},{"identifier":"fulfillment-dev","secret":null,"isConfidential":false,"name":"Fulfillment dev","redirectUri":"https://dev-b2c-fulfillment.netlify.app","isDefault":false},{"identifier":"fulfillment-local","secret":null,"isConfidential":false,"name":"Fulfillment local","redirectUri":"http://localhost:4200","isDefault":false},{"identifier":"picking-app-dev","secret":null,"isConfidential":false,"name":"Picking app dev","redirectUri":"https://dev-b2c-fulfillment.netlify.app","isDefault":false},{"identifier":"picking-app-local","secret":null,"isConfidential":false,"name":"Picking app local","redirectUri":"http://localhost:3000","isDefault":false}]' node: version: 18 npm: 9 diff --git a/src/Pyz/Glue/GlueBackendApiApplication/GlueBackendApiApplicationDependencyProvider.php b/src/Pyz/Glue/GlueBackendApiApplication/GlueBackendApiApplicationDependencyProvider.php index f08aee944a..ebb9b97820 100644 --- a/src/Pyz/Glue/GlueBackendApiApplication/GlueBackendApiApplicationDependencyProvider.php +++ b/src/Pyz/Glue/GlueBackendApiApplication/GlueBackendApiApplicationDependencyProvider.php @@ -33,6 +33,7 @@ use Spryker\Glue\WarehouseOauthBackendApi\Plugin\GlueBackendApiApplication\WarehouseTokensBackendResourcePlugin; use Spryker\Glue\WarehouseUsersBackendApi\Plugin\GlueBackendApiApplication\WarehouseUserAssignmentsBackendResourcePlugin; use Spryker\Zed\Propel\Communication\Plugin\Application\PropelApplicationPlugin; +use SprykerEco\Glue\AuthorizationPickingAppBackendApi\Plugin\GlueApplication\AuthorizeResource; class GlueBackendApiApplicationDependencyProvider extends SprykerGlueBackendApiApplicationDependencyProvider { @@ -111,6 +112,7 @@ protected function getResourcePlugins(): array new PickingListsBackendResourcePlugin(), new PickingListStartPickingBackendResourcePlugin(), new PickingListItemsBackendResourcePlugin(), + new AuthorizeResource(), new WarehouseUserAssignmentsBackendResourcePlugin(), ]; } diff --git a/src/Pyz/Zed/Mail/MailDependencyProvider.php b/src/Pyz/Zed/Mail/MailDependencyProvider.php index 6be6f04cf9..99be236fc9 100644 --- a/src/Pyz/Zed/Mail/MailDependencyProvider.php +++ b/src/Pyz/Zed/Mail/MailDependencyProvider.php @@ -18,6 +18,7 @@ use Spryker\Zed\GiftCardMailConnector\Communication\Plugin\Mail\GiftCardUsageMailTypeBuilderPlugin; use Spryker\Zed\Kernel\Container; use Spryker\Zed\Mail\Business\Model\Provider\MailProviderCollectionAddInterface; +use Spryker\Zed\Mail\Communication\Plugin\MailProviderPlugin; use Spryker\Zed\Mail\MailConfig; use Spryker\Zed\Mail\MailDependencyProvider as SprykerMailDependencyProvider; use Spryker\Zed\Newsletter\Communication\Plugin\Mail\NewsletterSubscribedMailTypeBuilderPlugin; @@ -53,7 +54,7 @@ protected function extendMailProviderCollection(Container $container): Container { $container->extend(self::MAIL_PROVIDER_COLLECTION, function (MailProviderCollectionAddInterface $mailProviderCollection) { $mailProviderCollection - ->addProvider(new SymfonyMailerProviderPlugin(), [ + ->addProvider(new MailProviderPlugin(), [ MailConfig::MAIL_TYPE_ALL, ]); From ab0f1bd59d7cc5c3ada9bcd49f327d6c20359586 Mon Sep 17 00:00:00 2001 From: Kostiantyn Kichehlov Date: Fri, 6 Oct 2023 12:49:42 +0200 Subject: [PATCH 03/16] CC-30016 Removed old mailer. --- config/Shared/config_default.php | 8 -------- src/Pyz/Zed/Mail/MailDependencyProvider.php | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php index 2517c34fe4..6815e89323 100644 --- a/config/Shared/config_default.php +++ b/config/Shared/config_default.php @@ -547,14 +547,6 @@ $config[SymfonyMailerConstants::SMTP_USERNAME] = getenv('SPRYKER_SMTP_USERNAME') ?: null; $config[SymfonyMailerConstants::SMTP_PASSWORD] = getenv('SPRYKER_SMTP_PASSWORD') ?: null; -// >>> OLD_MAILER -$config[MailConstants::SMTP_HOST] = getenv('SPRYKER_SMTP_HOST') ?: null; -$config[MailConstants::SMTP_PORT] = getenv('SPRYKER_SMTP_PORT') ?: null; -$config[MailConstants::SMTP_ENCRYPTION] = getenv('SPRYKER_SMTP_ENCRYPTION') ?: null; -$config[MailConstants::SMTP_AUTH_MODE] = getenv('SPRYKER_SMTP_AUTH_MODE') ?: null; -$config[MailConstants::SMTP_USERNAME] = getenv('SPRYKER_SMTP_USERNAME') ?: null; -$config[MailConstants::SMTP_PASSWORD] = getenv('SPRYKER_SMTP_PASSWORD') ?: null; - // >>> FILESYSTEM $config[FileSystemConstants::FILESYSTEM_SERVICE] = [ 'files' => [ diff --git a/src/Pyz/Zed/Mail/MailDependencyProvider.php b/src/Pyz/Zed/Mail/MailDependencyProvider.php index 99be236fc9..6be6f04cf9 100644 --- a/src/Pyz/Zed/Mail/MailDependencyProvider.php +++ b/src/Pyz/Zed/Mail/MailDependencyProvider.php @@ -18,7 +18,6 @@ use Spryker\Zed\GiftCardMailConnector\Communication\Plugin\Mail\GiftCardUsageMailTypeBuilderPlugin; use Spryker\Zed\Kernel\Container; use Spryker\Zed\Mail\Business\Model\Provider\MailProviderCollectionAddInterface; -use Spryker\Zed\Mail\Communication\Plugin\MailProviderPlugin; use Spryker\Zed\Mail\MailConfig; use Spryker\Zed\Mail\MailDependencyProvider as SprykerMailDependencyProvider; use Spryker\Zed\Newsletter\Communication\Plugin\Mail\NewsletterSubscribedMailTypeBuilderPlugin; @@ -54,7 +53,7 @@ protected function extendMailProviderCollection(Container $container): Container { $container->extend(self::MAIL_PROVIDER_COLLECTION, function (MailProviderCollectionAddInterface $mailProviderCollection) { $mailProviderCollection - ->addProvider(new MailProviderPlugin(), [ + ->addProvider(new SymfonyMailerProviderPlugin(), [ MailConfig::MAIL_TYPE_ALL, ]); From e68f1aab962f391eb05f2ab56d18bae878368ee7 Mon Sep 17 00:00:00 2001 From: Kostiantyn Kichehlov Date: Fri, 6 Oct 2023 18:43:32 +0200 Subject: [PATCH 04/16] CC-30016 Updated oauth identifiers. --- composer.lock | 117 ++++++++++++++++++++++++++++++++++++- deploy.spryker-b2cintt.yml | 2 +- 2 files changed, 117 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 0134927205..9e38d11555 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": "9aaed0cd5e2a1ae1040bb30fc9463a08", + "content-hash": "6fb36a5bcd508bb63d9fc8d5b1ce8aa2", "packages": [ { "name": "async-aws/core", @@ -4791,6 +4791,74 @@ ], "time": "2020-11-03T09:10:25+00:00" }, + { + "name": "spryker-eco/authorization-picking-app-backend-api", + "version": "0.1.1", + "source": { + "type": "git", + "url": "https://github.com/spryker-eco/authorization-picking-app-backend-api.git", + "reference": "288dcc5e2a4d2a144c5f3be3eda1a6fb3c4e95ca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker-eco/authorization-picking-app-backend-api/zipball/288dcc5e2a4d2a144c5f3be3eda1a6fb3c4e95ca", + "reference": "288dcc5e2a4d2a144c5f3be3eda1a6fb3c4e95ca", + "shasum": "" + }, + "require": { + "php": ">=8.0", + "psr/http-message": "^1.0.0", + "spryker/glue-application-extension": "^1.10.0", + "spryker/guzzle": "^2.0.0", + "spryker/kernel": "^3.52.0", + "spryker/oauth": "^2.7.0", + "spryker/oauth-code-flow": "^0.1.0", + "spryker/propel-orm": "^1.16.0", + "spryker/symfony": "^3.0.0", + "spryker/transfer": "^3.33.1", + "spryker/user": "^3.9.0", + "spryker/util-encoding": "^2.1.1" + }, + "require-dev": { + "codeception/module-asserts": "^3.0.0", + "phpstan/phpstan": "1.8.10", + "phpunit/phpunit": "^9.0.0", + "spryker/application": "*", + "spryker/code-sniffer": "*", + "spryker/config": "*", + "spryker/error-handler": "*", + "spryker/glue-application": "^1.39.0", + "spryker/log": "*", + "spryker/monolog": "*", + "spryker/propel": "^3.35.1", + "spryker/queue": "*", + "spryker/testify": "^3.47.0" + }, + "suggest": { + "spryker/glue-application": "If you want to use plugins with glue application." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "SprykerEco\\": "src/SprykerEco/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "AuthorizationPickingAppBackendApi module", + "support": { + "issues": "https://github.com/spryker-eco/authorization-picking-app-backend-api/issues", + "source": "https://github.com/spryker-eco/authorization-picking-app-backend-api/tree/0.1.1" + }, + "time": "2023-04-21T16:00:21+00:00" + }, { "name": "spryker-eco/loggly", "version": "0.1.1", @@ -29089,6 +29157,53 @@ }, "time": "2022-04-26T12:27:56+00:00" }, + { + "name": "spryker/oauth-code-flow", + "version": "0.1.0", + "source": { + "type": "git", + "url": "https://github.com/spryker/oauth-code-flow.git", + "reference": "c93b7257272adba80deabcef7a2197cf31cd9076" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/oauth-code-flow/zipball/c93b7257272adba80deabcef7a2197cf31cd9076", + "reference": "c93b7257272adba80deabcef7a2197cf31cd9076", + "shasum": "" + }, + "require": { + "php": ">=8.0", + "psr/http-message": "^1.0.0", + "spryker/kernel": "^3.30.0", + "spryker/oauth": "^2.7.0", + "spryker/oauth-extension": "^1.7.0", + "spryker/transfer": "^3.25.0" + }, + "require-dev": { + "spryker/code-sniffer": "*", + "spryker/testify": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "OauthCodeFlow module", + "support": { + "source": "https://github.com/spryker/oauth-code-flow/tree/0.1.0" + }, + "time": "2022-12-12T14:47:49+00:00" + }, { "name": "spryker/oauth-cryptography", "version": "1.0.1", diff --git a/deploy.spryker-b2cintt.yml b/deploy.spryker-b2cintt.yml index 07e88c9a73..8ec85eee66 100644 --- a/deploy.spryker-b2cintt.yml +++ b/deploy.spryker-b2cintt.yml @@ -20,7 +20,7 @@ image: SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PUBLIC_KEY: 'BGqNWbv0hWM5CQ1-KwAfSQBMC6TMVFyrnh3vQp37oGCNvQ6eG_HyMjxBFJRWeCPTbzDoxcjhxLJS8Ck8r1G2oFw' SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PRIVATE_KEY: 'UK6DywwjKITPpRHBSY9TLPIXm6BPrHX40sseIoXT9c8' SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_SUBJECT: 'https://spryker.com' - SPRYKER_OAUTH_CLIENT_CONFIGURATION: '[{"identifier":"frontend","secret":"3kcZT0IODXIHcaqf8YRgrUKNeFJQutQJLvtgu4rVrHK2G6Mh","isConfidential":true,"name":"Customer client","redirectUri":null,"isDefault":true},{"identifier":"fulfillment-dev","secret":null,"isConfidential":false,"name":"Fulfillment dev","redirectUri":"https://dev-b2c-fulfillment.netlify.app","isDefault":false},{"identifier":"fulfillment-local","secret":null,"isConfidential":false,"name":"Fulfillment local","redirectUri":"http://localhost:4200","isDefault":false},{"identifier":"picking-app-dev","secret":null,"isConfidential":false,"name":"Picking app dev","redirectUri":"https://dev-b2c-fulfillment.netlify.app","isDefault":false},{"identifier":"picking-app-local","secret":null,"isConfidential":false,"name":"Picking app local","redirectUri":"http://localhost:3000","isDefault":false}]' + SPRYKER_OAUTH_CLIENT_CONFIGURATION: '[{"identifier":"frontend","secret":"3kcZT0IODXIHcaqf8YRgrUKNeFJQutQJLvtgu4rVrHK2G6Mh","isConfidential":true,"name":"Customer client","redirectUri":null,"isDefault":true},{"identifier":"b2cmp-fulfillment-demo","secret":null,"isConfidential":false,"name":"Fulfillment dev","redirectUri":"https://dev-b2cmp-fulfillment.netlify.app","isDefault":false}]' node: version: 18 npm: 9 From b05d95b6273ae3f48d153cd13086dc83c3132d27 Mon Sep 17 00:00:00 2001 From: Kostiantyn Kichehlov Date: Fri, 6 Oct 2023 18:45:03 +0200 Subject: [PATCH 05/16] CC-30016 Updated oauth identifiers. --- deploy.spryker-b2cintt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.spryker-b2cintt.yml b/deploy.spryker-b2cintt.yml index 8ec85eee66..b39985c566 100644 --- a/deploy.spryker-b2cintt.yml +++ b/deploy.spryker-b2cintt.yml @@ -20,7 +20,7 @@ image: SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PUBLIC_KEY: 'BGqNWbv0hWM5CQ1-KwAfSQBMC6TMVFyrnh3vQp37oGCNvQ6eG_HyMjxBFJRWeCPTbzDoxcjhxLJS8Ck8r1G2oFw' SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PRIVATE_KEY: 'UK6DywwjKITPpRHBSY9TLPIXm6BPrHX40sseIoXT9c8' SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_SUBJECT: 'https://spryker.com' - SPRYKER_OAUTH_CLIENT_CONFIGURATION: '[{"identifier":"frontend","secret":"3kcZT0IODXIHcaqf8YRgrUKNeFJQutQJLvtgu4rVrHK2G6Mh","isConfidential":true,"name":"Customer client","redirectUri":null,"isDefault":true},{"identifier":"b2cmp-fulfillment-demo","secret":null,"isConfidential":false,"name":"Fulfillment dev","redirectUri":"https://dev-b2cmp-fulfillment.netlify.app","isDefault":false}]' + SPRYKER_OAUTH_CLIENT_CONFIGURATION: '[{"identifier":"frontend","secret":"3kcZT0IODXIHcaqf8YRgrUKNeFJQutQJLvtgu4rVrHK2G6Mh","isConfidential":true,"name":"Customer client","redirectUri":null,"isDefault":true},{"identifier":"b2c-fulfillment-demo","secret":null,"isConfidential":false,"name":"Fulfillment dev","redirectUri":"https://dev-b2c-fulfillment.netlify.app","isDefault":false}]' node: version: 18 npm: 9 From 68084b08ca68e32b891ef0de5207c53ba90f9bc1 Mon Sep 17 00:00:00 2001 From: Dmytro Asieiev Date: Thu, 12 Oct 2023 13:03:54 +0300 Subject: [PATCH 06/16] Updated env for FA. --- deploy.spryker-b2cintt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.spryker-b2cintt.yml b/deploy.spryker-b2cintt.yml index b39985c566..0297552b72 100644 --- a/deploy.spryker-b2cintt.yml +++ b/deploy.spryker-b2cintt.yml @@ -20,7 +20,7 @@ image: SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PUBLIC_KEY: 'BGqNWbv0hWM5CQ1-KwAfSQBMC6TMVFyrnh3vQp37oGCNvQ6eG_HyMjxBFJRWeCPTbzDoxcjhxLJS8Ck8r1G2oFw' SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PRIVATE_KEY: 'UK6DywwjKITPpRHBSY9TLPIXm6BPrHX40sseIoXT9c8' SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_SUBJECT: 'https://spryker.com' - SPRYKER_OAUTH_CLIENT_CONFIGURATION: '[{"identifier":"frontend","secret":"3kcZT0IODXIHcaqf8YRgrUKNeFJQutQJLvtgu4rVrHK2G6Mh","isConfidential":true,"name":"Customer client","redirectUri":null,"isDefault":true},{"identifier":"b2c-fulfillment-demo","secret":null,"isConfidential":false,"name":"Fulfillment dev","redirectUri":"https://dev-b2c-fulfillment.netlify.app","isDefault":false}]' + SPRYKER_OAUTH_CLIENT_CONFIGURATION: '[{"identifier":"frontend","secret":"3kcZT0IODXIHcaqf8YRgrUKNeFJQutQJLvtgu4rVrHK2G6Mh","isConfidential":true,"name":"Customer client","redirectUri":null,"isDefault":true},{"identifier":"b2c-fulfillment-demo","secret":"3kcZT0IODXIHcaqf8YRgrUKNeFJQutQJLvtgu4rVrHK2G6Mh","isConfidential":false,"name":"Fulfillment dev","redirectUri":"https://dev-b2c-fulfillment.netlify.app","isDefault":false}]' node: version: 18 npm: 9 From db2dcbbfc6d32d504d10598fdf241174bd005e31 Mon Sep 17 00:00:00 2001 From: Dmytro Asieiev Date: Thu, 12 Oct 2023 15:39:06 +0300 Subject: [PATCH 07/16] Added missing plugins. --- src/Pyz/Zed/Oauth/OauthDependencyProvider.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Pyz/Zed/Oauth/OauthDependencyProvider.php b/src/Pyz/Zed/Oauth/OauthDependencyProvider.php index 4799139f5a..8fc5d37e01 100644 --- a/src/Pyz/Zed/Oauth/OauthDependencyProvider.php +++ b/src/Pyz/Zed/Oauth/OauthDependencyProvider.php @@ -17,6 +17,8 @@ use Spryker\Zed\OauthAgentConnector\Communication\Plugin\Oauth\AgentCredentialsOauthGrantTypeConfigurationProviderPlugin; use Spryker\Zed\OauthAgentConnector\Communication\Plugin\Oauth\AgentOauthScopeProviderPlugin; use Spryker\Zed\OauthAgentConnector\Communication\Plugin\Oauth\AgentOauthUserProviderPlugin; +use Spryker\Zed\OauthCodeFlow\Communication\Plugin\Oauth\CustomerAuthCodeOauthRequestGrantTypeConfigurationProviderPlugin; +use Spryker\Zed\OauthCodeFlow\Communication\Plugin\Oauth\UserAuthCodeOauthRequestGrantTypeConfigurationProviderPlugin; use Spryker\Zed\OauthCustomerConnector\Communication\Plugin\Oauth\CustomerImpersonationOauthGrantTypeConfigurationProviderPlugin; use Spryker\Zed\OauthCustomerConnector\Communication\Plugin\Oauth\CustomerImpersonationOauthScopeProviderPlugin; use Spryker\Zed\OauthCustomerConnector\Communication\Plugin\Oauth\CustomerImpersonationOauthUserProviderPlugin; @@ -164,6 +166,8 @@ protected function getOauthRequestGrantTypeConfigurationProviderPlugins(): array new UserPasswordOauthRequestGrantTypeConfigurationProviderPlugin(), new CustomerPasswordOauthRequestGrantTypeConfigurationProviderPlugin(), new WarehouseOauthRequestGrantTypeConfigurationProviderPlugin(), + new UserAuthCodeOauthRequestGrantTypeConfigurationProviderPlugin(), + new CustomerAuthCodeOauthRequestGrantTypeConfigurationProviderPlugin(), ]; } From 7373b0e29eb340e3ec679cf50b05919ab470c5b2 Mon Sep 17 00:00:00 2001 From: Dmitriy Aseev Date: Fri, 13 Oct 2023 14:01:24 +0300 Subject: [PATCH 08/16] Removed unused constants. --- deploy.spryker-b2cintt.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy.spryker-b2cintt.yml b/deploy.spryker-b2cintt.yml index 0297552b72..b1e4cdc54a 100644 --- a/deploy.spryker-b2cintt.yml +++ b/deploy.spryker-b2cintt.yml @@ -20,7 +20,6 @@ image: SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PUBLIC_KEY: 'BGqNWbv0hWM5CQ1-KwAfSQBMC6TMVFyrnh3vQp37oGCNvQ6eG_HyMjxBFJRWeCPTbzDoxcjhxLJS8Ck8r1G2oFw' SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PRIVATE_KEY: 'UK6DywwjKITPpRHBSY9TLPIXm6BPrHX40sseIoXT9c8' SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_SUBJECT: 'https://spryker.com' - SPRYKER_OAUTH_CLIENT_CONFIGURATION: '[{"identifier":"frontend","secret":"3kcZT0IODXIHcaqf8YRgrUKNeFJQutQJLvtgu4rVrHK2G6Mh","isConfidential":true,"name":"Customer client","redirectUri":null,"isDefault":true},{"identifier":"b2c-fulfillment-demo","secret":"3kcZT0IODXIHcaqf8YRgrUKNeFJQutQJLvtgu4rVrHK2G6Mh","isConfidential":false,"name":"Fulfillment dev","redirectUri":"https://dev-b2c-fulfillment.netlify.app","isDefault":false}]' node: version: 18 npm: 9 From fd44bed1aa3076d8956edb7b92e208d352e24395 Mon Sep 17 00:00:00 2001 From: Dmitriy Aseev Date: Fri, 13 Oct 2023 14:04:22 +0300 Subject: [PATCH 09/16] Added propel classes. --- .../Persistence/SpyOauthCodeFlowAuthCode.php | 19 +++++++++++++++++++ .../SpyOauthCodeFlowAuthCodeQuery.php | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 src/Orm/Zed/OauthCodeFlow/Persistence/SpyOauthCodeFlowAuthCode.php create mode 100644 src/Orm/Zed/OauthCodeFlow/Persistence/SpyOauthCodeFlowAuthCodeQuery.php diff --git a/src/Orm/Zed/OauthCodeFlow/Persistence/SpyOauthCodeFlowAuthCode.php b/src/Orm/Zed/OauthCodeFlow/Persistence/SpyOauthCodeFlowAuthCode.php new file mode 100644 index 0000000000..89ecc298ca --- /dev/null +++ b/src/Orm/Zed/OauthCodeFlow/Persistence/SpyOauthCodeFlowAuthCode.php @@ -0,0 +1,19 @@ + Date: Fri, 20 Oct 2023 16:55:00 +0300 Subject: [PATCH 10/16] Adjusted oauth package + adjusted oauth configurations. --- composer.lock | 14 +++++++------- config/Shared/config_default.php | 22 +++++++++++++++++++++- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index 9e38d11555..4cd3fd7de1 100644 --- a/composer.lock +++ b/composer.lock @@ -28753,16 +28753,16 @@ }, { "name": "spryker/oauth", - "version": "2.11.0", + "version": "2.11.1", "source": { "type": "git", "url": "https://github.com/spryker/oauth.git", - "reference": "1fe3b46b26e0986e288facde0cb3d8b3c3ef9867" + "reference": "278a7c1944d1d633623fe66c6e508a346b0979d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/oauth/zipball/1fe3b46b26e0986e288facde0cb3d8b3c3ef9867", - "reference": "1fe3b46b26e0986e288facde0cb3d8b3c3ef9867", + "url": "https://api.github.com/repos/spryker/oauth/zipball/278a7c1944d1d633623fe66c6e508a346b0979d3", + "reference": "278a7c1944d1d633623fe66c6e508a346b0979d3", "shasum": "" }, "require": { @@ -28811,9 +28811,9 @@ ], "description": "Oauth module", "support": { - "source": "https://github.com/spryker/oauth/tree/2.11.0" + "source": "https://github.com/spryker/oauth/tree/2.11.1" }, - "time": "2023-07-21T10:16:46+00:00" + "time": "2023-10-18T12:42:03+00:00" }, { "name": "spryker/oauth-agent-connector", @@ -60342,5 +60342,5 @@ "platform-overrides": { "php": "8.0.9" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php index 95158e5d62..8ce9e9055c 100644 --- a/config/Shared/config_default.php +++ b/config/Shared/config_default.php @@ -247,7 +247,27 @@ getenv('SPRYKER_OAUTH_KEY_PUBLIC') ?: '', ) ?: null; $config[OauthConstants::ENCRYPTION_KEY] = getenv('SPRYKER_OAUTH_ENCRYPTION_KEY') ?: null; -$config[OauthConstants::OAUTH_CLIENT_CONFIGURATION] = json_decode(getenv('SPRYKER_OAUTH_CLIENT_CONFIGURATION'), true) ?: []; +$config[OauthConstants::OAUTH_CLIENT_CONFIGURATION] = array_merge( + json_decode(getenv('SPRYKER_OAUTH_CLIENT_CONFIGURATION'), true) ?: [], + [ + [ + 'identifier' => 'fulfillment-client-b2c-local', + 'secret' => null, + 'isConfidential' => false, + 'name' => 'Fulfillment b2c local', + 'redirectUri' => 'http://localhost:4200', + 'isDefault' => false, + ], + [ + 'identifier' => 'fulfillment-client-b2c-dev', + 'secret' => null, + 'isConfidential' => false, + 'name' => 'Fulfillment b2c dev', + 'redirectUri' => 'https://dev-b2c-fulfillment.netlify.app', + 'isDefault' => false, + ], + ], +); // >> ZED REQUEST From 32abc96a8632a55c2871a674aeb9e7a862fa616e Mon Sep 17 00:00:00 2001 From: Dmitriy Aseev Date: Fri, 20 Oct 2023 18:28:27 +0300 Subject: [PATCH 11/16] Adjusted oauth package + adjusted oauth configurations. --- config/Shared/config_default.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php index 8ce9e9055c..ada407cc36 100644 --- a/config/Shared/config_default.php +++ b/config/Shared/config_default.php @@ -255,7 +255,7 @@ 'secret' => null, 'isConfidential' => false, 'name' => 'Fulfillment b2c local', - 'redirectUri' => 'http://localhost:4200', + 'redirectUri' => 'http://localhost:4200/oauth/cb/spryker', 'isDefault' => false, ], [ @@ -263,7 +263,7 @@ 'secret' => null, 'isConfidential' => false, 'name' => 'Fulfillment b2c dev', - 'redirectUri' => 'https://dev-b2c-fulfillment.netlify.app', + 'redirectUri' => 'https://dev-b2c-fulfillment.netlify.app/oauth/cb/spryker', 'isDefault' => false, ], ], From 546a74ce2a17e5042f59c950569d1f0d70f46bf0 Mon Sep 17 00:00:00 2001 From: Dmitriy Aseev Date: Tue, 24 Oct 2023 13:17:47 +0300 Subject: [PATCH 12/16] Adjusted deploy configuration. --- deploy.spryker-b2cintt.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy.spryker-b2cintt.yml b/deploy.spryker-b2cintt.yml index b1e4cdc54a..6a6f1a069c 100644 --- a/deploy.spryker-b2cintt.yml +++ b/deploy.spryker-b2cintt.yml @@ -126,9 +126,10 @@ groups: endpoints: glue-backend.de.b2c.internal-testing.demo-spryker.com: store: DE + cors-allow-origin: '*' glue-backend.at.b2c.internal-testing.demo-spryker.com: - store: - AT + store: AT + cors-allow-origin: '*' services: database: engine: mysql From 24933f72e382d56d3396fd4a94cb9c379e783ecf Mon Sep 17 00:00:00 2001 From: Dmitriy Aseev Date: Wed, 25 Oct 2023 16:19:22 +0300 Subject: [PATCH 13/16] Merged latest fixes from internal branch [skip ci] --- composer.json | 6 +- composer.lock | 153 +++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 137 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index ea63fba4c2..626212ed90 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "ext-pgsql": "*", "ext-readline": "*", "ext-redis": "*", - "spryker-eco/authorization-picking-app-backend-api": "^0.1.0", + "spryker-eco/authorization-picking-app-backend-api": "^0.2.0", "spryker-eco/loggly": "^0.1.1", "spryker-feature/agent-assist": "^202307.0", "spryker-feature/alternative-products": "^202307.0", @@ -132,9 +132,9 @@ "spryker/flysystem-local-file-system": "^2.0.0", "spryker/gift-card-mail-connector": "^1.2.0", "spryker/gift-cards-rest-api": "^1.0.0", - "spryker/glue-backend-api-application-authorization-connector": "^1.2.0", + "spryker/glue-backend-api-application-authorization-connector": "^1.6.0", "spryker/glue-backend-api-application-glue-json-api-convention-connector": "^1.0.0", - "spryker/glue-storefront-api-application-authorization-connector": "^1.0.2", + "spryker/glue-storefront-api-application-authorization-connector": "^1.1.0", "spryker/glue-storefront-api-application-glue-json-api-convention-connector": "^1.0.0", "spryker/message-broker": "^1.9.0", "spryker/message-broker-aws": "^1.5.1", diff --git a/composer.lock b/composer.lock index 8a7fd3e988..b10ca3f5d7 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": "119690a901b37c478b423e844f4ebd41", + "content-hash": "4dc03ab27274f4929d1c17f52d9a5532", "packages": [ { "name": "async-aws/core", @@ -4791,6 +4791,74 @@ ], "time": "2020-11-03T09:10:25+00:00" }, + { + "name": "spryker-eco/authorization-picking-app-backend-api", + "version": "0.2.0", + "source": { + "type": "git", + "url": "https://github.com/spryker-eco/authorization-picking-app-backend-api.git", + "reference": "df2e0642e80d3f72034d8022773a2906c644abc4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker-eco/authorization-picking-app-backend-api/zipball/df2e0642e80d3f72034d8022773a2906c644abc4", + "reference": "df2e0642e80d3f72034d8022773a2906c644abc4", + "shasum": "" + }, + "require": { + "php": ">=8.0", + "psr/http-message": "^1.0.0", + "spryker/glue-application-extension": "^1.10.0", + "spryker/guzzle": "^2.0.0", + "spryker/kernel": "^3.52.0", + "spryker/oauth": "^2.7.0", + "spryker/oauth-code-flow": "^0.1.0", + "spryker/propel-orm": "^1.16.0", + "spryker/symfony": "^3.0.0", + "spryker/transfer": "^3.33.1", + "spryker/user": "^3.9.0", + "spryker/util-encoding": "^2.1.1" + }, + "require-dev": { + "codeception/module-asserts": "^3.0.0", + "phpstan/phpstan": "1.8.10", + "phpunit/phpunit": "^9.0.0", + "spryker/application": "*", + "spryker/code-sniffer": "*", + "spryker/config": "*", + "spryker/error-handler": "*", + "spryker/glue-application": "^1.39.0", + "spryker/log": "*", + "spryker/monolog": "*", + "spryker/propel": "^3.35.1", + "spryker/queue": "*", + "spryker/testify": "^3.47.0" + }, + "suggest": { + "spryker/glue-application": "If you want to use plugins with glue application." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "SprykerEco\\": "src/SprykerEco/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "AuthorizationPickingAppBackendApi module", + "support": { + "issues": "https://github.com/spryker-eco/authorization-picking-app-backend-api/issues", + "source": "https://github.com/spryker-eco/authorization-picking-app-backend-api/tree/0.2.0" + }, + "time": "2023-05-23T06:57:37+00:00" + }, { "name": "spryker-eco/loggly", "version": "0.1.1", @@ -26242,16 +26310,16 @@ }, { "name": "spryker/glue-backend-api-application-authorization-connector", - "version": "1.4.0", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/spryker/glue-backend-api-application-authorization-connector.git", - "reference": "ca9055f8e2531717d6aee1d6c9d0ff6e0e0cac9b" + "reference": "7d8791807a6b072603c456d068e8d973093787e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/glue-backend-api-application-authorization-connector/zipball/ca9055f8e2531717d6aee1d6c9d0ff6e0e0cac9b", - "reference": "ca9055f8e2531717d6aee1d6c9d0ff6e0e0cac9b", + "url": "https://api.github.com/repos/spryker/glue-backend-api-application-authorization-connector/zipball/7d8791807a6b072603c456d068e8d973093787e2", + "reference": "7d8791807a6b072603c456d068e8d973093787e2", "shasum": "" }, "require": { @@ -26287,9 +26355,9 @@ ], "description": "GlueBackendApiApplicationAuthorizationConnector module", "support": { - "source": "https://github.com/spryker/glue-backend-api-application-authorization-connector/tree/1.4.0" + "source": "https://github.com/spryker/glue-backend-api-application-authorization-connector/tree/1.6.0" }, - "time": "2023-09-27T16:08:39+00:00" + "time": "2023-10-25T12:59:42+00:00" }, { "name": "spryker/glue-backend-api-application-authorization-connector-extension", @@ -26527,16 +26595,16 @@ }, { "name": "spryker/glue-storefront-api-application-authorization-connector", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/spryker/glue-storefront-api-application-authorization-connector.git", - "reference": "1b9a421cd9879193960f666475dd4a98f9a46cde" + "reference": "2118e5c7fcbd4b516861a5e02eba4366b9f699f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/glue-storefront-api-application-authorization-connector/zipball/1b9a421cd9879193960f666475dd4a98f9a46cde", - "reference": "1b9a421cd9879193960f666475dd4a98f9a46cde", + "url": "https://api.github.com/repos/spryker/glue-storefront-api-application-authorization-connector/zipball/2118e5c7fcbd4b516861a5e02eba4366b9f699f5", + "reference": "2118e5c7fcbd4b516861a5e02eba4366b9f699f5", "shasum": "" }, "require": { @@ -26571,9 +26639,9 @@ ], "description": "GlueStorefrontApiApplicationAuthorizationConnector module", "support": { - "source": "https://github.com/spryker/glue-storefront-api-application-authorization-connector/tree/1.0.2" + "source": "https://github.com/spryker/glue-storefront-api-application-authorization-connector/tree/1.1.0" }, - "time": "2023-05-15T15:35:26+00:00" + "time": "2023-10-25T12:59:42+00:00" }, { "name": "spryker/glue-storefront-api-application-glue-json-api-convention-connector", @@ -28787,16 +28855,16 @@ }, { "name": "spryker/oauth", - "version": "2.11.0", + "version": "2.11.1", "source": { "type": "git", "url": "https://github.com/spryker/oauth.git", - "reference": "1fe3b46b26e0986e288facde0cb3d8b3c3ef9867" + "reference": "278a7c1944d1d633623fe66c6e508a346b0979d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/oauth/zipball/1fe3b46b26e0986e288facde0cb3d8b3c3ef9867", - "reference": "1fe3b46b26e0986e288facde0cb3d8b3c3ef9867", + "url": "https://api.github.com/repos/spryker/oauth/zipball/278a7c1944d1d633623fe66c6e508a346b0979d3", + "reference": "278a7c1944d1d633623fe66c6e508a346b0979d3", "shasum": "" }, "require": { @@ -28845,9 +28913,9 @@ ], "description": "Oauth module", "support": { - "source": "https://github.com/spryker/oauth/tree/2.11.0" + "source": "https://github.com/spryker/oauth/tree/2.11.1" }, - "time": "2023-07-21T10:16:46+00:00" + "time": "2023-10-18T12:42:03+00:00" }, { "name": "spryker/oauth-agent-connector", @@ -29194,6 +29262,53 @@ }, "time": "2022-04-26T12:27:56+00:00" }, + { + "name": "spryker/oauth-code-flow", + "version": "0.1.1", + "source": { + "type": "git", + "url": "https://github.com/spryker/oauth-code-flow.git", + "reference": "a81858f78f2553886397b3e786414d2f1e90da31" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/oauth-code-flow/zipball/a81858f78f2553886397b3e786414d2f1e90da31", + "reference": "a81858f78f2553886397b3e786414d2f1e90da31", + "shasum": "" + }, + "require": { + "php": ">=8.0", + "psr/http-message": "^1.0.0", + "spryker/kernel": "^3.30.0", + "spryker/oauth": "^2.7.0", + "spryker/oauth-extension": "^1.7.0", + "spryker/transfer": "^3.25.0" + }, + "require-dev": { + "spryker/code-sniffer": "*", + "spryker/testify": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "OauthCodeFlow module", + "support": { + "source": "https://github.com/spryker/oauth-code-flow/tree/0.1.1" + }, + "time": "2023-10-23T12:53:08+00:00" + }, { "name": "spryker/oauth-cryptography", "version": "1.0.1", From d1ae92328f5be004ea0b17f3a18c743fd74f92f3 Mon Sep 17 00:00:00 2001 From: Dmytro Asieiev Date: Tue, 24 Sep 2024 13:02:02 +0300 Subject: [PATCH 14/16] CC-33254 Add required user scopes config [skip ci] --- composer.json | 1 + composer.lock | 117 +++++++++++++++++- ...uthorizationPickingAppBackendApiConfig.php | 23 ++++ 3 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 src/Pyz/Zed/AuthorizationPickingAppBackendApi/AuthorizationPickingAppBackendApiConfig.php diff --git a/composer.json b/composer.json index a4a81fd119..0dc6c3ee2a 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,7 @@ "ext-readline": "*", "ext-redis": "*", "galbar/jsonpath": "^1.3.1", + "spryker-eco/authorization-picking-app-backend-api": "^0.2.0", "spryker-eco/loggly": "^0.1.1", "spryker-feature/agent-assist": "dev-master as 202407.0", "spryker-feature/alternative-products": "^202404.0", diff --git a/composer.lock b/composer.lock index 4b6cc53d2e..bd562be13b 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": "843228d2814babdc4268de45fafdbc60", + "content-hash": "058034983400fff24e2789a1e58cbbff", "packages": [ { "name": "async-aws/core", @@ -5160,6 +5160,74 @@ ], "time": "2024-03-30T18:03:49+00:00" }, + { + "name": "spryker-eco/authorization-picking-app-backend-api", + "version": "0.2.0", + "source": { + "type": "git", + "url": "https://github.com/spryker-eco/authorization-picking-app-backend-api.git", + "reference": "df2e0642e80d3f72034d8022773a2906c644abc4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker-eco/authorization-picking-app-backend-api/zipball/df2e0642e80d3f72034d8022773a2906c644abc4", + "reference": "df2e0642e80d3f72034d8022773a2906c644abc4", + "shasum": "" + }, + "require": { + "php": ">=8.0", + "psr/http-message": "^1.0.0", + "spryker/glue-application-extension": "^1.10.0", + "spryker/guzzle": "^2.0.0", + "spryker/kernel": "^3.52.0", + "spryker/oauth": "^2.7.0", + "spryker/oauth-code-flow": "^0.1.0", + "spryker/propel-orm": "^1.16.0", + "spryker/symfony": "^3.0.0", + "spryker/transfer": "^3.33.1", + "spryker/user": "^3.9.0", + "spryker/util-encoding": "^2.1.1" + }, + "require-dev": { + "codeception/module-asserts": "^3.0.0", + "phpstan/phpstan": "1.8.10", + "phpunit/phpunit": "^9.0.0", + "spryker/application": "*", + "spryker/code-sniffer": "*", + "spryker/config": "*", + "spryker/error-handler": "*", + "spryker/glue-application": "^1.39.0", + "spryker/log": "*", + "spryker/monolog": "*", + "spryker/propel": "^3.35.1", + "spryker/queue": "*", + "spryker/testify": "^3.47.0" + }, + "suggest": { + "spryker/glue-application": "If you want to use plugins with glue application." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "SprykerEco\\": "src/SprykerEco/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "AuthorizationPickingAppBackendApi module", + "support": { + "issues": "https://github.com/spryker-eco/authorization-picking-app-backend-api/issues", + "source": "https://github.com/spryker-eco/authorization-picking-app-backend-api/tree/0.2.0" + }, + "time": "2023-05-23T06:57:37+00:00" + }, { "name": "spryker-eco/loggly", "version": "0.1.1", @@ -29987,6 +30055,53 @@ }, "time": "2022-04-26T12:27:56+00:00" }, + { + "name": "spryker/oauth-code-flow", + "version": "0.1.1", + "source": { + "type": "git", + "url": "https://github.com/spryker/oauth-code-flow.git", + "reference": "a81858f78f2553886397b3e786414d2f1e90da31" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/oauth-code-flow/zipball/a81858f78f2553886397b3e786414d2f1e90da31", + "reference": "a81858f78f2553886397b3e786414d2f1e90da31", + "shasum": "" + }, + "require": { + "php": ">=8.0", + "psr/http-message": "^1.0.0", + "spryker/kernel": "^3.30.0", + "spryker/oauth": "^2.7.0", + "spryker/oauth-extension": "^1.7.0", + "spryker/transfer": "^3.25.0" + }, + "require-dev": { + "spryker/code-sniffer": "*", + "spryker/testify": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "OauthCodeFlow module", + "support": { + "source": "https://github.com/spryker/oauth-code-flow/tree/0.1.1" + }, + "time": "2023-10-23T12:53:08+00:00" + }, { "name": "spryker/oauth-cryptography", "version": "1.0.1", diff --git a/src/Pyz/Zed/AuthorizationPickingAppBackendApi/AuthorizationPickingAppBackendApiConfig.php b/src/Pyz/Zed/AuthorizationPickingAppBackendApi/AuthorizationPickingAppBackendApiConfig.php new file mode 100644 index 0000000000..7a1db0fd56 --- /dev/null +++ b/src/Pyz/Zed/AuthorizationPickingAppBackendApi/AuthorizationPickingAppBackendApiConfig.php @@ -0,0 +1,23 @@ + + */ + public function getUserScopes(): array + { + return [ + 'warehouse-user', + ]; + } +} From 7507e59ff5f19a61a3282a6a28d65610cc47345b Mon Sep 17 00:00:00 2001 From: Dmytro Asieiev Date: Wed, 23 Oct 2024 11:53:08 +0300 Subject: [PATCH 15/16] Added eco module after merge [skip ci] --- composer.lock | 117 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index e8075f7541..2b0766c378 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": "0d7be52aa6467082c5a7ad8e3be0ed82", + "content-hash": "d6f88ffb93028460f6c06647027bb146", "packages": [ { "name": "async-aws/core", @@ -5160,6 +5160,74 @@ ], "time": "2024-03-30T18:03:49+00:00" }, + { + "name": "spryker-eco/authorization-picking-app-backend-api", + "version": "0.2.0", + "source": { + "type": "git", + "url": "https://github.com/spryker-eco/authorization-picking-app-backend-api.git", + "reference": "df2e0642e80d3f72034d8022773a2906c644abc4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker-eco/authorization-picking-app-backend-api/zipball/df2e0642e80d3f72034d8022773a2906c644abc4", + "reference": "df2e0642e80d3f72034d8022773a2906c644abc4", + "shasum": "" + }, + "require": { + "php": ">=8.0", + "psr/http-message": "^1.0.0", + "spryker/glue-application-extension": "^1.10.0", + "spryker/guzzle": "^2.0.0", + "spryker/kernel": "^3.52.0", + "spryker/oauth": "^2.7.0", + "spryker/oauth-code-flow": "^0.1.0", + "spryker/propel-orm": "^1.16.0", + "spryker/symfony": "^3.0.0", + "spryker/transfer": "^3.33.1", + "spryker/user": "^3.9.0", + "spryker/util-encoding": "^2.1.1" + }, + "require-dev": { + "codeception/module-asserts": "^3.0.0", + "phpstan/phpstan": "1.8.10", + "phpunit/phpunit": "^9.0.0", + "spryker/application": "*", + "spryker/code-sniffer": "*", + "spryker/config": "*", + "spryker/error-handler": "*", + "spryker/glue-application": "^1.39.0", + "spryker/log": "*", + "spryker/monolog": "*", + "spryker/propel": "^3.35.1", + "spryker/queue": "*", + "spryker/testify": "^3.47.0" + }, + "suggest": { + "spryker/glue-application": "If you want to use plugins with glue application." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "SprykerEco\\": "src/SprykerEco/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "AuthorizationPickingAppBackendApi module", + "support": { + "issues": "https://github.com/spryker-eco/authorization-picking-app-backend-api/issues", + "source": "https://github.com/spryker-eco/authorization-picking-app-backend-api/tree/0.2.0" + }, + "time": "2023-05-23T06:57:37+00:00" + }, { "name": "spryker-eco/loggly", "version": "0.1.1", @@ -30251,6 +30319,53 @@ }, "time": "2022-04-26T12:27:56+00:00" }, + { + "name": "spryker/oauth-code-flow", + "version": "0.1.1", + "source": { + "type": "git", + "url": "https://github.com/spryker/oauth-code-flow.git", + "reference": "a81858f78f2553886397b3e786414d2f1e90da31" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/oauth-code-flow/zipball/a81858f78f2553886397b3e786414d2f1e90da31", + "reference": "a81858f78f2553886397b3e786414d2f1e90da31", + "shasum": "" + }, + "require": { + "php": ">=8.0", + "psr/http-message": "^1.0.0", + "spryker/kernel": "^3.30.0", + "spryker/oauth": "^2.7.0", + "spryker/oauth-extension": "^1.7.0", + "spryker/transfer": "^3.25.0" + }, + "require-dev": { + "spryker/code-sniffer": "*", + "spryker/testify": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "OauthCodeFlow module", + "support": { + "source": "https://github.com/spryker/oauth-code-flow/tree/0.1.1" + }, + "time": "2023-10-23T12:53:08+00:00" + }, { "name": "spryker/oauth-cryptography", "version": "1.0.1", From 963882f4e5545ec2fb7690b11c7756a509819a92 Mon Sep 17 00:00:00 2001 From: Dmytro Asieiev Date: Wed, 23 Oct 2024 14:49:25 +0300 Subject: [PATCH 16/16] Disabled cors for backend-api [skip ci] --- deploy.dev.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy.dev.yml b/deploy.dev.yml index d1a8672ea1..7f389f6cae 100644 --- a/deploy.dev.yml +++ b/deploy.dev.yml @@ -109,6 +109,7 @@ groups: endpoints: glue-backend.eu.spryker.local: region: EU + cors-allow-origin: '*' backoffice_eu: application: backoffice endpoints: @@ -157,6 +158,7 @@ groups: endpoints: glue-backend.us.spryker.local: region: US + cors-allow-origin: '*' backoffice_us: application: backoffice endpoints: