Bug 1435155 - Redact the shipping address as it is visible before the…

… promise from PaymentRequest.show() resolves successfully. r=baku Spec PR: w3c/payment-request#654 MozReview-Commit-ID: 2AiKI7htRhk UltraBlame original commit: 8a29a154e88dc58d0ffde543a2159d70638ce53c
marco-c · Oct 2, 2019 · 754d85f · 754d85f
1 parent 6a893cb
commit 754d85f
Show file tree

Hide file tree

Showing 4 changed files with 587 additions and 4 deletions.
diff --git a/dom/payments/PaymentRequest.cpp b/dom/payments/PaymentRequest.cpp
@@ -3791,7 +3791,7 @@ mInternalId
 mId
 aMethodName
 mShippingOption
-mShippingAddress
+mFullShippingAddress
 aDetails
 aPayerName
 aPayerEmail
@@ -4533,6 +4533,12 @@ nsAString
 aPhone
 )
 {
+nsTArray
+<
+nsString
+>
+emptyArray
+;
 mShippingAddress
 =
 new
@@ -4542,6 +4548,33 @@ GetOwner
 (
 )
 aCountry
+emptyArray
+aRegion
+aCity
+aDependentLocality
+aPostalCode
+aSortingCode
+aLanguageCode
+EmptyString
+(
+)
+EmptyString
+(
+)
+EmptyString
+(
+)
+)
+;
+mFullShippingAddress
+=
+new
+PaymentAddress
+(
+GetOwner
+(
+)
+aCountry
 aAddressLine
 aRegion
 aCity

diff --git a/dom/payments/PaymentRequest.h b/dom/payments/PaymentRequest.h
@@ -662,6 +662,12 @@ PaymentAddress
 >
 mShippingAddress
 ;
+RefPtr
+<
+PaymentAddress
+>
+mFullShippingAddress
+;
 nsString
 mShippingOption
 ;

diff --git a/dom/payments/test/ShowPaymentChromeScript.js b/dom/payments/test/ShowPaymentChromeScript.js
@@ -184,6 +184,8 @@ San
 Bruno
 "
 "
+Test
+locality
 "
 "
 94066
@@ -195,6 +197,8 @@ Bruno
 en
 "
 "
+Testing
+Org
 "
 "
 Bill
-Original file line number
+Diff line change
@@ Expand Up / @@ -184,6 +184,8 @@ San @@
     Bruno
     "
     "
+    Test
+    locality
     "
     "
@@ Expand All / @@ -195,6 +197,8 @@ Bruno @@
     en
     "
     "
+    Testing
+    Org
     "
     "
     Bill
@@ Expand Down @@