Skip to content

Commit 62b8186

Browse files
FFWEB-2663: Additional user credentials used for fetching data from FF
1 parent a5a742b commit 62b8186

7 files changed

Lines changed: 33 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Add
44
- Tracking
55
- Add option to select scenario when `Add To Cart button` has been clicked
6+
- Add second credentials used for fetching data from FF
67

78
## [v4.3.7] - 2022.01.24
89
### Fix

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,10 @@ Credentials you will be given should be placed here.
7777
**Note:** Server URL should contain a used protocol: (e.g. `https://`) and should end with an endpoint specific for a given version (e.g. in version 7.3 its `FACT-Finder-7.3`, in NG `fact-finder` )
7878
* Channel - Channel you want to serve data from
7979
**Note** The number of channel fields is adjusted to the number of active languages used in application. Please make sure you set a correct channel for a given language.
80-
* Username
81-
* Password
80+
* Username - for importing data to FF
81+
* Password - for importing data to FF
82+
* Username - for fetching data from FF
83+
* Password - for fetching data from FF
8284
* Authorization Prefix
8385
* Authorization Postfix
8486
**Note:** FACT-Finder® NG does not require fields `Authorization Prefix` and `Authorization Postfix` to be set. Please omit these fields in this case.

docs/assets/main-settings.png

7.1 KB
Loading

src/metadata.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,18 @@
148148
'type' => 'str',
149149
'position' => $settingPosition++,
150150
],
151+
[
152+
'group' => 'ffMain',
153+
'name' => 'ffPublicUsername',
154+
'type' => 'str',
155+
'position' => $settingPosition++,
156+
],
157+
[
158+
'group' => 'ffMain',
159+
'name' => 'ffPublicPassword',
160+
'type' => 'str',
161+
'position' => $settingPosition++,
162+
],
151163
[
152164
'group' => 'ffMain',
153165
'name' => 'ffAuthPrefix',

src/views/admin/de/ffwebcomponents_lang.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
'SHOP_MODULE_ffServerUrl' => 'Server-URL',
99
'SHOP_MODULE_ffChannel' => 'Channel',
1010
'SHOP_MODULE_ffUsername' => 'Benutzername für den FACT-Finder Import User',
11-
'SHOP_MODULE_ffPassword' => 'Passwort',
11+
'SHOP_MODULE_ffPassword' => 'Passwort for the FACT-Finder Import User',
12+
'SHOP_MODULE_ffPublicUsername' => 'Username for fetching data from FACT-Finder',
13+
'SHOP_MODULE_ffPublicPassword' => 'Password for fetching data from FACT-Finder',
1214
'SHOP_MODULE_ffAuthPrefix' => 'Authorisierungs-Präfix',
1315
'SHOP_MODULE_ffAuthPostfix' => 'Authorisierungs-Postfix',
1416
'SHOP_MODULE_GROUP_ffAdvanced' => 'Erweiterte Einstellungen',

src/views/admin/en/ffwebcomponents_lang.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
'SHOP_MODULE_ffServerUrl' => 'Server URL',
99
'SHOP_MODULE_ffChannel' => 'Channel',
1010
'SHOP_MODULE_ffUsername' => 'Username for the FACT-Finder Import User',
11-
'SHOP_MODULE_ffPassword' => 'Password',
11+
'SHOP_MODULE_ffPassword' => 'Password for the FACT-Finder Import User',
12+
'SHOP_MODULE_ffPublicUsername' => 'Username for fetching data from FACT-Finder',
13+
'SHOP_MODULE_ffPublicPassword' => 'Password for fetching data from FACT-Finder',
1214
'SHOP_MODULE_ffAuthPrefix' => 'Authorization Prefix',
1315
'SHOP_MODULE_ffAuthPostfix' => 'Authorization Postfix',
1416
'SHOP_MODULE_GROUP_ffAdvanced' => 'Advanced',

src/views/smarty/modifier.record_data_json.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,18 @@ function smarty_modifier_record_data_json(BaseModel $article): string
1313
{
1414
/** @var Config $config */
1515
$config = Registry::getConfig();
16+
$username = $config->getConfigParam('ffPublicUsername');
17+
$password = $config->getConfigParam('ffPublicPassword');
18+
19+
if ($username === '' || $password === '') {
20+
$username = $config->getConfigParam('ffUsername');
21+
$password = $config->getConfigParam('ffPassword');
22+
}
23+
1624
$recordId = (string) $article->getFieldData('oxartnum');
1725
$credentials = new Credentials(
18-
$config->getConfigParam('ffUsername'),
19-
$config->getConfigParam('ffPassword'),
26+
$username,
27+
$password,
2028
$config->getConfigParam('ffAuthPrefix'),
2129
$config->getConfigParam('ffAuthPostfix')
2230
);

0 commit comments

Comments
 (0)