diff --git a/CHANGELOG.md b/CHANGELOG.md index db9da10a4..5313f966d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +2.4.4 +============= +* Added support for versions: + + * Magento Open Source: 2.4.4 + * Magento Commerce: 2.4.4 + +* Fixed bugs: + + * New monolog version caused composer dependency conflict + * Customer login is not working after Migration from Magento 1.x + +2.4.3 +============= +* Added support for versions: + + * Magento Open Source: 2.4.3 + * Magento Commerce: 2.4.3 + +* Fixed bugs: + + * Delta fix the wrong table prefix + 2.4.2 ============= * Added support for versions: diff --git a/README.md b/README.md index e73a3b6a0..fb219a4eb 100644 --- a/README.md +++ b/README.md @@ -58,16 +58,17 @@ This section discusses how to install the Magento Data Migration Tool. You can i ### Install the tool from GitHub To install the migration tool from GitHub, use the following steps: -1. Log in to your Magento 2 server as a user with privileges to write to the Magento 2 file system or switch to the web server user. -2. Go to Magento 2 root directory. -3. Enter the following commands: +1. Log in to your Magento 2 server as a user with privileges to write to the Magento 2 file system or switch to the web server user. +2. Go to Magento 2 root directory. +3. Enter the following commands: composer config repositories.data-migration-tool git https://github.com/magento/data-migration-tool composer require magento/data-migration-tool: + bin/magento module:enable Magento_DataMigrationTool - where `` is release version (e.g. 2.4.0) + where `` is release version (e.g. 2.4.4) -3. Wait while dependencies are updated. +5. Wait while dependencies are updated and the tool is enabled. ### Install the tool from repo.magento.com To install the Data Migration Tool, you must update `composer.json` in the Magento root installation directory to provide the location of the migration tool package. @@ -82,15 +83,15 @@ To install the migration tool, you must: To update `composer.json`: -1. Log in to your Magento server as the web server user or as a user with `root` privileges. +1. Log in to your Magento server as the web server user or as a user with `root` privileges. -2. Change to your Magento installation directory. +2. Change to your Magento installation directory. -3. Enter the following command to reference Magento packages in `composer.json`: +3. Enter the following command to reference Magento packages in `composer.json`: composer config repositories.magento composer https://repo.magento.com -4. Enter the following command to require the current version of the package: +4. Enter the following command to require the current version of the package: composer require magento/data-migration-tool: @@ -98,13 +99,16 @@ To update `composer.json`: Exact version example: - composer require magento/data-migration-tool:2.4.0 + composer require magento/data-migration-tool:2.4.4 Next significant release example: composer require magento/data-migration-tool:~2.4 -5. Wait while dependencies are installed. +5. Wait while dependencies are installed. +6. Enter the following command to enable the tool + + bin/magento module:enable Magento_DataMigrationTool ## More details See the Migration Guide for the detailed help with your data migration process. diff --git a/composer.json b/composer.json index 6406058df..02c3e3dcf 100644 --- a/composer.json +++ b/composer.json @@ -1,14 +1,14 @@ { "name": "magento/data-migration-tool", "description": "Migration Tool", - "version": "2.4.3", + "version": "2.4.4", "require": { "symfony/console": "~4.4.0", "magento/framework": "*", - "monolog/monolog": "^1.17" + "monolog/monolog": "^2.3" }, "require-dev": { - "phpunit/phpunit": "^9" + "phpunit/phpunit": "~9.5.0" }, "autoload": { "psr-4": {"Migration\\": "src/Migration"}, diff --git a/etc/commerce-to-commerce/1.11.0.0/map.xml.dist b/etc/commerce-to-commerce/1.11.0.0/map.xml.dist index 66c96334b..38fe49d97 100644 --- a/etc/commerce-to-commerce/1.11.0.0/map.xml.dist +++ b/etc/commerce-to-commerce/1.11.0.0/map.xml.dist @@ -2884,6 +2884,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.11.0.1/map.xml.dist b/etc/commerce-to-commerce/1.11.0.1/map.xml.dist index f1c334760..370908e9e 100644 --- a/etc/commerce-to-commerce/1.11.0.1/map.xml.dist +++ b/etc/commerce-to-commerce/1.11.0.1/map.xml.dist @@ -2884,6 +2884,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.11.0.2/map.xml.dist b/etc/commerce-to-commerce/1.11.0.2/map.xml.dist index 77090831c..439f67822 100644 --- a/etc/commerce-to-commerce/1.11.0.2/map.xml.dist +++ b/etc/commerce-to-commerce/1.11.0.2/map.xml.dist @@ -2872,6 +2872,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.11.1.0/map.xml.dist b/etc/commerce-to-commerce/1.11.1.0/map.xml.dist index a64ee657a..5af483589 100644 --- a/etc/commerce-to-commerce/1.11.1.0/map.xml.dist +++ b/etc/commerce-to-commerce/1.11.1.0/map.xml.dist @@ -2860,6 +2860,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.11.2.0/map.xml.dist b/etc/commerce-to-commerce/1.11.2.0/map.xml.dist index ccca81b67..2aa02cc87 100644 --- a/etc/commerce-to-commerce/1.11.2.0/map.xml.dist +++ b/etc/commerce-to-commerce/1.11.2.0/map.xml.dist @@ -2860,6 +2860,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.12.0.0/map.xml.dist b/etc/commerce-to-commerce/1.12.0.0/map.xml.dist index 476d8107c..44bc6ec44 100644 --- a/etc/commerce-to-commerce/1.12.0.0/map.xml.dist +++ b/etc/commerce-to-commerce/1.12.0.0/map.xml.dist @@ -2782,6 +2782,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.12.0.1/map.xml.dist b/etc/commerce-to-commerce/1.12.0.1/map.xml.dist index 91fe7c495..7c75ec21e 100644 --- a/etc/commerce-to-commerce/1.12.0.1/map.xml.dist +++ b/etc/commerce-to-commerce/1.12.0.1/map.xml.dist @@ -2782,6 +2782,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.12.0.2/map.xml.dist b/etc/commerce-to-commerce/1.12.0.2/map.xml.dist index 91fe7c495..7c75ec21e 100644 --- a/etc/commerce-to-commerce/1.12.0.2/map.xml.dist +++ b/etc/commerce-to-commerce/1.12.0.2/map.xml.dist @@ -2782,6 +2782,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.13.0.0/map.xml.dist b/etc/commerce-to-commerce/1.13.0.0/map.xml.dist index 7b54f16f0..bfbcae9ec 100644 --- a/etc/commerce-to-commerce/1.13.0.0/map.xml.dist +++ b/etc/commerce-to-commerce/1.13.0.0/map.xml.dist @@ -2775,6 +2775,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.13.0.1/map.xml.dist b/etc/commerce-to-commerce/1.13.0.1/map.xml.dist index 7b54f16f0..bfbcae9ec 100644 --- a/etc/commerce-to-commerce/1.13.0.1/map.xml.dist +++ b/etc/commerce-to-commerce/1.13.0.1/map.xml.dist @@ -2775,6 +2775,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.13.0.2/map.xml.dist b/etc/commerce-to-commerce/1.13.0.2/map.xml.dist index 7b54f16f0..bfbcae9ec 100644 --- a/etc/commerce-to-commerce/1.13.0.2/map.xml.dist +++ b/etc/commerce-to-commerce/1.13.0.2/map.xml.dist @@ -2775,6 +2775,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.13.1.0/map.xml.dist b/etc/commerce-to-commerce/1.13.1.0/map.xml.dist index dcec2c76e..637301f9b 100644 --- a/etc/commerce-to-commerce/1.13.1.0/map.xml.dist +++ b/etc/commerce-to-commerce/1.13.1.0/map.xml.dist @@ -2781,6 +2781,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.0.0/map.xml.dist b/etc/commerce-to-commerce/1.14.0.0/map.xml.dist index 708c7d0a2..fb27d1b87 100644 --- a/etc/commerce-to-commerce/1.14.0.0/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.0.0/map.xml.dist @@ -2781,6 +2781,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.0.1/map.xml.dist b/etc/commerce-to-commerce/1.14.0.1/map.xml.dist index 708c7d0a2..fb27d1b87 100644 --- a/etc/commerce-to-commerce/1.14.0.1/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.0.1/map.xml.dist @@ -2781,6 +2781,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.1.0/map.xml.dist b/etc/commerce-to-commerce/1.14.1.0/map.xml.dist index 88ab36bfb..0a766d31e 100644 --- a/etc/commerce-to-commerce/1.14.1.0/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.1.0/map.xml.dist @@ -2783,6 +2783,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.2.0/map.xml.dist b/etc/commerce-to-commerce/1.14.2.0/map.xml.dist index 00feba77a..22815075b 100644 --- a/etc/commerce-to-commerce/1.14.2.0/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.2.0/map.xml.dist @@ -2820,6 +2820,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.2.1/map.xml.dist b/etc/commerce-to-commerce/1.14.2.1/map.xml.dist index 00feba77a..22815075b 100644 --- a/etc/commerce-to-commerce/1.14.2.1/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.2.1/map.xml.dist @@ -2820,6 +2820,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.2.2/map.xml.dist b/etc/commerce-to-commerce/1.14.2.2/map.xml.dist index 4dea66426..c82067ce8 100644 --- a/etc/commerce-to-commerce/1.14.2.2/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.2.2/map.xml.dist @@ -2826,6 +2826,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.2.3/map.xml.dist b/etc/commerce-to-commerce/1.14.2.3/map.xml.dist index 4dea66426..c82067ce8 100644 --- a/etc/commerce-to-commerce/1.14.2.3/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.2.3/map.xml.dist @@ -2826,6 +2826,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.2.4/map.xml.dist b/etc/commerce-to-commerce/1.14.2.4/map.xml.dist index 4dea66426..c82067ce8 100644 --- a/etc/commerce-to-commerce/1.14.2.4/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.2.4/map.xml.dist @@ -2826,6 +2826,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.3.0/map.xml.dist b/etc/commerce-to-commerce/1.14.3.0/map.xml.dist index 8eb539cda..aa5618c1d 100644 --- a/etc/commerce-to-commerce/1.14.3.0/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.3.0/map.xml.dist @@ -2838,6 +2838,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.3.1/map.xml.dist b/etc/commerce-to-commerce/1.14.3.1/map.xml.dist index ee09b1fc8..94e920552 100644 --- a/etc/commerce-to-commerce/1.14.3.1/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.3.1/map.xml.dist @@ -2798,6 +2798,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.3.10/map.xml.dist b/etc/commerce-to-commerce/1.14.3.10/map.xml.dist index a38716d68..6c91c8b2f 100644 --- a/etc/commerce-to-commerce/1.14.3.10/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.3.10/map.xml.dist @@ -2949,6 +2949,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.3.2/map.xml.dist b/etc/commerce-to-commerce/1.14.3.2/map.xml.dist index b28ec48ec..bc977f1dc 100644 --- a/etc/commerce-to-commerce/1.14.3.2/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.3.2/map.xml.dist @@ -2790,6 +2790,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.3.3/map.xml.dist b/etc/commerce-to-commerce/1.14.3.3/map.xml.dist index b28ec48ec..bc977f1dc 100644 --- a/etc/commerce-to-commerce/1.14.3.3/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.3.3/map.xml.dist @@ -2790,6 +2790,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.3.4/map.xml.dist b/etc/commerce-to-commerce/1.14.3.4/map.xml.dist index 269959464..47fd90226 100644 --- a/etc/commerce-to-commerce/1.14.3.4/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.3.4/map.xml.dist @@ -2943,6 +2943,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.3.6/map.xml.dist b/etc/commerce-to-commerce/1.14.3.6/map.xml.dist index 269959464..47fd90226 100644 --- a/etc/commerce-to-commerce/1.14.3.6/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.3.6/map.xml.dist @@ -2943,6 +2943,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.3.7/map.xml.dist b/etc/commerce-to-commerce/1.14.3.7/map.xml.dist index 269959464..47fd90226 100644 --- a/etc/commerce-to-commerce/1.14.3.7/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.3.7/map.xml.dist @@ -2943,6 +2943,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.3.8/map.xml.dist b/etc/commerce-to-commerce/1.14.3.8/map.xml.dist index 269959464..47fd90226 100644 --- a/etc/commerce-to-commerce/1.14.3.8/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.3.8/map.xml.dist @@ -2943,6 +2943,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.3.9/map.xml.dist b/etc/commerce-to-commerce/1.14.3.9/map.xml.dist index a38716d68..6c91c8b2f 100644 --- a/etc/commerce-to-commerce/1.14.3.9/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.3.9/map.xml.dist @@ -2949,6 +2949,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.4.0/map.xml.dist b/etc/commerce-to-commerce/1.14.4.0/map.xml.dist index a38716d68..6c91c8b2f 100644 --- a/etc/commerce-to-commerce/1.14.4.0/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.4.0/map.xml.dist @@ -2949,6 +2949,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.4.1/map.xml.dist b/etc/commerce-to-commerce/1.14.4.1/map.xml.dist index c5f91d91d..78667c74d 100644 --- a/etc/commerce-to-commerce/1.14.4.1/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.4.1/map.xml.dist @@ -2952,6 +2952,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.4.2/map.xml.dist b/etc/commerce-to-commerce/1.14.4.2/map.xml.dist index c5f91d91d..78667c74d 100644 --- a/etc/commerce-to-commerce/1.14.4.2/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.4.2/map.xml.dist @@ -2952,6 +2952,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.4.3/map.xml.dist b/etc/commerce-to-commerce/1.14.4.3/map.xml.dist index c5f91d91d..78667c74d 100644 --- a/etc/commerce-to-commerce/1.14.4.3/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.4.3/map.xml.dist @@ -2952,6 +2952,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.4.4/map.xml.dist b/etc/commerce-to-commerce/1.14.4.4/map.xml.dist index c5f91d91d..78667c74d 100644 --- a/etc/commerce-to-commerce/1.14.4.4/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.4.4/map.xml.dist @@ -2952,6 +2952,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/1.14.4.5/map.xml.dist b/etc/commerce-to-commerce/1.14.4.5/map.xml.dist index c5f91d91d..78667c74d 100644 --- a/etc/commerce-to-commerce/1.14.4.5/map.xml.dist +++ b/etc/commerce-to-commerce/1.14.4.5/map.xml.dist @@ -2952,6 +2952,9 @@ email_coupon_attribute + + jwt_auth_revoked + diff --git a/etc/commerce-to-commerce/map-customer.xml.dist b/etc/commerce-to-commerce/map-customer.xml.dist index 53820a7c0..d7a67d6bd 100644 --- a/etc/commerce-to-commerce/map-customer.xml.dist +++ b/etc/commerce-to-commerce/map-customer.xml.dist @@ -100,6 +100,9 @@ customer_entity.gender + + customer_entity.session_cutoff + customer_address_entity.city diff --git a/etc/commerce-to-commerce/map-log.xml.dist b/etc/commerce-to-commerce/map-log.xml.dist index b0437a826..193ff57c5 100644 --- a/etc/commerce-to-commerce/map-log.xml.dist +++ b/etc/commerce-to-commerce/map-log.xml.dist @@ -15,15 +15,16 @@ - - log_visitor.first_visit_at - log_visitor.last_url_id log_visitor.store_id + + log_visitor.first_visit_at + customer_visitor.created_at + diff --git a/etc/opensource-to-commerce/1.6.0.0/map.xml.dist b/etc/opensource-to-commerce/1.6.0.0/map.xml.dist index 689e2ca6d..705c3c0bc 100644 --- a/etc/opensource-to-commerce/1.6.0.0/map.xml.dist +++ b/etc/opensource-to-commerce/1.6.0.0/map.xml.dist @@ -2486,6 +2486,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.6.1.0/map.xml.dist b/etc/opensource-to-commerce/1.6.1.0/map.xml.dist index 19ab93dbe..be6942585 100644 --- a/etc/opensource-to-commerce/1.6.1.0/map.xml.dist +++ b/etc/opensource-to-commerce/1.6.1.0/map.xml.dist @@ -2501,6 +2501,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.6.2.0/map.xml.dist b/etc/opensource-to-commerce/1.6.2.0/map.xml.dist index 8f928c75c..532306816 100644 --- a/etc/opensource-to-commerce/1.6.2.0/map.xml.dist +++ b/etc/opensource-to-commerce/1.6.2.0/map.xml.dist @@ -2501,6 +2501,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.7.0.0/map.xml.dist b/etc/opensource-to-commerce/1.7.0.0/map.xml.dist index 8434bb7fc..731f49dc4 100644 --- a/etc/opensource-to-commerce/1.7.0.0/map.xml.dist +++ b/etc/opensource-to-commerce/1.7.0.0/map.xml.dist @@ -2416,6 +2416,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.7.0.1/map.xml.dist b/etc/opensource-to-commerce/1.7.0.1/map.xml.dist index 8434bb7fc..731f49dc4 100644 --- a/etc/opensource-to-commerce/1.7.0.1/map.xml.dist +++ b/etc/opensource-to-commerce/1.7.0.1/map.xml.dist @@ -2416,6 +2416,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.7.0.2/map.xml.dist b/etc/opensource-to-commerce/1.7.0.2/map.xml.dist index 8434bb7fc..731f49dc4 100644 --- a/etc/opensource-to-commerce/1.7.0.2/map.xml.dist +++ b/etc/opensource-to-commerce/1.7.0.2/map.xml.dist @@ -2416,6 +2416,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.8.0.0/map.xml.dist b/etc/opensource-to-commerce/1.8.0.0/map.xml.dist index 483dfba79..c3bcf1efc 100644 --- a/etc/opensource-to-commerce/1.8.0.0/map.xml.dist +++ b/etc/opensource-to-commerce/1.8.0.0/map.xml.dist @@ -2416,6 +2416,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.8.1.0/map.xml.dist b/etc/opensource-to-commerce/1.8.1.0/map.xml.dist index c3bbdfa0e..d7430be64 100644 --- a/etc/opensource-to-commerce/1.8.1.0/map.xml.dist +++ b/etc/opensource-to-commerce/1.8.1.0/map.xml.dist @@ -2413,6 +2413,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.0.0/map.xml.dist b/etc/opensource-to-commerce/1.9.0.0/map.xml.dist index 940407d2b..06792646c 100644 --- a/etc/opensource-to-commerce/1.9.0.0/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.0.0/map.xml.dist @@ -2416,6 +2416,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.0.1/map.xml.dist b/etc/opensource-to-commerce/1.9.0.1/map.xml.dist index 483dfba79..c3bcf1efc 100644 --- a/etc/opensource-to-commerce/1.9.0.1/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.0.1/map.xml.dist @@ -2416,6 +2416,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.1.0/map.xml.dist b/etc/opensource-to-commerce/1.9.1.0/map.xml.dist index 483dfba79..c3bcf1efc 100644 --- a/etc/opensource-to-commerce/1.9.1.0/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.1.0/map.xml.dist @@ -2416,6 +2416,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.1.1/map.xml.dist b/etc/opensource-to-commerce/1.9.1.1/map.xml.dist index 483dfba79..c3bcf1efc 100644 --- a/etc/opensource-to-commerce/1.9.1.1/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.1.1/map.xml.dist @@ -2416,6 +2416,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.2.0/map.xml.dist b/etc/opensource-to-commerce/1.9.2.0/map.xml.dist index 32bf43292..3f2cbb7f1 100644 --- a/etc/opensource-to-commerce/1.9.2.0/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.2.0/map.xml.dist @@ -2436,6 +2436,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.2.1/map.xml.dist b/etc/opensource-to-commerce/1.9.2.1/map.xml.dist index 32bf43292..3f2cbb7f1 100644 --- a/etc/opensource-to-commerce/1.9.2.1/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.2.1/map.xml.dist @@ -2436,6 +2436,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.2.2/map.xml.dist b/etc/opensource-to-commerce/1.9.2.2/map.xml.dist index 32bf43292..3f2cbb7f1 100644 --- a/etc/opensource-to-commerce/1.9.2.2/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.2.2/map.xml.dist @@ -2436,6 +2436,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.2.3/map.xml.dist b/etc/opensource-to-commerce/1.9.2.3/map.xml.dist index 32bf43292..3f2cbb7f1 100644 --- a/etc/opensource-to-commerce/1.9.2.3/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.2.3/map.xml.dist @@ -2436,6 +2436,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.2.4/map.xml.dist b/etc/opensource-to-commerce/1.9.2.4/map.xml.dist index 32bf43292..3f2cbb7f1 100644 --- a/etc/opensource-to-commerce/1.9.2.4/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.2.4/map.xml.dist @@ -2436,6 +2436,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.3.0/map.xml.dist b/etc/opensource-to-commerce/1.9.3.0/map.xml.dist index d719f5373..b3fdfebe9 100644 --- a/etc/opensource-to-commerce/1.9.3.0/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.3.0/map.xml.dist @@ -2448,6 +2448,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.3.1/map.xml.dist b/etc/opensource-to-commerce/1.9.3.1/map.xml.dist index d719f5373..b3fdfebe9 100644 --- a/etc/opensource-to-commerce/1.9.3.1/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.3.1/map.xml.dist @@ -2448,6 +2448,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.3.10/map.xml.dist b/etc/opensource-to-commerce/1.9.3.10/map.xml.dist index a48c2ba9a..39ec2fa0a 100644 --- a/etc/opensource-to-commerce/1.9.3.10/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.3.10/map.xml.dist @@ -2406,6 +2406,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.3.2/map.xml.dist b/etc/opensource-to-commerce/1.9.3.2/map.xml.dist index d719f5373..b3fdfebe9 100644 --- a/etc/opensource-to-commerce/1.9.3.2/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.3.2/map.xml.dist @@ -2448,6 +2448,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.3.3/map.xml.dist b/etc/opensource-to-commerce/1.9.3.3/map.xml.dist index a3783c5d5..7d0184380 100644 --- a/etc/opensource-to-commerce/1.9.3.3/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.3.3/map.xml.dist @@ -2409,6 +2409,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.3.4/map.xml.dist b/etc/opensource-to-commerce/1.9.3.4/map.xml.dist index a3783c5d5..7d0184380 100644 --- a/etc/opensource-to-commerce/1.9.3.4/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.3.4/map.xml.dist @@ -2409,6 +2409,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.3.6/map.xml.dist b/etc/opensource-to-commerce/1.9.3.6/map.xml.dist index a3783c5d5..7d0184380 100644 --- a/etc/opensource-to-commerce/1.9.3.6/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.3.6/map.xml.dist @@ -2409,6 +2409,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.3.7/map.xml.dist b/etc/opensource-to-commerce/1.9.3.7/map.xml.dist index a3783c5d5..7d0184380 100644 --- a/etc/opensource-to-commerce/1.9.3.7/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.3.7/map.xml.dist @@ -2409,6 +2409,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.3.8/map.xml.dist b/etc/opensource-to-commerce/1.9.3.8/map.xml.dist index a3783c5d5..7d0184380 100644 --- a/etc/opensource-to-commerce/1.9.3.8/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.3.8/map.xml.dist @@ -2409,6 +2409,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.3.9/map.xml.dist b/etc/opensource-to-commerce/1.9.3.9/map.xml.dist index a3783c5d5..7d0184380 100644 --- a/etc/opensource-to-commerce/1.9.3.9/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.3.9/map.xml.dist @@ -2409,6 +2409,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.4.0/map.xml.dist b/etc/opensource-to-commerce/1.9.4.0/map.xml.dist index a48c2ba9a..39ec2fa0a 100644 --- a/etc/opensource-to-commerce/1.9.4.0/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.4.0/map.xml.dist @@ -2406,6 +2406,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.4.1/map.xml.dist b/etc/opensource-to-commerce/1.9.4.1/map.xml.dist index bb996934a..7e6588bdf 100644 --- a/etc/opensource-to-commerce/1.9.4.1/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.4.1/map.xml.dist @@ -2409,6 +2409,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.4.2/map.xml.dist b/etc/opensource-to-commerce/1.9.4.2/map.xml.dist index bb996934a..7e6588bdf 100644 --- a/etc/opensource-to-commerce/1.9.4.2/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.4.2/map.xml.dist @@ -2409,6 +2409,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.4.3/map.xml.dist b/etc/opensource-to-commerce/1.9.4.3/map.xml.dist index bb996934a..7e6588bdf 100644 --- a/etc/opensource-to-commerce/1.9.4.3/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.4.3/map.xml.dist @@ -2409,6 +2409,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.4.4/map.xml.dist b/etc/opensource-to-commerce/1.9.4.4/map.xml.dist index bb996934a..7e6588bdf 100644 --- a/etc/opensource-to-commerce/1.9.4.4/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.4.4/map.xml.dist @@ -2409,6 +2409,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/1.9.4.5/map.xml.dist b/etc/opensource-to-commerce/1.9.4.5/map.xml.dist index bb996934a..7e6588bdf 100644 --- a/etc/opensource-to-commerce/1.9.4.5/map.xml.dist +++ b/etc/opensource-to-commerce/1.9.4.5/map.xml.dist @@ -2409,6 +2409,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-commerce/map-customer.xml.dist b/etc/opensource-to-commerce/map-customer.xml.dist index 53820a7c0..d7a67d6bd 100644 --- a/etc/opensource-to-commerce/map-customer.xml.dist +++ b/etc/opensource-to-commerce/map-customer.xml.dist @@ -100,6 +100,9 @@ customer_entity.gender + + customer_entity.session_cutoff + customer_address_entity.city diff --git a/etc/opensource-to-commerce/map-log.xml.dist b/etc/opensource-to-commerce/map-log.xml.dist index b0437a826..193ff57c5 100644 --- a/etc/opensource-to-commerce/map-log.xml.dist +++ b/etc/opensource-to-commerce/map-log.xml.dist @@ -15,15 +15,16 @@ - - log_visitor.first_visit_at - log_visitor.last_url_id log_visitor.store_id + + log_visitor.first_visit_at + customer_visitor.created_at + diff --git a/etc/opensource-to-opensource/1.6.0.0/map.xml.dist b/etc/opensource-to-opensource/1.6.0.0/map.xml.dist index c127f3b25..08e8a55dd 100644 --- a/etc/opensource-to-opensource/1.6.0.0/map.xml.dist +++ b/etc/opensource-to-opensource/1.6.0.0/map.xml.dist @@ -1954,6 +1954,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.6.1.0/map.xml.dist b/etc/opensource-to-opensource/1.6.1.0/map.xml.dist index 98ec95938..494e2e431 100644 --- a/etc/opensource-to-opensource/1.6.1.0/map.xml.dist +++ b/etc/opensource-to-opensource/1.6.1.0/map.xml.dist @@ -1954,6 +1954,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.6.2.0/map.xml.dist b/etc/opensource-to-opensource/1.6.2.0/map.xml.dist index 046ffcc6c..96b8e295c 100644 --- a/etc/opensource-to-opensource/1.6.2.0/map.xml.dist +++ b/etc/opensource-to-opensource/1.6.2.0/map.xml.dist @@ -1954,6 +1954,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.7.0.0/map.xml.dist b/etc/opensource-to-opensource/1.7.0.0/map.xml.dist index 8b847e4ad..f22143ae9 100644 --- a/etc/opensource-to-opensource/1.7.0.0/map.xml.dist +++ b/etc/opensource-to-opensource/1.7.0.0/map.xml.dist @@ -1881,6 +1881,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.7.0.1/map.xml.dist b/etc/opensource-to-opensource/1.7.0.1/map.xml.dist index 8b847e4ad..f22143ae9 100644 --- a/etc/opensource-to-opensource/1.7.0.1/map.xml.dist +++ b/etc/opensource-to-opensource/1.7.0.1/map.xml.dist @@ -1881,6 +1881,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.7.0.2/map.xml.dist b/etc/opensource-to-opensource/1.7.0.2/map.xml.dist index 8b847e4ad..f22143ae9 100644 --- a/etc/opensource-to-opensource/1.7.0.2/map.xml.dist +++ b/etc/opensource-to-opensource/1.7.0.2/map.xml.dist @@ -1881,6 +1881,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.8.0.0/map.xml.dist b/etc/opensource-to-opensource/1.8.0.0/map.xml.dist index 9211d7bf0..58e04ce6c 100644 --- a/etc/opensource-to-opensource/1.8.0.0/map.xml.dist +++ b/etc/opensource-to-opensource/1.8.0.0/map.xml.dist @@ -1881,6 +1881,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.8.1.0/map.xml.dist b/etc/opensource-to-opensource/1.8.1.0/map.xml.dist index 2ad011750..0661ce24e 100644 --- a/etc/opensource-to-opensource/1.8.1.0/map.xml.dist +++ b/etc/opensource-to-opensource/1.8.1.0/map.xml.dist @@ -1878,6 +1878,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.0.0/map.xml.dist b/etc/opensource-to-opensource/1.9.0.0/map.xml.dist index b2af1f56c..a9614a84e 100644 --- a/etc/opensource-to-opensource/1.9.0.0/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.0.0/map.xml.dist @@ -1887,6 +1887,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.0.1/map.xml.dist b/etc/opensource-to-opensource/1.9.0.1/map.xml.dist index b2af1f56c..a9614a84e 100644 --- a/etc/opensource-to-opensource/1.9.0.1/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.0.1/map.xml.dist @@ -1887,6 +1887,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.1.0/map.xml.dist b/etc/opensource-to-opensource/1.9.1.0/map.xml.dist index b2af1f56c..a9614a84e 100644 --- a/etc/opensource-to-opensource/1.9.1.0/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.1.0/map.xml.dist @@ -1887,6 +1887,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.1.1/map.xml.dist b/etc/opensource-to-opensource/1.9.1.1/map.xml.dist index b2af1f56c..a9614a84e 100644 --- a/etc/opensource-to-opensource/1.9.1.1/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.1.1/map.xml.dist @@ -1887,6 +1887,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.2.0/map.xml.dist b/etc/opensource-to-opensource/1.9.2.0/map.xml.dist index 6996678e9..f647e7b7c 100644 --- a/etc/opensource-to-opensource/1.9.2.0/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.2.0/map.xml.dist @@ -1901,6 +1901,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.2.1/map.xml.dist b/etc/opensource-to-opensource/1.9.2.1/map.xml.dist index 6996678e9..f647e7b7c 100644 --- a/etc/opensource-to-opensource/1.9.2.1/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.2.1/map.xml.dist @@ -1901,6 +1901,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.2.2/map.xml.dist b/etc/opensource-to-opensource/1.9.2.2/map.xml.dist index 6996678e9..f647e7b7c 100644 --- a/etc/opensource-to-opensource/1.9.2.2/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.2.2/map.xml.dist @@ -1901,6 +1901,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.2.3/map.xml.dist b/etc/opensource-to-opensource/1.9.2.3/map.xml.dist index 6996678e9..f647e7b7c 100644 --- a/etc/opensource-to-opensource/1.9.2.3/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.2.3/map.xml.dist @@ -1901,6 +1901,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.2.4/map.xml.dist b/etc/opensource-to-opensource/1.9.2.4/map.xml.dist index 6996678e9..f647e7b7c 100644 --- a/etc/opensource-to-opensource/1.9.2.4/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.2.4/map.xml.dist @@ -1901,6 +1901,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.3.0/map.xml.dist b/etc/opensource-to-opensource/1.9.3.0/map.xml.dist index 8f0ca68b5..c7918b1e3 100644 --- a/etc/opensource-to-opensource/1.9.3.0/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.3.0/map.xml.dist @@ -1913,6 +1913,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.3.1/map.xml.dist b/etc/opensource-to-opensource/1.9.3.1/map.xml.dist index 8f0ca68b5..c7918b1e3 100644 --- a/etc/opensource-to-opensource/1.9.3.1/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.3.1/map.xml.dist @@ -1913,6 +1913,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.3.10/map.xml.dist b/etc/opensource-to-opensource/1.9.3.10/map.xml.dist index b101be5ac..37aee4c99 100644 --- a/etc/opensource-to-opensource/1.9.3.10/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.3.10/map.xml.dist @@ -1943,6 +1943,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.3.2/map.xml.dist b/etc/opensource-to-opensource/1.9.3.2/map.xml.dist index 9824cdcd8..86a1a3c35 100644 --- a/etc/opensource-to-opensource/1.9.3.2/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.3.2/map.xml.dist @@ -1940,6 +1940,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.3.3/map.xml.dist b/etc/opensource-to-opensource/1.9.3.3/map.xml.dist index b101be5ac..37aee4c99 100644 --- a/etc/opensource-to-opensource/1.9.3.3/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.3.3/map.xml.dist @@ -1943,6 +1943,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.3.4/map.xml.dist b/etc/opensource-to-opensource/1.9.3.4/map.xml.dist index b101be5ac..37aee4c99 100644 --- a/etc/opensource-to-opensource/1.9.3.4/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.3.4/map.xml.dist @@ -1943,6 +1943,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.3.6/map.xml.dist b/etc/opensource-to-opensource/1.9.3.6/map.xml.dist index b101be5ac..37aee4c99 100644 --- a/etc/opensource-to-opensource/1.9.3.6/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.3.6/map.xml.dist @@ -1943,6 +1943,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.3.7/map.xml.dist b/etc/opensource-to-opensource/1.9.3.7/map.xml.dist index b101be5ac..37aee4c99 100644 --- a/etc/opensource-to-opensource/1.9.3.7/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.3.7/map.xml.dist @@ -1943,6 +1943,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.3.8/map.xml.dist b/etc/opensource-to-opensource/1.9.3.8/map.xml.dist index b101be5ac..37aee4c99 100644 --- a/etc/opensource-to-opensource/1.9.3.8/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.3.8/map.xml.dist @@ -1943,6 +1943,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.3.9/map.xml.dist b/etc/opensource-to-opensource/1.9.3.9/map.xml.dist index b101be5ac..37aee4c99 100644 --- a/etc/opensource-to-opensource/1.9.3.9/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.3.9/map.xml.dist @@ -1943,6 +1943,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.4.0/map.xml.dist b/etc/opensource-to-opensource/1.9.4.0/map.xml.dist index b101be5ac..37aee4c99 100644 --- a/etc/opensource-to-opensource/1.9.4.0/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.4.0/map.xml.dist @@ -1943,6 +1943,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.4.1/map.xml.dist b/etc/opensource-to-opensource/1.9.4.1/map.xml.dist index 7e403e8cd..a167c69bf 100644 --- a/etc/opensource-to-opensource/1.9.4.1/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.4.1/map.xml.dist @@ -1946,6 +1946,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.4.2/map.xml.dist b/etc/opensource-to-opensource/1.9.4.2/map.xml.dist index 7e403e8cd..a167c69bf 100644 --- a/etc/opensource-to-opensource/1.9.4.2/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.4.2/map.xml.dist @@ -1946,6 +1946,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.4.3/map.xml.dist b/etc/opensource-to-opensource/1.9.4.3/map.xml.dist index 7e403e8cd..a167c69bf 100644 --- a/etc/opensource-to-opensource/1.9.4.3/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.4.3/map.xml.dist @@ -1946,6 +1946,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.4.4/map.xml.dist b/etc/opensource-to-opensource/1.9.4.4/map.xml.dist index 7e403e8cd..a167c69bf 100644 --- a/etc/opensource-to-opensource/1.9.4.4/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.4.4/map.xml.dist @@ -1946,6 +1946,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/1.9.4.5/map.xml.dist b/etc/opensource-to-opensource/1.9.4.5/map.xml.dist index 7e403e8cd..a167c69bf 100644 --- a/etc/opensource-to-opensource/1.9.4.5/map.xml.dist +++ b/etc/opensource-to-opensource/1.9.4.5/map.xml.dist @@ -1946,6 +1946,9 @@ email_coupon_attribute + + jwt_auth_revoked + magento_acknowledged_bulk diff --git a/etc/opensource-to-opensource/map-customer.xml.dist b/etc/opensource-to-opensource/map-customer.xml.dist index 53820a7c0..d7a67d6bd 100644 --- a/etc/opensource-to-opensource/map-customer.xml.dist +++ b/etc/opensource-to-opensource/map-customer.xml.dist @@ -100,6 +100,9 @@ customer_entity.gender + + customer_entity.session_cutoff + customer_address_entity.city diff --git a/etc/opensource-to-opensource/map-log.xml.dist b/etc/opensource-to-opensource/map-log.xml.dist index b0437a826..193ff57c5 100644 --- a/etc/opensource-to-opensource/map-log.xml.dist +++ b/etc/opensource-to-opensource/map-log.xml.dist @@ -15,15 +15,16 @@ - - log_visitor.first_visit_at - log_visitor.last_url_id log_visitor.store_id + + log_visitor.first_visit_at + customer_visitor.created_at + diff --git a/src/Migration/Logger/ConsoleHandler.php b/src/Migration/Logger/ConsoleHandler.php index 070ec25cd..c59aeca17 100644 --- a/src/Migration/Logger/ConsoleHandler.php +++ b/src/Migration/Logger/ConsoleHandler.php @@ -5,10 +5,16 @@ */ namespace Migration\Logger; +use Monolog\Formatter\FormatterInterface; +use Monolog\Handler\FormattableHandlerInterface; +use Monolog\Handler\HandlerInterface; +use Monolog\Handler\AbstractHandler; +use Psr\Log\LogLevel; + /** * Processing logger handler creation for migration application */ -class ConsoleHandler extends \Monolog\Handler\AbstractHandler implements \Monolog\Handler\HandlerInterface +class ConsoleHandler extends AbstractHandler implements HandlerInterface, FormattableHandlerInterface { const COLOR_RESET = '0'; const COLOR_BLACK = '0;30'; @@ -20,6 +26,11 @@ class ConsoleHandler extends \Monolog\Handler\AbstractHandler implements \Monolo const COLOR_CYAN = '0;36'; const COLOR_WHITE = '0;37'; + /** + * @var FormatterInterface + */ + private $formatter; + /** * Paint the message to specified color * @@ -35,21 +46,21 @@ protected function colorize($string, $color) /** * @inheritdoc */ - public function handle(array $record) + public function handle(array $record): bool { if (!$this->isHandling($record)) { return false; } $record['formatted'] = $this->getFormatter()->format($record); switch ($record['level']) { - case Logger::ERROR: - case Logger::CRITICAL: + case LogLevel::ERROR: + case LogLevel::CRITICAL: echo PHP_EOL . $this->colorize($record['formatted'], self::COLOR_RED); break; - case Logger::WARNING: + case LogLevel::WARNING: echo PHP_EOL . $this->colorize($record['formatted'], self::COLOR_YELLOW); break; - case Logger::NOTICE: + case LogLevel::NOTICE: echo PHP_EOL . $this->colorize($record['formatted'], self::COLOR_BLUE); break; default: @@ -57,4 +68,28 @@ public function handle(array $record) } return false === $this->bubble; } + + /** + * Sets the formatter. + * + * @param FormatterInterface $formatter + */ + public function setFormatter(FormatterInterface $formatter): HandlerInterface + { + $this->formatter = $formatter; + return $this; + } + + /** + * Gets the formatter. + * + * @return FormatterInterface + */ + public function getFormatter(): FormatterInterface + { + if (!$this->formatter) { + throw new \LogicException('No formatter has been set and this handler does not have a default formatter'); + } + return $this->formatter; + } } diff --git a/src/Migration/Logger/FileHandler.php b/src/Migration/Logger/FileHandler.php index 77e1096f2..780824444 100644 --- a/src/Migration/Logger/FileHandler.php +++ b/src/Migration/Logger/FileHandler.php @@ -8,6 +8,8 @@ use Magento\Framework\Filesystem\Driver\File; use Migration\Config; use Magento\Framework\App\Filesystem\DirectoryList; +use Monolog\Formatter\FormatterInterface; +use Monolog\Handler\HandlerInterface; /** * Processing logger handler creation for migration application @@ -31,6 +33,11 @@ class FileHandler extends \Monolog\Handler\AbstractHandler implements \Monolog\H */ protected $config; + /** + * @var FormatterInterface + */ + private $formatter; + /** * @param File $file * @param Config $config @@ -47,7 +54,7 @@ public function __construct(File $file, Config $config, \Magento\Framework\Files /** * @inheritdoc */ - public function handle(array $record) + public function handle(array $record): bool { if (!$this->isHandling($record)) { return false; @@ -85,4 +92,28 @@ protected function getFilePath($logFile) } return $logFile; } + + /** + * Sets the formatter. + * + * @param FormatterInterface $formatter + */ + public function setFormatter(FormatterInterface $formatter): HandlerInterface + { + $this->formatter = $formatter; + return $this; + } + + /** + * Gets the formatter. + * + * @return FormatterInterface + */ + public function getFormatter(): FormatterInterface + { + if (!$this->formatter) { + throw new \LogicException('No formatter has been set and this handler does not have a default formatter'); + } + return $this->formatter; + } } diff --git a/src/Migration/Logger/Logger.php b/src/Migration/Logger/Logger.php index d59531f91..20da59650 100644 --- a/src/Migration/Logger/Logger.php +++ b/src/Migration/Logger/Logger.php @@ -31,10 +31,11 @@ public function __construct($name = 'Migration', array $handlers = [], array $pr /** * @inheritdoc */ - public function addRecord($level, $message, array $context = []) + public function addRecord(int $level, string $message, array $context = []): bool { - parent::addRecord($level, $message, $context); + $processed = parent::addRecord($level, $message, $context); self::$messages[$level][] = $message; + return $processed; } /** diff --git a/src/Migration/Logger/Manager.php b/src/Migration/Logger/Manager.php index b85e6028a..a683a2632 100644 --- a/src/Migration/Logger/Manager.php +++ b/src/Migration/Logger/Manager.php @@ -6,6 +6,8 @@ namespace Migration\Logger; +use Psr\Log\LogLevel; + /** * Processing logger handler creation for migration application */ @@ -47,9 +49,9 @@ class Manager * @var array */ protected $logLevels = [ - self::LOG_LEVEL_ERROR => Logger::ERROR, - self::LOG_LEVEL_INFO => Logger::INFO, - self::LOG_LEVEL_DEBUG => Logger::DEBUG + self::LOG_LEVEL_ERROR => LogLevel::ERROR, + self::LOG_LEVEL_INFO => LogLevel::INFO, + self::LOG_LEVEL_DEBUG => LogLevel::DEBUG ]; /** diff --git a/src/Migration/Logger/MessageFormatter.php b/src/Migration/Logger/MessageFormatter.php index 5dd1323d5..51b734c78 100644 --- a/src/Migration/Logger/MessageFormatter.php +++ b/src/Migration/Logger/MessageFormatter.php @@ -18,7 +18,7 @@ class MessageFormatter extends \Monolog\Formatter\LineFormatter implements \Mono /** * @inheritdoc */ - public function format(array $record) + public function format(array $record): string { $this->format = $this->getLevelFormat($record['level_name']); return parent::format($record); diff --git a/src/Migration/Model/PasswordHashResolver.php b/src/Migration/Model/PasswordHashResolver.php new file mode 100644 index 000000000..27e74d1fe --- /dev/null +++ b/src/Migration/Model/PasswordHashResolver.php @@ -0,0 +1,44 @@ +customerResourceModel = $customerResourceModel; + } + + /** + * Resolve password hash + * + * @param Customer $customer + * @return mixed + */ + public function resolve(Customer $customer) + { + $select = $this->customerResourceModel->getConnection()->select(); + $select->from( + ['ce' => $this->customerResourceModel->getTable('customer_entity_varchar')], + 'ce.value' + ); + $select->where('ce.attribute_id = ?', $customer->getAttribute('password_hash')->getId()); + $select->where('ce.entity_id = ?', $customer->getId()); + $passwordHash = $select->getAdapter()->fetchOne($select); + $passwordHash = $passwordHash ?: $customer->getPasswordHash(); + return $passwordHash; + } +} diff --git a/src/Migration/Model/PasswordVerifier.php b/src/Migration/Model/PasswordVerifier.php index 55252c837..8c7c041ba 100644 --- a/src/Migration/Model/PasswordVerifier.php +++ b/src/Migration/Model/PasswordVerifier.php @@ -14,12 +14,20 @@ class PasswordVerifier * Verify password * * @param string $password - * @param string $hash - * @return bool + * @param string $passwordHash + * @return bool|void */ - public function verify($password, $hash) + public function verify($password, $passwordHash) { - return password_verify($password, $hash); + $passwordHashExplode = explode(':', $passwordHash); + $hash = $passwordHashExplode[0]; + $salt = $passwordHashExplode[1] ?? ''; + if ($this->isBcrypt($hash)) { + return password_verify($password, $hash); + } else if ($this->isSha512($hash)) { + return hash('sha512', $salt . $password) === $hash; + } + return; } /** @@ -35,4 +43,19 @@ public function isBcrypt($hash) } return false; } + + /** + * Check if hash is sha-512 algorithm + * + * @param string $hash + * @return bool + */ + public function isSha512($hash) + { + $hash = explode(':', $hash)[0]; + if (strlen($hash) === 128) { + return true; + } + return false; + } } diff --git a/src/Migration/Plugin/Customer/Model/AuthenticationPlugin.php b/src/Migration/Plugin/Customer/Model/AuthenticationPlugin.php index 41803eb5d..63f233daf 100644 --- a/src/Migration/Plugin/Customer/Model/AuthenticationPlugin.php +++ b/src/Migration/Plugin/Customer/Model/AuthenticationPlugin.php @@ -9,6 +9,7 @@ use Magento\Customer\Model\ResourceModel\Customer as CustomerResourceModel; use Magento\Framework\Encryption\EncryptorInterface as Encryptor; use Migration\Model\PasswordVerifier; +use Migration\Model\PasswordHashResolver; use Magento\Customer\Model\Authentication; /** @@ -31,6 +32,11 @@ class AuthenticationPlugin */ private $passwordVerifier; + /** + * @var PasswordHashResolver + */ + private $passwordHashResolver; + /** * @var Encryptor */ @@ -46,16 +52,18 @@ public function __construct( CustomerRegistry $customerRegistry, CustomerResourceModel $customerResourceModel, PasswordVerifier $passwordVerifier, + PasswordHashResolver $passwordHashResolver, Encryptor $encryptor ) { $this->customerRegistry = $customerRegistry; $this->customerResourceModel = $customerResourceModel; $this->passwordVerifier = $passwordVerifier; + $this->passwordHashResolver = $passwordHashResolver; $this->encryptor = $encryptor; } /** - * Replace customer password hash in case it is Bcrypt algorithm + * Replace customer password hash in case it is Bcrypt or sha-512 algorithms * * @param Authentication $subject * @param int $customerId @@ -67,11 +75,9 @@ public function beforeAuthenticate( $customerId, $password ) { - $customerSecure = $this->customerRegistry->retrieveSecureData($customerId); - $hash = $customerSecure->getPasswordHash(); - if ($this->passwordVerifier->isBcrypt($hash) - && $this->passwordVerifier->verify($password, $hash) - ) { + $customer = $this->customerRegistry->retrieve($customerId); + $hash = $this->passwordHashResolver->resolve($customer); + if ($this->passwordVerifier->verify($password, $hash)) { $this->customerRegistry->remove($customerId); $hash = $this->encryptor->getHash($password, true); $this->customerResourceModel->getConnection()->update( diff --git a/src/Migration/Step/Customer/Data.php b/src/Migration/Step/Customer/Data.php index 9ebc4373b..7036a58ff 100644 --- a/src/Migration/Step/Customer/Data.php +++ b/src/Migration/Step/Customer/Data.php @@ -6,6 +6,7 @@ namespace Migration\Step\Customer; use Migration\App\Step\StageInterface; +use Migration\Model\PasswordVerifier; use Migration\Reader\MapInterface; use Migration\Reader\GroupsFactory; use Migration\Reader\Map; @@ -86,6 +87,11 @@ class Data extends \Migration\Step\DatabaseStage implements StageInterface */ private $attributesToStatic; + /** + * @var PasswordVerifier + */ + private $passwordVerifier; + /** * @param \Migration\Config $config * @param ProgressBar\LogLevelProcessor $progressBar @@ -100,6 +106,7 @@ class Data extends \Migration\Step\DatabaseStage implements StageInterface * @param MapFactory $mapFactory * @param GroupsFactory $groupsFactory * @param Logger $logger + * @param PasswordVerifier $passwordVerifier * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ public function __construct( @@ -115,7 +122,8 @@ public function __construct( Model\AttributesToStatic $attributesToStatic, MapFactory $mapFactory, GroupsFactory $groupsFactory, - Logger $logger + Logger $logger, + PasswordVerifier $passwordVerifier ) { $this->source = $source; $this->destination = $destination; @@ -129,6 +137,7 @@ public function __construct( $this->attributesDataToCustomerEntityRecords = $attributesDataToCustomerEntityRecords; $this->attributesDataToSkip = $attributesDataToSkip; $this->attributesToStatic = $attributesToStatic; + $this->passwordVerifier = $passwordVerifier; parent::__construct($config); } @@ -141,7 +150,7 @@ public function perform() $sourceDocuments = array_keys($this->readerGroups->getGroup('source_documents')); $sourceEntityDocuments = array_keys($this->readerGroups->getGroup('source_entity_documents')); $sourceDataDocuments = array_diff($sourceDocuments, $sourceEntityDocuments); - $skippedAttributes = array_keys($this->attributesDataToSkip->getSkippedAttributes()); + $skippedAttributes = $this->attributesDataToSkip->getSkippedAttributes(); $processedDocuments = $this->progress->getProcessedEntities($this, $stage); $this->progressBar->start(count($sourceDocuments), LogManager::LOG_LEVEL_INFO); foreach (array_diff($sourceEntityDocuments, $processedDocuments) as $sourceEntityDocument) { @@ -195,10 +204,7 @@ private function transformDocumentRecords( $pageNumber++; $destinationRecords = $destDocument->getRecords(); foreach ($bulk as $recordData) { - if ($attributesToSkip !== null - && isset($recordData['attribute_id']) - && in_array($recordData['attribute_id'], $attributesToSkip) - ) { + if ($this->skipRecordAttribute($recordData, $attributesToSkip)) { continue; } /** @var Record $record */ @@ -219,4 +225,32 @@ private function transformDocumentRecords( $this->progressBar->advance(LogManager::LOG_LEVEL_INFO); $this->progressBar->finish(LogManager::LOG_LEVEL_DEBUG); } + + /** + * Skip record attribute + * + * @param $recordData + * @param $attributesToSkip + * @return bool + */ + private function skipRecordAttribute($recordData, $attributesToSkip) + { + $passwordHashSha512 = function($recordData, $attributesToSkip) { + if ($attributesToSkip[$recordData['attribute_id']] === 'password_hash' + && $this->passwordVerifier->isSha512($recordData['value']) + ) { + return true; + } + return false; + }; + + if ($attributesToSkip !== null + && isset($recordData['attribute_id']) + && isset($attributesToSkip[$recordData['attribute_id']]) + && !$passwordHashSha512($recordData, $attributesToSkip) + ) { + return true; + } + return false; + } } diff --git a/src/Migration/Step/Log/Data.php b/src/Migration/Step/Log/Data.php index 97e478b3d..45a41bafc 100644 --- a/src/Migration/Step/Log/Data.php +++ b/src/Migration/Step/Log/Data.php @@ -16,6 +16,7 @@ use Migration\App\ProgressBar; use Migration\Logger\Manager as LogManager; use Migration\Logger\Logger; +use Migration\RecordTransformer; /** * Class Data @@ -114,7 +115,15 @@ public function perform() } $destDocument = $this->destination->getDocument($destinationName); $this->destination->clearDocument($destinationName); - + /** @var RecordTransformer $recordTransformer */ + $recordTransformer = $this->recordTransformerFactory->create( + [ + 'sourceDocument' => $sourceDocument, + 'destDocument' => $destDocument, + 'mapReader' => $this->map + ] + ); + $recordTransformer->init(); $pageNumber = 0; $this->logger->debug('migrating', ['table' => $sourceDocName]); $this->progress->start($this->source->getRecordsCount($sourceDocName), LogManager::LOG_LEVEL_DEBUG); @@ -127,11 +136,11 @@ public function perform() $destinationRecords = $destDocument->getRecords(); foreach ($bulk as $recordData) { $this->progress->advance(LogManager::LOG_LEVEL_DEBUG); + /** @var Record $record */ + $record = $this->recordFactory->create(['document' => $sourceDocument, 'data' => $recordData]); /** @var Record $destRecord */ - $destRecord = $this->recordFactory->create([ - 'document' => $destDocument, - 'data' => $recordData, - ]); + $destRecord = $this->recordFactory->create(['document' => $destDocument]); + $recordTransformer->transform($record, $destRecord); $destinationRecords->addRecord($destRecord); } $this->destination->saveRecords($destinationName, $destinationRecords); @@ -175,6 +184,7 @@ public function getLogDataSelect() 'customer_id' => 'lc.customer_id', 'session_id' => 'lv.session_id', 'last_visit_at' => 'lv.last_visit_at', + 'first_visit_at' => 'lv.first_visit_at', ]; /** @var \Magento\Framework\DB\Select $select */ $select = $this->sourceAdapter->getSelect(); @@ -186,7 +196,7 @@ public function getLogDataSelect() ) ->group('lv.visitor_id') ->order('lv.visitor_id'); - + return $select; }