Purchases: Fix purchase not updated upon privacy protection cancelation #555

stephanethomas · 2015-11-23T19:45:05Z

This pull request fixes #189 by retrieving the domain registration purchase returned by the API when users cancel the associated private registration. The goal is to display the Manage Purchase page with up-to-date information as soon as the cancelation is successful:

This pull request also fixes a small bug and refactor some code, mostly for consistency purposes.

Testing instructions

Scenario _#_1

Get a new test account and blog
Enable the store sandbox
Navigate to the Domains page
Click on any Add button to add a domain to the shopping cart
Click on the No thanks, I don't need email or will use another provider. link on the next page
Fill in the Domain Registration Details page and click on the Add Privacy Protection button
Submit the form on the Secure Payment page with fake credit card information
Head to the Purchases page
Click the new domain registration to display the corresponding Manage Purchase page
Note the current price and click the Cancel Private Registration navigation link
Click the Cancel Private Registration on the page of the same name
Check that you are redirected on the Manage Purchase page with a success message
Check that the price is updated instantaneously and matches the cost of a domain registration without privacy protection

stephanethomas · 2015-11-23T19:50:37Z

This is still in progress because of a discrepancy between purchases returned by the /me/purchases API endpoint and the one returned by the /upgrades/:purchaseId/cancel-privacy-protection endpoint: for some reasons - probably legacy ones - the content of the purchase differs. Otherwise this is good for feedback.

gziolo · 2015-11-24T10:24:27Z

client/lib/purchases/test/store-test.js

-			assert( find( PurchasesStore.get().data, { id: 2 } ) );
-			assert( find( PurchasesStore.get().data, { id: 3 } ) );
+			expect( PurchasesStore.get() ).to.be.eql( {
+				data: [ { id: 2 }, { id: 3 }, { id: 1 } ],


does order matter here?

Yes, surprisingly it does :(.

I see now in code why it works this way. It's okey, because it's predictable.

gziolo · 2015-11-24T10:29:38Z

Code looks good 👍
BTW, this is great approach with returning purchase updated purchase data from REST endpoint, we should implement similar approach in other actions.

gziolo · 2015-11-24T10:54:44Z

This is what has displayed to me after canceling privacy protection:

Errors in JS console:

Do I need any backend patch to make it work properly?

stephanethomas · 2015-11-24T11:00:26Z

Yes, that's what I mentioned earlier. The purchase data returned by the /upgrades/:purchaseId/cancel-privacy-protection endpoint doesn't match exactly the structure returned by the /me/purchases endpoint.

gziolo · 2015-11-24T11:01:47Z

I changed to In Progress, so far so good! :D

scruffian · 2015-11-25T12:43:40Z

This will be fixed by #699. Not sure if its worth continuing with this PR...

fabianapsimoes · 2015-11-25T13:20:01Z

This will be fixed by #699. Not sure if its worth continuing with this PR.

FYI, #699 does not fix #189.

scruffian · 2015-11-25T13:25:03Z

FYI, #699 does not fix #189.

Ok, thanks for testing. The approach in #699 could be used here though, as an alternative fix... Only an idea :)

stephanethomas · 2015-11-26T14:10:19Z

This pull request is complete, we just need to fix the API to return the right data structure.

scruffian · 2015-11-30T16:18:59Z

QA 👍

This checks the actual data structure of the store after fetching.

This better handles the case where an error is returned by the API.

This makes this action more consistent with other actions.

…el private registration action

Let's follow one naming convention and make this code simpler.

…th other stores This also formats a block of code and adds some blank lines - to help us breathe.

… by the API

…n of private registration is successful This allows to update the Purchases store as soon as possible with up-to-date information (such as the correct price of the domain registration purchase) without resorting to fetching the list of updates.

…dpoint

…ation Purchases: Fix purchase not updated upon privacy protection cancelation

stephanethomas self-assigned this Nov 23, 2015

stephanethomas added this to the Purchases: v1 milestone Nov 23, 2015

gziolo reviewed Nov 24, 2015
View reviewed changes

gziolo added [Status] Awaiting Fixes [Status] Needs Author Reply and removed [Status] In Progress [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. [Status] Awaiting Fixes labels Nov 24, 2015

gziolo added [Status] In Progress and removed [Status] Needs Author Reply labels Nov 24, 2015

stephanethomas force-pushed the fix/privacy-protection-cancelation branch from b0dece3 to d85efd8 Compare November 24, 2015 11:02

stephanethomas force-pushed the fix/privacy-protection-cancelation branch 4 times, most recently from d79d0d2 to 45b4b92 Compare November 30, 2015 15:40

stephanethomas added 11 commits November 30, 2015 16:20

Purchases: Refine unit test for the Purchases store

2db5ec8

This checks the actual data structure of the store after fetching.

Purchases: Add more unit tests for the Purchases store

6a2d606

Purchases: Add missing debugs to purchases actions

2766dae

Purchases: Remove unnecessary debug in purchases actions

25ec974

This better handles the case where an error is returned by the API.

Purchases: Remove unnecessary inner function in purchases actions

4623a96

This makes this action more consistent with other actions.

Purchases: Retrieve the error message returned by the API in the canc…

28c8de7

…el private registration action

Purchases: Make success flag handling more consistent in purchases

acce369

Let's follow one naming convention and make this code simpler.

Purchases: Reorder events in Purchases store to be more consistent wi…

fd5b9be

…th other stores This also formats a block of code and adds some blank lines - to help us breathe.

Purchases: Extract function that assembles a purchase object returned…

ff6a3c2

… by the API

Purchases: Target the new version of the cancel privacy protection en…

b01894f

…dpoint

stephanethomas force-pushed the fix/privacy-protection-cancelation branch from 45b4b92 to b01894f Compare November 30, 2015 16:21

scruffian added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. and removed [Status] In Progress labels Nov 30, 2015

stephanethomas added a commit that referenced this pull request Nov 30, 2015

Merge pull request #555 from Automattic/fix/privacy-protection-cancel…

6cdf032

…ation Purchases: Fix purchase not updated upon privacy protection cancelation

stephanethomas merged commit 6cdf032 into master Nov 30, 2015

stephanethomas removed the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label Nov 30, 2015

stephanethomas deleted the fix/privacy-protection-cancelation branch November 30, 2015 17:07

gziolo mentioned this pull request Dec 1, 2015

Purchases: Domain mapping does not get removed immediately after being cancelled #1137

Closed

fabianapsimoes modified the milestone: Purchases: Future Feb 25, 2016

snyk-bot mentioned this pull request Aug 29, 2022

[Snyk] Security upgrade sanitize-html from 1.11.1 to 2.7.1 mdno/wp-calypso#108

Open

apmarshall mentioned this pull request Aug 30, 2022

[Snyk] Security upgrade sanitize-html from 1.11.1 to 2.7.1 NonProphets/wp-calypso#50

Open

snyk-bot mentioned this pull request Aug 30, 2022

[Snyk] Security upgrade sanitize-html from 1.11.1 to 2.7.1 mayuba/wp-calypso#69

Open

anarh mentioned this pull request Aug 30, 2022

[Snyk] Security upgrade sanitize-html from 1.11.1 to 2.7.1 anarh/wp-calypso#98

Open

snyk-bot mentioned this pull request Mar 27, 2023

[Snyk] Fix for 16 vulnerabilities mayuba/wp-calypso#79

Open

mayuba mentioned this pull request Jun 20, 2023

[Snyk] Fix for 1 vulnerabilities mayuba/wp-calypso#80

Open

mdno mentioned this pull request Jun 20, 2023

[Snyk] Fix for 1 vulnerabilities mdno/wp-calypso#123

Open

anarh mentioned this pull request Jun 21, 2023

[Snyk] Fix for 1 vulnerabilities anarh/wp-calypso#111

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Purchases: Fix purchase not updated upon privacy protection cancelation #555

Purchases: Fix purchase not updated upon privacy protection cancelation #555

stephanethomas commented Nov 23, 2015

stephanethomas commented Nov 23, 2015

gziolo Nov 24, 2015

stephanethomas Nov 24, 2015

gziolo Nov 24, 2015

gziolo commented Nov 24, 2015

gziolo commented Nov 24, 2015

stephanethomas commented Nov 24, 2015

gziolo commented Nov 24, 2015

scruffian commented Nov 25, 2015

fabianapsimoes commented Nov 25, 2015

scruffian commented Nov 25, 2015

stephanethomas commented Nov 26, 2015

scruffian commented Nov 30, 2015

Purchases: Fix purchase not updated upon privacy protection cancelation #555

Purchases: Fix purchase not updated upon privacy protection cancelation #555

Conversation

stephanethomas commented Nov 23, 2015

Testing instructions

Scenario _#_1

stephanethomas commented Nov 23, 2015

gziolo Nov 24, 2015

Choose a reason for hiding this comment

stephanethomas Nov 24, 2015

Choose a reason for hiding this comment

gziolo Nov 24, 2015

Choose a reason for hiding this comment

gziolo commented Nov 24, 2015

gziolo commented Nov 24, 2015

stephanethomas commented Nov 24, 2015

gziolo commented Nov 24, 2015

scruffian commented Nov 25, 2015

fabianapsimoes commented Nov 25, 2015

scruffian commented Nov 25, 2015

stephanethomas commented Nov 26, 2015

scruffian commented Nov 30, 2015