Skip to content

DO NOT MERGE: Lazy load gpay instead of baked in #2744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
hartmannr76 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

DO NOT MERGE: Lazy load gpay instead of baked in #2744

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions src/runtime/pay-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import {ExperimentFlags} from './experiment-flags';
import {PaymentsAsyncClient} from '../../third_party/gpay/src/payjs_async';
// import {PaymentsAsyncClient} from '../../third_party/gpay/src/payjs_async';
import {Preconnect} from '../utils/preconnect';
import {StorageKeys} from '../utils/constants';
import {bytesToString, stringToBytes} from '../utils/bytes';
Expand Down Expand Up @@ -46,6 +46,17 @@ function payUrl() {
return feCached(PAY_ORIGIN[getSwgMode().payEnv] + '/gp/p/ui/pay');
}

/*global google */
const PayReadyPromise = new Promise((resolve, reject) => {
const scriptTag = self.document.createElement('script');
scriptTag.async = true;
scriptTag.src = 'https://pay.google.com/gp/p/js/pay.js';
scriptTag.onload = resolve;
scriptTag.onerror = reject;

self.document.body.appendChild(scriptTag);
});

/**
*/
export class PayClient {
Expand Down Expand Up @@ -104,11 +115,13 @@ export class PayClient {
* @return {!PaymentsAsyncClient}
* @private
*/
createClient_(options, googleTransactionId, handler) {
async createClient_(options, googleTransactionId, handler) {
await PayReadyPromise;
// Assign Google Transaction ID to PaymentsAsyncClient.googleTransactionId_
// so it can be passed to gpay_async.js and stored in payment clearcut log.
PaymentsAsyncClient.googleTransactionId_ = googleTransactionId;
return new PaymentsAsyncClient(
google.payments.api.PaymentsAsyncClient.googleTransactionId_ =
Copy link
Collaborator

@ChrisAntaki ChrisAntaki Feb 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might need to quote the googleTransactionId_ property name, so Terser doesn't mangle it in the new Vite build system

googleTransactionId;
return new google.payments.api.PaymentsAsyncClient(
options,
handler,
/* useIframe */ false,
Expand All @@ -130,8 +143,8 @@ export class PayClient {
/**
* Initializes Payments client.
*/
initializePaymentsClient_() {
this.client_ = this.createClient_(
async initializePaymentsClient_() {
this.client_ = await this.createClient_(
/** @type {!PaymentOptions} */
({
environment: getSwgMode().payEnv,
Expand Down Expand Up @@ -168,12 +181,12 @@ export class PayClient {
* @param {!PaymentDataRequest} paymentRequest
* @param {!PayOptionsDef=} options
*/
start(paymentRequest, options = {}) {
async start(paymentRequest, options = {}) {
this.request_ = paymentRequest;

if (!this.client_) {
this.preconnect(this.preconnect_);
this.initializePaymentsClient_();
await this.initializePaymentsClient_();
}

if (options.forceRedirect) {
Expand Down