Skip to content

Commit 4f294eb

Browse files
author
Ievgen Shakhsuvarov
committed
Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into MAGETWO-26655-TD
2 parents a6825fa + 7581dd6 commit 4f294eb

File tree

30 files changed

+200
-77
lines changed

30 files changed

+200
-77
lines changed

app/code/Magento/Checkout/Model/Type/Onepage.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ protected function _validateCustomerData(array $data)
530530
$quote = $this->getQuote();
531531
$isCustomerNew = !$quote->getCustomerId();
532532
$customer = $quote->getCustomer();
533-
$customerData = $this->extensibleDataObjectConverter->toFlatArray($customer);
533+
$customerData = $this->extensibleDataObjectConverter->toFlatArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface');
534534

535535
/** @var Form $customerForm */
536536
$customerForm = $this->_formFactory->create(
@@ -594,7 +594,7 @@ protected function _validateCustomerData(array $data)
594594
$this->_objectCopyService->copyFieldsetToTarget(
595595
'customer_account',
596596
'to_quote',
597-
$this->extensibleDataObjectConverter->toFlatArray($customer),
597+
$this->extensibleDataObjectConverter->toFlatArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface'),
598598
$quote
599599
);
600600

app/code/Magento/Customer/Block/Adminhtml/Edit/Form.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,11 @@ protected function _prepareForm()
7272
$form->addField('id', 'hidden', ['name' => 'customer_id']);
7373
$customer = $this->_customerRepository->getById($customerId);
7474
$form->setValues(
75-
$this->_extensibleDataObjectConverter->toFlatArray($customer)
75+
$this->_extensibleDataObjectConverter->toFlatArray(
76+
$customer,
77+
[],
78+
'\Magento\Customer\Api\Data\CustomerInterface'
79+
)
7680
)->addValues(
7781
['customer_id' => $customerId]
7882
);

app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Account.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,11 @@ protected function _customizeFieldset($fieldset)
172172
);
173173
$form->getElement('website_id')->setRenderer($renderer);
174174

175-
$accountData = $this->_extensibleDataObjectConverter->toFlatArray($this->_getCustomerDataObject());
175+
$accountData = $this->_extensibleDataObjectConverter->toFlatArray(
176+
$this->_getCustomerDataObject(),
177+
[],
178+
'\Magento\Customer\Api\Data\CustomerInterface'
179+
);
176180

177181
if ($this->_getCustomerDataObject()->getId()) {
178182
$customerFormFields = $this->_addEditCustomerFormFields($fieldset);

app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ protected function _validateCustomer($response)
2929
$customerForm = $this->_formFactory->create(
3030
'customer',
3131
'adminhtml_customer',
32-
$this->_extensibleDataObjectConverter->toFlatArray($customer),
32+
$this->_extensibleDataObjectConverter->toFlatArray(
33+
$customer,
34+
[],
35+
'\Magento\Customer\Api\Data\CustomerInterface'
36+
),
3337
true
3438
);
3539
$customerForm->setInvisibleIgnored(true);

app/code/Magento/Customer/Model/AccountManagement.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ protected function createPasswordHash($password)
683683
public function validate(\Magento\Customer\Api\Data\CustomerInterface $customer)
684684
{
685685
$customerErrors = $this->validator->validateData(
686-
$this->extensibleDataObjectConverter->toFlatArray($customer),
686+
$this->extensibleDataObjectConverter->toFlatArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface'),
687687
[],
688688
'customer'
689689
);

app/code/Magento/Customer/Model/Address/Mapper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct(ExtensibleDataObjectConverter $extensibleDataObjectC
3737
*/
3838
public function toFlatArray($addressDataObject)
3939
{
40-
$flatAddressArray = $this->extensibleDataObjectConverter->toFlatArray($addressDataObject);
40+
$flatAddressArray = $this->extensibleDataObjectConverter->toFlatArray($addressDataObject, [], '\Magento\Customer\Api\Data\AddressInterface');
4141
//preserve street
4242
$street = $addressDataObject->getStreet();
4343
if (!empty($street) && is_array($street)) {

app/code/Magento/Customer/Model/Customer/Mapper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct(ExtensibleDataObjectConverter $extensibleDataObjectC
3636
*/
3737
public function toFlatArray(CustomerInterface $customer)
3838
{
39-
$flatArray = $this->extensibleDataObjectConverter->toNestedArray($customer);
39+
$flatArray = $this->extensibleDataObjectConverter->toNestedArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface');
4040
unset($flatArray["addresses"]);
4141
return ConvertArray::toFlatArray($flatArray);
4242
}

app/code/Magento/Customer/Model/Resource/CustomerRepository.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
125125
{
126126
$this->validate($customer);
127127
$customerData = $this->extensibleDataObjectConverter->toFlatArray(
128-
$this->customerBuilder->populate($customer)->setAddresses([])->create()
128+
$this->customerBuilder->populate($customer)->setAddresses([])->create(),
129+
[],
130+
'\Magento\Customer\Api\Data\CustomerInterface'
129131
);
130132
$customerModel = $this->customerFactory->create(['data' => $customerData]);
131133
$storeId = $customerModel->getStoreId();

app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function loadData($printQuery = false, $logQuery = false)
6767
$groups = $searchResults->getItems();
6868
foreach ($groups as $group) {
6969
$groupItem = new \Magento\Framework\Object();
70-
$groupItem->addData($this->simpleDataObjectConverter->toFlatArray($group));
70+
$groupItem->addData($this->simpleDataObjectConverter->toFlatArray($group, '\Magento\Customer\Api\Data\GroupInterface'));
7171
$this->_addItem($groupItem);
7272
}
7373
$this->_setIsLoaded();

app/code/Magento/Integration/Model/Oauth/Consumer.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,17 @@ class Consumer extends \Magento\Framework\Model\AbstractModel implements Consume
3838
*/
3939
protected $_keyLengthFactory;
4040

41+
/**
42+
* @var \Magento\Integration\Helper\Oauth\Data
43+
*/
44+
protected $dataHelper;
45+
4146
/**
4247
* @param \Magento\Framework\Model\Context $context
4348
* @param \Magento\Framework\Registry $registry
4449
* @param \Magento\Integration\Model\Oauth\Consumer\Validator\KeyLengthFactory $keyLengthFactory
4550
* @param \Magento\Framework\Url\Validator $urlValidator
51+
* @param \Magento\Integration\Helper\Oauth\Data $dataHelper
4652
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
4753
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
4854
* @param array $data
@@ -52,12 +58,14 @@ public function __construct(
5258
\Magento\Framework\Registry $registry,
5359
\Magento\Integration\Model\Oauth\Consumer\Validator\KeyLengthFactory $keyLengthFactory,
5460
\Magento\Framework\Url\Validator $urlValidator,
61+
\Magento\Integration\Helper\Oauth\Data $dataHelper,
5562
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
5663
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
5764
array $data = []
5865
) {
5966
$this->_keyLengthFactory = $keyLengthFactory;
6067
$this->_urlValidator = $urlValidator;
68+
$this->dataHelper = $dataHelper;
6169
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
6270
}
6371

@@ -166,4 +174,13 @@ public function getCreatedAt()
166174
{
167175
return $this->getData('created_at');
168176
}
177+
178+
/**
179+
* {@inheritdoc}
180+
*/
181+
public function isValidForTokenExchange()
182+
{
183+
$expiry = $this->dataHelper->getConsumerExpirationPeriod();
184+
return $expiry > $this->getResource()->getTimeInSecondsSinceCreation($this->getId());
185+
}
169186
}

0 commit comments

Comments
 (0)