Merge pull request #12 from punchout-catalogs/bugfix/POC-2624-add-sup…

…port-for-loginname Bugfix/poc 2624 add support for loginname
punchout-catalogs · Nov 23, 2021 · f3099a3 · f3099a3
2 parents f6f287d + ca8c0b2
commit f3099a3
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,38 @@
-# PunchOutCatalog Changelog
+# PunchOutCatalogs Module
 
-[Release Changelog](https://github.com/spryker/punch-out-catalog/releases)
+Punchout Catalog Module for Spryker eCommerce Platform
+
+# Changelog
+
+# 2.1.1
+- Added the `loginname` OCI field key
+
+# 2.1.0
+- Business Unit Fix for POST OCI
+- Improved Access Token Error Handling
+- Introduced A New Route Provider Plugin
+
+
+# 2.1.0
+- Business Unit Fix for POST OCI
+- Improved Access Token Error Handling
+- Introduced A New Route Provider Plugin
+
+# 2.0.1
+- Adjust dependency
+
+# 2.0.0
+- Improve DB structure
+
+# 1.1.2
+- Dependency injection fixes
+
+# 1.1.1
+- Apply code review fixes
+
+# 1.1.0
+- Fixed Setup Request Failure caused by incorrect file name passed to autoloader
+- DB update: Renamed 2 indexes in pgw_punchout_catalog_transaction table
+
+# 1.0.0
+- Initial Release
diff --git a/README.md b/README.md
@@ -1,6 +1,4 @@
-# PunchOutCatalog Module
-[![Build Status](https://travis-ci.org/punchout-catalogs/punchout-catalog-spryker.svg)](https://travis-ci.org/punchout-catalogs/punchout-catalog-spryker)
-[![Coverage Status](https://coveralls.io/repos/github/punchout-catalogs/punchout-catalog-spryker/badge.svg)](https://coveralls.io/github/punchout-catalogs/punchout-catalog-spryker)
+# PunchOutCatalogs Module
 
 Punchout Catalog Module for Spryker eCommerce Platform
 
@@ -27,7 +25,7 @@ Running:
 
 ### Custom cart mapping
 
-Extending cart mapping behavior could be implemented by overriding 
+Extending cart mapping behavior could be implemented by overriding
 PunchoutCatalog\Yves\PunchoutCatalog\PunchoutCatalogConfig class method:
 
 ```php
@@ -143,12 +141,12 @@ Register Punchout routes in `src/Pyz/Yves/ShopApplication/YvesBootstrap.php`:
 
 ```php
 <?php
- 
+
 namespace Pyz\Yves\ShopApplication;
- 
+
 use PunchoutCatalog\Yves\PunchoutCatalog\Plugin\Provider\PunchoutCatalogControllerProvider;
 use SprykerShop\Yves\ShopApplication\YvesBootstrap as SprykerYvesBootstrap;
- 
+
 class YvesBootstrap extends SprykerYvesBootstrap
 {
     /**
@@ -167,7 +165,7 @@ class YvesBootstrap extends SprykerYvesBootstrap
 
 ### Handle Auth Token Create Error
 
-The `punchout-catalog.error.auth.token.create` error may happen if the `spy_oauth_access_token.user_identifier` field is too small for data which is storing in the field. By default it is `varchar(1024)`. 
+The `punchout-catalog.error.auth.token.create` error may happen if the `spy_oauth_access_token.user_identifier` field is too small for data which is storing in the field. By default it is `varchar(1024)`.
 
 The easiest way to improve it is upgrading the field from `varchar(1024)` to `LONGVARCHAR`.
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "punchout-catalogs/punchout-catalog-spryker",
   "description": "Punchout Catalog Module for Spryker eCommerce Platform",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "license": "proprietary",
   "require": {
     "php": ">=7.1",

diff --git a/src/PunchoutCatalog/Zed/PunchoutCatalog/Business/ContentProcessor/OciContentProcessor.php b/src/PunchoutCatalog/Zed/PunchoutCatalog/Business/ContentProcessor/OciContentProcessor.php
@@ -21,24 +21,24 @@ class OciContentProcessor implements OciContentProcessorInterface
     public function fetchHeader(array $content): PunchoutCatalogProtocolDataTransfer
     {
         $username = $hookUrl = null;
-        
-        $usernameKeys = ['username', 'login', 'cid'];
+
+        $usernameKeys = ['username', 'login', 'loginname', 'cid'];
         $hookKeys = ['HOOK_URL', 'hook_url', 'Hook_Url'];
-        
+
         foreach ($usernameKeys as $usernameKey) {
             if (!empty($content[$usernameKey])) {
                 $username = $content[$usernameKey];
                 break;
             }
         }
-    
+
         foreach ($hookKeys as $hookKey) {
             if (!empty($content[$hookKey])) {
                 $hookUrl = $content[$hookKey];
                 break;
             }
         }
-        
+
         $password = $content['password'] ?? null;
 
         return (new PunchoutCatalogProtocolDataTransfer())