Use email from customer session when available (#13161)

amk-stripe · codex · web-flow · commit 8732391adf02 · 2026-06-02T09:09:23.000-07:00
* Add email to ElementsSession.Customer

Committed-By-Agent: codex
Co-authored-by: codex &lt;noreply@openai.com&gt;

* Use customer email from elements session when available

fix up

* Update test

* Fix network tests

* fix test

* Add helper so we don't have to set email everywhere

---------

Co-authored-by: codex &lt;noreply@openai.com&gt;
diff --git a/paymentsheet/src/androidTest/java/com/stripe/android/paymentelement/EmbeddedPaymentElementTest.kt b/paymentsheet/src/androidTest/java/com/stripe/android/paymentelement/EmbeddedPaymentElementTest.kt
@@ -266,14 +266,6 @@ internal class EmbeddedPaymentElementTest {
             response.testBodyFromFile("elements-sessions-requires_pm_with_link_and_cs.json")
         }
 
-        networkRule.enqueue(
-            host("api.stripe.com"),
-            method("GET"),
-            path("/v1/customers/cus_1"),
-        ) { response ->
-            response.testBodyFromFile("customer-get-success.json")
-        }
-
         networkRule.enqueue(
             method("POST"),
             path("/v1/consumers/sessions/lookup"),
diff --git a/paymentsheet/src/androidTest/java/com/stripe/android/paymentelement/taptoadd/TapToAddTest.kt b/paymentsheet/src/androidTest/java/com/stripe/android/paymentelement/taptoadd/TapToAddTest.kt
@@ -243,8 +243,6 @@ internal class TapToAddTest {
             response.elementsSessionTtaWithLink()
         }
 
-        enqueueRetrieveCustomerRequest()
-
         val info = cardCollectionTestHelper.enqueueSuccessfulTapToCollectFlow()
 
         linkHelper.enqueueLookup()
@@ -277,15 +275,6 @@ internal class TapToAddTest {
         }
     }
 
-    private fun enqueueRetrieveCustomerRequest() {
-        networkRule.enqueue(
-            method("GET"),
-            path("/v1/customers/cus_123"),
-        ) { response ->
-            response.testBodyFromFile("tta-customer-get-success.json")
-        }
-    }
-
     private fun enqueueConfirmRequests() {
         networkRule.enqueue(
             method("GET"),
diff --git a/paymentsheet/src/androidTest/java/com/stripe/android/paymentsheet/FlowControllerTest.kt b/paymentsheet/src/androidTest/java/com/stripe/android/paymentsheet/FlowControllerTest.kt
@@ -1096,14 +1096,6 @@ internal class FlowControllerTest {
             response.testBodyFromFile("elements-sessions-requires_pm_with_link_and_cs.json")
         }
 
-        networkRule.enqueue(
-            host("api.stripe.com"),
-            method("GET"),
-            path("/v1/customers/cus_1"),
-        ) { response ->
-            response.testBodyFromFile("customer-get-success.json")
-        }
-
         networkRule.enqueue(
             method("POST"),
             path("/v1/consumers/sessions/lookup"),
@@ -1165,14 +1157,6 @@ internal class FlowControllerTest {
             response.testBodyFromFile("elements-sessions-requires_pm_with_link_and_cs.json")
         }
 
-        networkRule.enqueue(
-            host("api.stripe.com"),
-            method("GET"),
-            path("/v1/customers/cus_1"),
-        ) { response ->
-            response.testBodyFromFile("customer-get-success.json")
-        }
-
         networkRule.enqueue(
             method("POST"),
             path("/v1/consumers/sessions/lookup"),
diff --git a/paymentsheet/src/androidTest/java/com/stripe/android/paymentsheet/LinkTest.kt b/paymentsheet/src/androidTest/java/com/stripe/android/paymentsheet/LinkTest.kt
@@ -1062,14 +1062,6 @@ internal class LinkTest {
             response.testBodyFromFile("elements-sessions-requires_pm_with_link_and_cs.json")
         }
 
-        networkRule.enqueue(
-            host("api.stripe.com"),
-            method("GET"),
-            path("/v1/customers/cus_1"),
-        ) { response ->
-            response.testBodyFromFile("customer-get-success.json")
-        }
-
         networkRule.enqueue(
             method("POST"),
             path("/v1/consumers/sessions/lookup"),
diff --git a/paymentsheet/src/androidTest/resources/elements-sessions-requires_pm_with_link_and_cs.json b/paymentsheet/src/androidTest/resources/elements-sessions-requires_pm_with_link_and_cs.json
@@ -34,6 +34,7 @@
   },
   "customer": {
     "payment_methods": [],
+    "email": "example@stripe.com",
     "customer_session": {
       "id": "cuss_654321",
       "livemode": false,
diff --git a/paymentsheet/src/androidTest/resources/tta-customer-get-success.json b/paymentsheet/src/androidTest/resources/tta-customer-get-success.json
diff --git a/paymentsheet/src/main/java/com/stripe/android/common/analytics/experiment/LogLinkHoldbackExperiment.kt b/paymentsheet/src/main/java/com/stripe/android/common/analytics/experiment/LogLinkHoldbackExperiment.kt
@@ -79,7 +79,7 @@ internal class DefaultLogLinkHoldbackExperiment @Inject constructor(
             elementsSession.experimentsData
         ) { "Experiments data required to log exposures" }
 
-        val customerEmail = state.getEmail()
+        val customerEmail = state.getEmail(elementsSession.customer?.email)
 
         val defaultValues = state.getDefaultValues()
 
@@ -177,11 +177,14 @@ internal class DefaultLogLinkHoldbackExperiment @Inject constructor(
         return paymentMethodSaveEnabled && linkDisabledOrEnableLinkSPMFlagEnabled
     }
 
-    private suspend fun PaymentElementLoader.State.getEmail(): String? {
+    private suspend fun PaymentElementLoader.State.getEmail(
+        elementsSessionCustomerEmail: String?
+    ): String? {
         paymentMethodMetadata.linkState?.configuration?.customerInfo?.email?.let { return it }
         return retrieveCustomerEmail(
             configuration = config,
             customerMetadata = paymentMethodMetadata.customerMetadata,
+            customerEmail = elementsSessionCustomerEmail,
         )
     }
 }
diff --git a/paymentsheet/src/main/java/com/stripe/android/model/ElementsSession.kt b/paymentsheet/src/main/java/com/stripe/android/model/ElementsSession.kt
@@ -160,6 +160,7 @@ internal data class ElementsSession(
     data class Customer(
         val paymentMethods: List<PaymentMethod>,
         val defaultPaymentMethod: String?,
+        val email: String?,
         val session: Session,
     ) : StripeModel {
         @Parcelize
diff --git a/paymentsheet/src/main/java/com/stripe/android/model/parsers/ElementsSessionJsonParser.kt b/paymentsheet/src/main/java/com/stripe/android/model/parsers/ElementsSessionJsonParser.kt
@@ -288,8 +288,13 @@ internal class ElementsSessionJsonParser(
             it.isNotBlank()
         }
 
+        val email = json.optString(FIELD_CUSTOMER_EMAIL).takeIf {
+            it.isNotBlank()
+        }
+
         return ElementsSession.Customer(
             paymentMethods = mergedPaymentMethods,
+            email = email,
             session = customerSession,
             defaultPaymentMethod = defaultPaymentMethod
         )
@@ -581,6 +586,7 @@ internal class ElementsSessionJsonParser(
         private const val FIELD_CUSTOMER_API_KEY = "api_key"
         private const val FIELD_CUSTOMER_API_KEY_EXPIRY = "api_key_expiry"
         private const val FIELD_CUSTOMER_NAME = "customer"
+        private const val FIELD_CUSTOMER_EMAIL = "email"
         private const val FIELD_COMPONENTS = "components"
         private const val FIELD_MOBILE_PAYMENT_ELEMENT = "mobile_payment_element"
         private const val FIELD_CUSTOMER_SHEET = "customer_sheet"
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/state/CreateLinkState.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/state/CreateLinkState.kt
@@ -222,7 +222,11 @@ internal class DefaultCreateLinkState @Inject constructor(
         val shippingDetails = configuration.shippingDetails
         val customerPhone = getCustomerPhone(shippingDetails, configuration)
 
-        val resolvedEmail = retrieveCustomerEmail(configuration, customerMetadata)
+        val resolvedEmail = retrieveCustomerEmail(
+            configuration,
+            customerMetadata,
+            customerEmail = elementsSession.customer?.email,
+        )
         val customerInfo = LinkConfiguration.CustomerInfo(
             name = configuration.defaultBillingDetails?.name,
             email = resolvedEmail,
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/state/RetrieveCustomerEmail.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/state/RetrieveCustomerEmail.kt
@@ -17,6 +17,7 @@ internal interface RetrieveCustomerEmail {
     suspend operator fun invoke(
         configuration: CommonConfiguration,
         customerMetadata: CustomerMetadata?,
+        customerEmail: String?,
     ): String?
 }
 
@@ -27,14 +28,12 @@ internal class DefaultRetrieveCustomerEmail @Inject constructor(
     override suspend operator fun invoke(
         configuration: CommonConfiguration,
         customerMetadata: CustomerMetadata?,
+        customerEmail: String?,
     ): String? {
         val defaultEmail = configuration.defaultBillingDetails?.email
         return when (customerMetadata) {
             is CustomerMetadata.CustomerSession -> {
-                defaultEmail ?: retrieveEmailFromApi(
-                    customerId = customerMetadata.id,
-                    ephemeralKeySecret = customerMetadata.ephemeralKeySecret,
-                )
+                defaultEmail ?: customerEmail
             }
             is CustomerMetadata.LegacyEphemeralKey -> {
                 defaultEmail ?: retrieveEmailFromApi(
diff --git a/paymentsheet/src/test/java/com/stripe/android/common/analytics/experiment/LogLinkGlobalHoldbackExposureTest.kt b/paymentsheet/src/test/java/com/stripe/android/common/analytics/experiment/LogLinkGlobalHoldbackExposureTest.kt
@@ -498,6 +498,7 @@ class LogLinkGlobalHoldbackExposureTest {
     ): ElementsSession.Customer =
         ElementsSession.Customer(
             paymentMethods = listOf(),
+            email = null,
             session = ElementsSession.Customer.Session(
                 id = "cuss_123",
                 customerId = "cus_123",
diff --git a/paymentsheet/src/test/java/com/stripe/android/customersheet/CustomerSheetFixtures.kt b/paymentsheet/src/test/java/com/stripe/android/customersheet/CustomerSheetFixtures.kt
@@ -119,6 +119,7 @@ internal object CustomerSheetFixtures {
     ) = if (hasCustomerSession) {
         ElementsSession.Customer(
             paymentMethods = listOf(),
+            email = null,
             session = ElementsSession.Customer.Session(
                 id = "cuss_123",
                 customerId = "cus_123",
diff --git a/paymentsheet/src/test/java/com/stripe/android/customersheet/data/DefaultCustomerSessionElementsSessionManagerTest.kt b/paymentsheet/src/test/java/com/stripe/android/customersheet/data/DefaultCustomerSessionElementsSessionManagerTest.kt
@@ -520,6 +520,7 @@ class DefaultCustomerSessionElementsSessionManagerTest {
         return ElementsSession.Customer(
             paymentMethods = listOf(),
             defaultPaymentMethod = null,
+            email = null,
             session = ElementsSession.Customer.Session(
                 id = "cuss_1",
                 customerId = "cus_1",
diff --git a/paymentsheet/src/test/java/com/stripe/android/customersheet/data/FakeCustomerSessionElementsSessionManager.kt b/paymentsheet/src/test/java/com/stripe/android/customersheet/data/FakeCustomerSessionElementsSessionManager.kt
@@ -27,6 +27,7 @@ internal class FakeCustomerSessionElementsSessionManager(
             isPaymentMethodSyncDefaultEnabled = isPaymentMethodSyncDefaultEnabled,
         ),
     private val customer: ElementsSession.Customer = ElementsSession.Customer(
+        email = null,
         session = ElementsSession.Customer.Session(
             id = "cuss_1",
             customerId = "cus_1",
diff --git a/paymentsheet/src/test/java/com/stripe/android/customersheet/state/DefaultCustomerSheetLoaderTest.kt b/paymentsheet/src/test/java/com/stripe/android/customersheet/state/DefaultCustomerSheetLoaderTest.kt
@@ -797,6 +797,7 @@ internal class DefaultCustomerSheetLoaderTest {
             isGooglePayEnabled = false,
             customer = ElementsSession.Customer(
                 paymentMethods = listOf(),
+                email = null,
                 session = ElementsSession.Customer.Session(
                     id = "cuss_123",
                     customerId = "cus_123",
diff --git a/paymentsheet/src/test/java/com/stripe/android/lpmfoundations/paymentmethod/CustomerMetadataTest.kt b/paymentsheet/src/test/java/com/stripe/android/lpmfoundations/paymentmethod/CustomerMetadataTest.kt
@@ -384,6 +384,7 @@ internal class CustomerMetadataTest {
         return ElementsSession.Customer(
             paymentMethods = paymentMethods,
             defaultPaymentMethod = defaultPaymentMethodId,
+            email = null,
             session = ElementsSession.Customer.Session(
                 id = "cuss_1",
                 customerId = customerId,
diff --git a/paymentsheet/src/test/java/com/stripe/android/lpmfoundations/paymentmethod/PaymentMethodMetadataKtxTest.kt b/paymentsheet/src/test/java/com/stripe/android/lpmfoundations/paymentmethod/PaymentMethodMetadataKtxTest.kt
@@ -140,6 +140,7 @@ internal class PaymentMethodMetadataKtxTest {
         return ElementsSession.Customer(
             paymentMethods = emptyList(),
             defaultPaymentMethod = null,
+            email = null,
             session = ElementsSession.Customer.Session(
                 id = "cuss_1",
                 customerId = "cus_1",
diff --git a/paymentsheet/src/test/java/com/stripe/android/lpmfoundations/paymentmethod/PaymentMethodMetadataTest.kt b/paymentsheet/src/test/java/com/stripe/android/lpmfoundations/paymentmethod/PaymentMethodMetadataTest.kt
@@ -1404,6 +1404,7 @@ internal class PaymentMethodMetadataTest {
             customer = mobilePaymentElementComponent?.let { component ->
                 ElementsSession.Customer(
                     paymentMethods = listOf(),
+                    email = null,
                     session = ElementsSession.Customer.Session(
                         id = "cuss_123",
                         customerId = "cus_123",
diff --git a/paymentsheet/src/test/java/com/stripe/android/model/ElementsSessionFixtures.kt b/paymentsheet/src/test/java/com/stripe/android/model/ElementsSessionFixtures.kt
@@ -512,6 +512,7 @@ internal object ElementsSessionFixtures {
         paymentMethodsWithLinkDetails: String = "",
         passMobilePaymentElement: Boolean = true,
         passCustomerSheet: Boolean = true,
+        customerEmail: String? = null,
     ): JSONObject {
         return JSONObject(
             """
@@ -633,6 +634,7 @@ internal object ElementsSessionFixtures {
                   "livemode": false
                 },
                 "default_payment_method": "pm_123",
+                "email": ${customerEmail?.let { "\"$it\"" } ?: "null"},
                 "payment_methods": [
                   {
                     "id": "pm_123",
diff --git a/paymentsheet/src/test/java/com/stripe/android/model/parsers/ElementsSessionJsonParserTest.kt b/paymentsheet/src/test/java/com/stripe/android/model/parsers/ElementsSessionJsonParserTest.kt
@@ -747,6 +747,7 @@ class ElementsSessionJsonParserTest {
 
         assertThat(elementsSession?.customer).isEqualTo(
             ElementsSession.Customer(
+                email = null,
                 session = ElementsSession.Customer.Session(
                     id = "cuss_123",
                     apiKey = "ek_test_1234",
@@ -805,6 +806,27 @@ class ElementsSessionJsonParserTest {
         )
     }
 
+    @Test
+    fun `ElementsSession has expected customer email in the response`() {
+        val parser = ElementsSessionJsonParser(
+            ElementsSessionParams.PaymentIntentType(
+                clientSecret = "secret",
+                customerSessionClientSecret = "customer_session_client_secret",
+                externalPaymentMethods = emptyList(),
+                customPaymentMethods = emptyList(),
+                appId = APP_ID
+            ),
+            isLiveMode = false,
+        )
+
+        val intent = createPaymentIntentWithCustomerSession(
+            customerEmail = "customer@example.com",
+        )
+        val elementsSession = parser.parse(intent)
+
+        assertThat(elementsSession?.customer?.email).isEqualTo("customer@example.com")
+    }
+
     @Test
     fun `ElementsSession sets remove last permissions to 'NotProvided' if null`() {
         val parser = ElementsSessionJsonParser(
@@ -863,6 +885,7 @@ class ElementsSessionJsonParserTest {
 
         assertThat(elementsSession?.customer).isEqualTo(
             ElementsSession.Customer(
+                email = null,
                 session = ElementsSession.Customer.Session(
                     id = "cuss_123",
                     apiKey = "ek_test_1234",
@@ -933,6 +956,7 @@ class ElementsSessionJsonParserTest {
 
         assertThat(elementsSession?.customer).isEqualTo(
             ElementsSession.Customer(
+                email = null,
                 session = ElementsSession.Customer.Session(
                     id = "cuss_123",
                     apiKey = "ek_test_1234",
@@ -1208,6 +1232,7 @@ class ElementsSessionJsonParserTest {
 
         assertThat(elementsSession?.customer).isEqualTo(
             ElementsSession.Customer(
+                email = null,
                 session = ElementsSession.Customer.Session(
                     id = "cuss_123",
                     apiKey = "ek_test_1234",
diff --git a/paymentsheet/src/test/java/com/stripe/android/paymentsheet/state/CreateCustomerMetadataTest.kt b/paymentsheet/src/test/java/com/stripe/android/paymentsheet/state/CreateCustomerMetadataTest.kt
@@ -287,6 +287,7 @@ internal class CreateCustomerMetadataTest {
             return ElementsSession.Customer(
                 paymentMethods = emptyList(),
                 defaultPaymentMethod = null,
+                email = null,
                 session = ElementsSession.Customer.Session(
                     id = "cuss_123",
                     customerId = "cus_1",
diff --git a/paymentsheet/src/test/java/com/stripe/android/paymentsheet/state/CreateCustomerStateTest.kt b/paymentsheet/src/test/java/com/stripe/android/paymentsheet/state/CreateCustomerStateTest.kt
@@ -292,6 +292,7 @@ internal class CreateCustomerStateTest {
             return ElementsSession.Customer(
                 paymentMethods = paymentMethods,
                 defaultPaymentMethod = defaultPaymentMethodId,
+                email = null,
                 session = ElementsSession.Customer.Session(
                     id = "cuss_1",
                     customerId = "cus_1",
diff --git a/paymentsheet/src/test/java/com/stripe/android/paymentsheet/state/DefaultAnalyticsMetadataFactoryTest.kt b/paymentsheet/src/test/java/com/stripe/android/paymentsheet/state/DefaultAnalyticsMetadataFactoryTest.kt
@@ -846,6 +846,7 @@ class DefaultAnalyticsMetadataFactoryTest {
         return ElementsSession.Customer(
             paymentMethods = listOf(PaymentMethodFixtures.CARD_PAYMENT_METHOD),
             defaultPaymentMethod = PaymentMethodFixtures.CARD_PAYMENT_METHOD.id,
+            email = null,
             session = ElementsSession.Customer.Session(
                 id = "cuss_123",
                 apiKey = "ek_test_1234",
diff --git a/paymentsheet/src/test/java/com/stripe/android/paymentsheet/state/DefaultCreateLinkStateTest.kt b/paymentsheet/src/test/java/com/stripe/android/paymentsheet/state/DefaultCreateLinkStateTest.kt
diff --git a/paymentsheet/src/test/java/com/stripe/android/paymentsheet/state/DefaultPaymentElementLoaderTest.kt b/paymentsheet/src/test/java/com/stripe/android/paymentsheet/state/DefaultPaymentElementLoaderTest.kt
diff --git a/paymentsheet/src/test/java/com/stripe/android/paymentsheet/state/DefaultRetrieveCustomerEmailTest.kt b/paymentsheet/src/test/java/com/stripe/android/paymentsheet/state/DefaultRetrieveCustomerEmailTest.kt

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ internal class DefaultLogLinkHoldbackExperiment @Inject constructor(`
`79`	`79`	`elementsSession.experimentsData`
`80`	`80`	`) { "Experiments data required to log exposures" }`
`81`	`81`
`82`		`- val customerEmail = state.getEmail()`
	`82`	`+ val customerEmail = state.getEmail(elementsSession.customer?.email)`
`83`	`83`
`84`	`84`	`val defaultValues = state.getDefaultValues()`
`85`	`85`
`@@ -177,11 +177,14 @@ internal class DefaultLogLinkHoldbackExperiment @Inject constructor(`
`177`	`177`	`return paymentMethodSaveEnabled && linkDisabledOrEnableLinkSPMFlagEnabled`
`178`	`178`	`}`
`179`	`179`
`180`		`- private suspend fun PaymentElementLoader.State.getEmail(): String? {`
	`180`	`+ private suspend fun PaymentElementLoader.State.getEmail(`
	`181`	`+ elementsSessionCustomerEmail: String?`
	`182`	`+ ): String? {`
`181`	`183`	`paymentMethodMetadata.linkState?.configuration?.customerInfo?.email?.let { return it }`
`182`	`184`	`return retrieveCustomerEmail(`
`183`	`185`	`configuration = config,`
`184`	`186`	`customerMetadata = paymentMethodMetadata.customerMetadata,`
	`187`	`+ customerEmail = elementsSessionCustomerEmail,`
`185`	`188`	`)`
`186`	`189`	`}`
`187`	`190`	`}`