Skip to content

Commit 3d51e85

Browse files
arkadiycharkadiych
committed
Merge remote-tracking branch 'mainline/develop' into develop
Conflicts: app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
2 parents dda206d + 1afbe7e commit 3d51e85

File tree

32 files changed

+642
-275
lines changed

32 files changed

+642
-275
lines changed

‎app/code/Magento/Catalog/etc/webapi.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
<route url="/V1/products" method="GET">
3131
<service class="Magento\Catalog\Api\ProductRepositoryInterface" method="getList"/>
3232
<resources>
33-
<resource ref="Magento_Catalog::products" />
33+
<resource ref="anonymous" />
3434
</resources>
3535
</route>
3636
<route url="/V1/products/:productSku" method="GET">
3737
<service class="Magento\Catalog\Api\ProductRepositoryInterface" method="get"/>
3838
<resources>
39-
<resource ref="Magento_Catalog::products" />
39+
<resource ref="anonymous" />
4040
</resources>
4141
</route>
4242

@@ -49,7 +49,7 @@
4949
<route url="/V1/products/attributes/:attributeCode" method="GET">
5050
<service class="Magento\Catalog\Api\ProductAttributeRepositoryInterface" method="get"/>
5151
<resources>
52-
<resource ref="Magento_Catalog::attributes_attributes" />
52+
<resource ref="anonymous" />
5353
</resources>
5454
</route>
5555
<route url="/V1/products/attributes" method="GET">
@@ -97,19 +97,19 @@
9797
<route url="/V1/products/types" method="GET">
9898
<service class="Magento\Catalog\Api\ProductTypeListInterface" method="getProductTypes"/>
9999
<resources>
100-
<resource ref="Magento_Catalog::products"/>
100+
<resource ref="anonymous"/>
101101
</resources>
102102
</route>
103103
<route url="/V1/products/attribute-sets/sets/list" method="GET">
104104
<service class="Magento\Catalog\Api\AttributeSetRepositoryInterface" method="getList"/>
105105
<resources>
106-
<resource ref="Magento_Catalog::sets"/>
106+
<resource ref="anonymous"/>
107107
</resources>
108108
</route>
109109
<route url="/V1/products/attribute-sets/:attributeSetId" method="GET">
110110
<service class="Magento\Catalog\Api\AttributeSetRepositoryInterface" method="get"/>
111111
<resources>
112-
<resource ref="Magento_Catalog::sets"/>
112+
<resource ref="anonymous"/>
113113
</resources>
114114
</route>
115115
<route url="/V1/products/attribute-sets/:attributeSetId" method="DELETE">
@@ -133,7 +133,7 @@
133133
<route url="/V1/products/attribute-sets/:attributeSetId/attributes" method="GET">
134134
<service class="Magento\Catalog\Api\ProductAttributeManagementInterface" method="getAttributes"/>
135135
<resources>
136-
<resource ref="Magento_Catalog::sets"/>
136+
<resource ref="anonymous"/>
137137
</resources>
138138
</route>
139139
<route url="/V1/products/attribute-sets/attributes" method="POST">
@@ -151,7 +151,7 @@
151151
<route url="/V1/products/attribute-sets/groups/list" method="GET">
152152
<service class="Magento\Catalog\Api\ProductAttributeGroupRepositoryInterface" method="getList"/>
153153
<resources>
154-
<resource ref="Magento_Catalog::sets"/>
154+
<resource ref="anonymous"/>
155155
</resources>
156156
</route>
157157
<route url="/V1/products/attribute-sets/groups" method="POST">
@@ -175,7 +175,7 @@
175175
<route url="/V1/products/attributes/:attributeCode/options" method="GET">
176176
<service class="Magento\Catalog\Api\ProductAttributeOptionManagementInterface" method="getItems"/>
177177
<resources>
178-
<resource ref="Magento_Catalog::attributes_attributes" />
178+
<resource ref="anonymous" />
179179
</resources>
180180
</route>
181181
<route url="/V1/products/attributes/:attributeCode/options" method="POST">
@@ -193,13 +193,13 @@
193193
<route url="/V1/products/media/types/:attributeSetName" method="GET">
194194
<service class="Magento\Catalog\Api\ProductMediaAttributeManagementInterface" method="getList"/>
195195
<resources>
196-
<resource ref="Magento_Catalog::catalog"/>
196+
<resource ref="anonymous"/>
197197
</resources>
198198
</route>
199199
<route url="/V1/products/:productSku/media/:imageId" method="GET">
200200
<service class="Magento\Catalog\Api\ProductAttributeMediaGalleryManagementInterface" method="get"/>
201201
<resources>
202-
<resource ref="Magento_Catalog::catalog"/>
202+
<resource ref="anonymous"/>
203203
</resources>
204204
</route>
205205
<route url="/V1/products/:productSku/media" method="POST">
@@ -223,15 +223,15 @@
223223
<route url="/V1/products/:productSku/media" method="GET">
224224
<service class="Magento\Catalog\Api\ProductAttributeMediaGalleryManagementInterface" method="getList"/>
225225
<resources>
226-
<resource ref="Magento_Catalog::catalog"/>
226+
<resource ref="anonymous"/>
227227
</resources>
228228
</route>
229229

230230
<!-- Group Price -->
231231
<route url="/V1/products/:productSku/group-prices/" method="GET">
232232
<service class="Magento\Catalog\Api\ProductGroupPriceManagementInterface" method="getList"/>
233233
<resources>
234-
<resource ref="Magento_Catalog::catalog"/>
234+
<resource ref="anonymous"/>
235235
</resources>
236236
</route>
237237
<route url="/V1/products/:productSku/group-prices/:customerGroupId/price/:price" method="POST">
@@ -251,7 +251,7 @@
251251
<route url="/V1/products/:productSku/group-prices/:customerGroupId/tiers" method="GET">
252252
<service class="Magento\Catalog\Api\ProductTierPriceManagementInterface" method="getList"/>
253253
<resources>
254-
<resource ref="Magento_Catalog::catalog"/>
254+
<resource ref="anonymous"/>
255255
</resources>
256256
</route>
257257
<route url="/V1/products/:productSku/group-prices/:customerGroupId/tiers/:qty/price/:price" method="POST">
@@ -276,7 +276,7 @@
276276
<route url="/V1/categories/:categoryId" method="GET">
277277
<service class="Magento\Catalog\Api\CategoryRepositoryInterface" method="get" />
278278
<resources>
279-
<resource ref="Magento_Catalog::categories" />
279+
<resource ref="anonymous" />
280280
</resources>
281281
</route>
282282
<route url="/V1/categories" method="POST">
@@ -288,7 +288,7 @@
288288
<route url="/V1/categories" method="GET">
289289
<service class="Magento\Catalog\Api\CategoryManagementInterface" method="getTree" />
290290
<resources>
291-
<resource ref="Magento_Catalog::categories" />
291+
<resource ref="anonymous" />
292292
</resources>
293293
</route>
294294
<route url="/V1/categories/:id" method="PUT">
@@ -314,13 +314,13 @@
314314
<route url="/V1/products/:productSku/options" method="GET">
315315
<service class="Magento\Catalog\Api\ProductCustomOptionRepositoryInterface" method="getList"/>
316316
<resources>
317-
<resource ref="Magento_Catalog::catalog"/>
317+
<resource ref="anonymous"/>
318318
</resources>
319319
</route>
320320
<route url="/V1/products/:productSku/options/:optionId" method="GET">
321321
<service class="Magento\Catalog\Api\ProductCustomOptionRepositoryInterface" method="get"/>
322322
<resources>
323-
<resource ref="Magento_Catalog::catalog"/>
323+
<resource ref="anonymous"/>
324324
</resources>
325325
</route>
326326
<route url="/V1/products/options" method="POST">
@@ -346,19 +346,19 @@
346346
<route url="/V1/products/links/types" method="GET">
347347
<service class="Magento\Catalog\Api\ProductLinkTypeListInterface" method="getItems"/>
348348
<resources>
349-
<resource ref="Magento_Catalog::catalog"/>
349+
<resource ref="anonymous"/>
350350
</resources>
351351
</route>
352352
<route url="/V1/products/links/:type/attributes" method="GET">
353353
<service class="Magento\Catalog\Api\ProductLinkTypeListInterface" method="getItemAttributes"/>
354354
<resources>
355-
<resource ref="Magento_Catalog::catalog"/>
355+
<resource ref="anonymous"/>
356356
</resources>
357357
</route>
358358
<route url="/V1/products/:productSku/links/:type" method="GET">
359359
<service class="Magento\Catalog\Api\ProductLinkManagementInterface" method="getLinkedItemsByType"/>
360360
<resources>
361-
<resource ref="Magento_Catalog::catalog"/>
361+
<resource ref="anonymous"/>
362362
</resources>
363363
</route>
364364
<route url="/V1/products/:productSku/links/:type" method="POST">
@@ -384,7 +384,7 @@
384384
<route url="/V1/categories/:categoryId/products" method="GET">
385385
<service class="Magento\Catalog\Api\CategoryLinkManagementInterface" method="getAssignedProducts" />
386386
<resources>
387-
<resource ref="Magento_Catalog::categories" />
387+
<resource ref="anonymous" />
388388
</resources>
389389
</route>
390390
<route url="/V1/categories/:categoryId/products" method="POST">

‎app/code/Magento/CatalogInventory/etc/webapi.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<route url="/V1/stockStatus/:productSku" method="GET">
2929
<service class="Magento\CatalogInventory\Api\StockRegistryInterface" method="getStockStatusBySku"/>
3030
<resources>
31-
<resource ref="Magento_CatalogInventory::cataloginventory"/>
31+
<resource ref="anonymous"/>
3232
</resources>
3333
</route>
3434
</routes>

‎app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Reset.php‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎app/code/Magento/Quote/etc/webapi.xml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,31 @@
1010
<route url="/V1/carts/:cartId" method="GET">
1111
<service class="Magento\Quote\Api\CartRepositoryInterface" method="get"/>
1212
<resources>
13-
<resource ref="Magento_Catalog::products" />
13+
<resource ref="anonymous" />
1414
</resources>
1515
</route>
1616
<route url="/V1/carts" method="PUT">
1717
<service class="Magento\Quote\Api\CartRepositoryInterface" method="getList"/>
1818
<resources>
19-
<resource ref="Magento_Catalog::products" />
19+
<resource ref="anonymous" />
2020
</resources>
2121
</route>
2222
<route url="/V1/carts/" method="POST">
2323
<service class="Magento\Quote\Api\CartManagementInterface" method="createEmptyCart"/>
2424
<resources>
25-
<resource ref="Magento_Sales::create" />
25+
<resource ref="anonymous" />
2626
</resources>
2727
</route>
2828
<route url="/V1/carts/:cartId" method="PUT">
2929
<service class="Magento\Quote\Api\CartManagementInterface" method="assignCustomer"/>
3030
<resources>
31-
<resource ref="Magento_Sales::create" />
31+
<resource ref="anonymous" />
3232
</resources>
3333
</route>
3434
<route url="/V1/carts/:cartId/selected-shipping-method" method="PUT">
3535
<service class="Magento\Quote\Api\ShippingMethodManagementInterface" method="set"/>
3636
<resources>
37-
<resource ref="Magento_Sales::sales" />
37+
<resource ref="anonymous" />
3838
</resources>
3939
</route>
4040
<route url="/V1/carts/:cartId/selected-shipping-method" method="GET">
@@ -46,13 +46,13 @@
4646
<route url="/V1/carts/:cartId/shipping-methods" method="GET">
4747
<service class="Magento\Quote\Api\ShippingMethodManagementInterface" method="getList"/>
4848
<resources>
49-
<resource ref="Magento_Sales::sales" />
50-
</resources>
49+
<resource ref="anonymous" />
50+
</resources>
5151
</route>
5252
<route url="/V1/carts/:cartId/items" method="GET">
5353
<service class="Magento\Quote\Api\CartItemRepositoryInterface" method="getList"/>
5454
<resources>
55-
<resource ref="Magento_Catalog::products" />
55+
<resource ref="anonymous" />
5656
</resources>
5757
</route>
5858
<route url="/V1/carts/items" method="POST">
@@ -64,91 +64,91 @@
6464
<route url="/V1/carts/items/:itemId" method="PUT">
6565
<service class="Magento\Quote\Api\CartItemRepositoryInterface" method="save"/>
6666
<resources>
67-
<resource ref="Magento_Catalog::products" />
67+
<resource ref="anonymous" />
6868
</resources>
6969
</route>
7070
<route url="/V1/carts/:cartId/items/:itemId" method="DELETE">
7171
<service class="Magento\Quote\Api\CartItemRepositoryInterface" method="deleteById"/>
7272
<resources>
73-
<resource ref="Magento_Catalog::products" />
73+
<resource ref="anonymous" />
7474
</resources>
7575
</route>
7676
<route url="/V1/carts/:cartId/selected-payment-methods" method="GET">
7777
<service class="Magento\Quote\Api\PaymentMethodManagementInterface" method="get"/>
7878
<resources>
79-
<resource ref="Magento_Sales::sales" />
79+
<resource ref="anonymous" />
8080
</resources>
8181
</route>
8282
<route url="/V1/carts/:cartId/selected-payment-methods" method="PUT">
8383
<service class="Magento\Quote\Api\PaymentMethodManagementInterface" method="set"/>
8484
<resources>
85-
<resource ref="Magento_Sales::sales" />
85+
<resource ref="anonymous" />
8686
</resources>
8787
</route>
8888
<route url="/V1/carts/:cartId/payment-methods" method="GET">
8989
<service class="Magento\Quote\Api\PaymentMethodManagementInterface" method="getList"/>
9090
<resources>
91-
<resource ref="Magento_Sales::sales" />
91+
<resource ref="anonymous" />
9292
</resources>
9393
</route>
9494
<route url="/V1/carts/:cartId/billing-address" method="GET">
9595
<service class="Magento\Quote\Api\BillingAddressManagementInterface" method="get"/>
9696
<resources>
97-
<resource ref="Magento_Sales::sales" />
97+
<resource ref="anonymous" />
9898
</resources>
9999
</route>
100100
<route url="/V1/carts/:cartId/billing-address" method="POST">
101101
<service class="Magento\Quote\Api\BillingAddressManagementInterface" method="assign"/>
102102
<resources>
103-
<resource ref="Magento_Sales::sales" />
103+
<resource ref="anonymous" />
104104
</resources>
105105
</route>
106106
<route url="/V1/carts/:cartId/coupons" method="GET">
107107
<service class="Magento\Quote\Api\CouponManagementInterface" method="get"/>
108108
<resources>
109-
<resource ref="Magento_SalesRule::quote" />
109+
<resource ref="anonymous" />
110110
</resources>
111111
</route>
112112
<route url="/V1/carts/:cartId/coupons/:couponCode" method="PUT">
113113
<service class="Magento\Quote\Api\CouponManagementInterface" method="set"/>
114114
<resources>
115-
<resource ref="Magento_SalesRule::quote" />
115+
<resource ref="anonymous" />
116116
</resources>
117117
</route>
118118
<route url="/V1/carts/:cartId/coupons" method="DELETE">
119119
<service class="Magento\Quote\Api\CouponManagementInterface" method="remove"/>
120120
<resources>
121-
<resource ref="Magento_SalesRule::quote" />
121+
<resource ref="anonymous" />
122122
</resources>
123123
</route>
124124
<route url="/V1/carts/:cartId/shipping-address" method="GET">
125125
<service class="Magento\Quote\Api\ShippingAddressManagementInterface" method="get"/>
126126
<resources>
127-
<resource ref="Magento_Sales::sales" />
127+
<resource ref="anonymous" />
128128
</resources>
129129
</route>
130130
<route url="/V1/carts/:cartId/shipping-address" method="POST">
131131
<service class="Magento\Quote\Api\ShippingAddressManagementInterface" method="assign"/>
132132
<resources>
133-
<resource ref="Magento_Sales::sales" />
133+
<resource ref="anonymous" />
134134
</resources>
135135
</route>
136136
<route url="/V1/carts/:cartId/order" method="PUT">
137137
<service class="Magento\Quote\Api\CartManagementInterface" method="placeOrder"/>
138138
<resources>
139-
<resource ref="Magento_Sales::sales" />
139+
<resource ref="anonymous" />
140140
</resources>
141141
</route>
142142
<route url="/V1/carts/:cartId/totals" method="GET">
143143
<service class="Magento\Quote\Api\CartTotalRepositoryInterface" method="get"/>
144144
<resources>
145-
<resource ref="Magento_Sales::sales" />
145+
<resource ref="anonymous" />
146146
</resources>
147147
</route>
148148
<route url="/V1/customer/:customerId/cart" method="GET">
149149
<service class="Magento\Quote\Api\CartManagementInterface" method="getCartForCustomer"/>
150150
<resources>
151-
<resource ref="Magento_Catalog::products" />
151+
<resource ref="self" />
152152
</resources>
153153
</route>
154154
</routes>

‎app/code/Magento/Webapi/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212

1313
/**
1414
* API permissions tab for integration activation dialog.
15-
*
16-
* TODO: Fix warnings suppression
17-
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1815
*/
1916
class Webapi extends \Magento\Backend\Block\Widget\Form\Generic implements
2017
\Magento\Backend\Block\Widget\Tab\TabInterface

0 commit comments

Comments
 (0)