@idonatedev/idonate-sdk 1.2.0-dev15 → 1.2.0-dev16

package/dist/constants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CLIENT_HEADERS = exports.CARD_CONNECT_DEFAULT_STYLE = exports.DEFAULT_APP_NAME = exports.DEFAULT_CF_TURNSTILE_CDN_EXPLICIT_URL = exports.FALLBACK_CF_TURNSTILE_SITE_KEY = exports.FALLBACK_PC_SCRIPT_ID = exports.FALLBACK_PC_SCRIPT_URL = exports.SANDBOX_APPLE_PAY_URL = exports.APPLE_PAY_URL = exports.SPREEDLY_TOKENIZER_URL = exports.SANDBOX_CARD_CONNECT_BASE_URL = exports.PRODUCTION_CARD_CONNECT_BASE_URL = exports.SANDBOX_BASE_URL = exports.PRODUCTION_BASE_URL = exports.SDK_VERSION = void 0;
-exports.SDK_VERSION = '1.2.0-dev15';
+exports.SDK_VERSION = '1.2.0-dev16';
 exports.PRODUCTION_BASE_URL = 'https://secure-api.idonate.com';
 exports.SANDBOX_BASE_URL = 'https://api.qa-idonate.com';
 exports.PRODUCTION_CARD_CONNECT_BASE_URL = 'https://boltgw.cardconnect.com:8443';

package/dist/esm/constants.js

@@ -1,4 +1,4 @@
-export const SDK_VERSION = '1.2.0-dev15';
+export const SDK_VERSION = '1.2.0-dev16';
 export const PRODUCTION_BASE_URL = 'https://secure-api.idonate.com';
 export const SANDBOX_BASE_URL = 'https://api.qa-idonate.com';
 export const PRODUCTION_CARD_CONNECT_BASE_URL = 'https://boltgw.cardconnect.com:8443';

package/dist/esm/tokenize/CardConnectTokenizer.d.ts

@@ -16,6 +16,7 @@ export declare class CardConnectTokenizer extends Tokenizer {
     private accountTypeEl?;
     private enableTestMode;
     private cachedTokenResult?;
+    private acceptAutoToken;
     private tokenizationPromise?;
     private tokenizationResolve?;
     private tokenizationReject?;

package/dist/esm/tokenize/CardConnectTokenizer.js

@@ -19,6 +19,7 @@ export class CardConnectTokenizer extends Tokenizer {
         this.containerId = containerId;
         this.layout = layout;
         this.enableTestMode = false;
+        this.acceptAutoToken = true;
         this.mode = mode;
         this.enableTestMode = enableTestMode;
         this.iframe = iframe;
@@ -268,10 +269,15 @@ export class CardConnectTokenizer extends Tokenizer {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
             if (this.cachedTokenResult && this.cachedTokenResult.errorCode === '0') {
+                const cardType = this.cachedTokenResult.cardType
+                    ? this.normalizeCardType(this.cachedTokenResult.cardType)
+                    : this.normalizeCardType('unknown');
                 return {
                     token: this.cachedTokenResult.token,
-                    lastFour: this.cachedTokenResult.token.slice(-4),
-                    cardType: this.normalizeCardType('unknown'),
+                    lastFour: this.cachedTokenResult.last4 ||
+                        this.cachedTokenResult.token.slice(-4),
+                    cardType,
+                    paymentMethodType: 'credit_card',
                     provider: 'cardconnect',
                 };
             }
@@ -316,13 +322,15 @@ export class CardConnectTokenizer extends Tokenizer {
             }
             const baseUrl = new URL(this.iframeUrl).origin;
             const result = yield CardConnectTokenizer.tokenizeBankAccount(routingNumber, accountNumber, baseUrl);
-            return {
+            const paymentToken = {
                 token: result.token,
                 lastFour: accountNumber.slice(-4),
                 accountType: accountType,
                 paymentMethodType: 'bank_account',
                 provider: 'cardconnect',
             };
+            this.emit('tokenReady', paymentToken);
+            return paymentToken;
         });
     }
     validate() {
@@ -460,9 +468,23 @@ export class CardConnectTokenizer extends Tokenizer {
             }, this.expectedOrigin);
         }
         this.cachedTokenResult = undefined;
-        this.tokenizationPromise = undefined;
-        this.tokenizationResolve = undefined;
-        this.tokenizationReject = undefined;
+        this.acceptAutoToken = false;
+        if (this.tokenizationTimeout) {
+            clearTimeout(this.tokenizationTimeout);
+            this.tokenizationTimeout = undefined;
+        }
+        if (this.tokenizationReject) {
+            const reject = this.tokenizationReject;
+            this.tokenizationPromise = undefined;
+            this.tokenizationResolve = undefined;
+            this.tokenizationReject = undefined;
+            reject(new TokenizationError('Tokenizer cleared', 'CLEARED'));
+        }
+        else {
+            this.tokenizationPromise = undefined;
+            this.tokenizationResolve = undefined;
+            this.tokenizationReject = undefined;
+        }
         if (this.mode === 'bank_account') {
             this.currentValidationState = {
                 isValid: false,
@@ -506,6 +528,7 @@ export class CardConnectTokenizer extends Tokenizer {
         }
     }
     destroy() {
+        this.markDestroyed();
         if (this.tokenizationTimeout) {
             clearTimeout(this.tokenizationTimeout);
             this.tokenizationTimeout = undefined;
@@ -547,6 +570,7 @@ export class CardConnectTokenizer extends Tokenizer {
                 lastFour: this.cachedTokenResult.last4 ||
                     this.cachedTokenResult.token.slice(-4),
                 cardType,
+                paymentMethodType: 'credit_card',
                 provider: 'cardconnect',
             };
         }
@@ -559,6 +583,9 @@ export class CardConnectTokenizer extends Tokenizer {
         try {
             const data = typeof event.data === 'string' ? JSON.parse(event.data) : event.data;
             if (data.token && data.errorCode !== undefined) {
+                if (!this.acceptAutoToken && !this.tokenizationResolve) {
+                    return;
+                }
                 this.cachedTokenResult = data;
                 if (this.tokenizationTimeout) {
                     clearTimeout(this.tokenizationTimeout);
@@ -576,6 +603,7 @@ export class CardConnectTokenizer extends Tokenizer {
                         token: data.token,
                         lastFour: data.last4 || data.token.slice(-4),
                         cardType,
+                        paymentMethodType: 'credit_card',
                         provider: 'cardconnect',
                     };
                     if (this.tokenizationResolve) {
@@ -605,10 +633,12 @@ export class CardConnectTokenizer extends Tokenizer {
                 }
             }
             if (data.event === 'validation' || data.validationError !== undefined) {
+                this.acceptAutoToken = true;
                 this.handleValidationMessage(data);
             }
             if ((data.event === 'input' || data.event === 'change') &&
                 data.cardType) {
+                this.acceptAutoToken = true;
                 const cardType = this.normalizeCardType(data.cardType);
                 if (cardType !== this.currentCardType) {
                     this.currentCardType = cardType;

package/dist/esm/tokenize/PayPalTokenizer.js

@@ -235,6 +235,7 @@ export class PayPalTokenizer extends Tokenizer {
             const token = {
                 token: data.orderID,
                 lastFour: data.orderID.slice(-4),
+                paymentMethodType: 'paypal',
                 provider: 'paypal_checkout',
                 paymentMethodId: this.paymentMethodId,
                 paymentTransactionId: this.paymentTransactionId,
@@ -280,6 +281,7 @@ export class PayPalTokenizer extends Tokenizer {
     focus(field) {
     }
     destroy() {
+        this.markDestroyed();
         if (this.buttonsInstance) {
             try {
                 this.buttonsInstance.close();

package/dist/esm/tokenize/SpreedlyTokenizer.d.ts

@@ -42,6 +42,7 @@ export declare class SpreedlyTokenizer extends Tokenizer {
     private init;
     tokenize(paymentData: PaymentData): Promise<PaymentToken>;
     private tokenizeCardInternal;
+    private executeCardTokenization;
     private createCanadianBankAccountFields;
     private tokenizeBankAccountInternal;
     validate(): Promise<ValidationResult>;

package/dist/esm/tokenize/SpreedlyTokenizer.js

@@ -163,6 +163,7 @@ export class SpreedlyTokenizer extends Tokenizer {
                         token,
                         lastFour: pmData.last_four_digits,
                         cardType: this.normalizeCardType(pmData.card_type),
+                        paymentMethodType: 'credit_card',
                         provider: 'spreedly',
                     };
                     if (this.tokenizationResolve) {
@@ -173,13 +174,12 @@ export class SpreedlyTokenizer extends Tokenizer {
                     }
                 });
                 this.spreedly.on('errors', (errors) => {
+                    const error = new TokenizationError(errors);
+                    this.emit('error', error);
                     if (this.tokenizationReject) {
                         const rejectTokenization = this.tokenizationReject;
                         this.clearTokenizationState();
-                        rejectTokenization(new TokenizationError(errors));
-                    }
-                    else {
-                        this.emit('error', new TokenizationError(errors));
+                        rejectTokenization(error);
                     }
                 });
                 this.spreedly.on('fieldEvent', (fieldName, eventType, activeEl, inputProperties) => {
@@ -206,15 +206,21 @@ export class SpreedlyTokenizer extends Tokenizer {
         });
     }
     tokenizeCardInternal(cardData) {
+        if (this.tokenizationPromise) {
+            return this.tokenizationPromise;
+        }
+        const expiry = this.parseExpiry(this.expiryEl);
+        if (!expiry) {
+            return Promise.reject(new TokenizationError('Expiration date is required', 'VALIDATION_ERROR'));
+        }
+        this.tokenizationPromise = this.executeCardTokenization(cardData, expiry).finally(() => {
+            this.tokenizationPromise = undefined;
+        });
+        return this.tokenizationPromise;
+    }
+    executeCardTokenization(cardData, expiry) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            if (this.tokenizationPromise) {
-                return this.tokenizationPromise;
-            }
-            const expiry = this.parseExpiry(this.expiryEl);
-            if (!expiry) {
-                throw new TokenizationError('Expiration date is required', 'VALIDATION_ERROR');
-            }
             let securityFields = {};
             if ((_a = this.clientConfig) === null || _a === void 0 ? void 0 : _a.enableSpreedlySecureTokenization) {
                 try {
@@ -222,7 +228,7 @@ export class SpreedlyTokenizer extends Tokenizer {
                     securityFields = {
                         nonce: args.nonce,
                         timestamp: args.timestamp,
-                        certificate_token: args.certificate_token,
+                        certificateToken: args.certificate_token,
                         signature: args.signature,
                     };
                 }
@@ -230,7 +236,7 @@ export class SpreedlyTokenizer extends Tokenizer {
                     throw new TokenizationError(`Secure tokenization failed: ${error instanceof Error ? error.message : 'Unknown error'}`, 'SECURE_TOKENIZATION_ERROR');
                 }
             }
-            this.tokenizationPromise = new Promise((resolve, reject) => {
+            return new Promise((resolve, reject) => {
                 var _a, _b, _c, _d, _e, _f;
                 this.tokenizationResolve = resolve;
                 this.tokenizationReject = reject;
@@ -239,10 +245,7 @@ export class SpreedlyTokenizer extends Tokenizer {
                     reject(new TokenizationError('Tokenization timeout', 'TIMEOUT'));
                 }, TOKENIZE_TIMEOUT);
                 this.spreedly.tokenizeCreditCard(Object.assign({ first_name: cardData.firstName, last_name: cardData.lastName, month: expiry.month, year: expiry.year, email: cardData.email, phone_number: cardData.phone, address1: (_a = cardData.address) === null || _a === void 0 ? void 0 : _a.address1, address2: (_b = cardData.address) === null || _b === void 0 ? void 0 : _b.address2, city: (_c = cardData.address) === null || _c === void 0 ? void 0 : _c.city, state: (_d = cardData.address) === null || _d === void 0 ? void 0 : _d.state, zip: (_e = cardData.address) === null || _e === void 0 ? void 0 : _e.zip, country: (_f = cardData.address) === null || _f === void 0 ? void 0 : _f.country }, securityFields));
-            }).finally(() => {
-                this.tokenizationPromise = undefined;
             });
-            return this.tokenizationPromise;
         });
     }
     createCanadianBankAccountFields(container) {
@@ -434,13 +437,15 @@ export class SpreedlyTokenizer extends Tokenizer {
                     accountHolderType: accountHolderType,
                 },
             }, this.clientConfig, this.environmentKey);
-            return {
+            const paymentToken = {
                 token: result,
                 lastFour: accountNumber.slice(-4),
                 accountType: accountType,
                 paymentMethodType: 'bank_account',
                 provider: 'spreedly',
             };
+            this.emit('tokenReady', paymentToken);
+            return paymentToken;
         });
     }
     validate() {
@@ -653,6 +658,11 @@ export class SpreedlyTokenizer extends Tokenizer {
                 expiry: { isValid: false, isEmpty: true },
             };
         }
+        if (this.tokenizationReject) {
+            const reject = this.tokenizationReject;
+            this.clearTokenizationState();
+            reject(new TokenizationError('Tokenizer cleared', 'CLEARED'));
+        }
         this.clearTokenizationState();
         this.emit('validation', this.currentValidationState);
     }
@@ -755,6 +765,7 @@ export class SpreedlyTokenizer extends Tokenizer {
     }
     destroy() {
         var _a;
+        this.markDestroyed();
         (_a = this.resizeObserver) === null || _a === void 0 ? void 0 : _a.disconnect();
         if (this.tokenizationReject) {
             const reject = this.tokenizationReject;
@@ -1069,8 +1080,8 @@ export class SpreedlyTokenizer extends Tokenizer {
             }
             else {
                 const now = new Date();
-                const expiryDate = new Date(year, month - 1);
-                if (expiryDate < now) {
+                const expiryEndDate = new Date(year, month);
+                if (expiryEndDate <= now) {
                     this.applyErrorStyles(this.expiryEl);
                 }
                 else {

package/dist/esm/tokenize/Tokenizer.d.ts

@@ -3,8 +3,12 @@ import ConfigHandler from '../config-handler';
 export declare abstract class Tokenizer {
     protected mode: PaymentMethodMode;
     protected eventHandlers: Map<string, Set<(data?: any) => void>>;
+    private focusHandlerElements;
     private _isReady;
+    private _isDestroyed;
     get isReady(): boolean;
+    get isDestroyed(): boolean;
+    protected markDestroyed(): void;
     abstract tokenize(paymentData: PaymentData): Promise<PaymentToken>;
     abstract validate(): Promise<ValidationResult>;
     abstract clear(): void;

package/dist/esm/tokenize/Tokenizer.js

@@ -13,10 +13,18 @@ export class Tokenizer {
     constructor() {
         this.mode = 'credit_card';
         this.eventHandlers = new Map();
+        this.focusHandlerElements = new WeakSet();
         this._isReady = false;
+        this._isDestroyed = false;
     }
     get isReady() {
-        return this._isReady;
+        return this._isReady && !this._isDestroyed;
+    }
+    get isDestroyed() {
+        return this._isDestroyed;
+    }
+    markDestroyed() {
+        this._isDestroyed = true;
     }
     getMode() {
         return this.mode;
@@ -132,7 +140,10 @@ export class Tokenizer {
             element.style.border = inputStyles.border;
             element.style.borderRadius = inputStyles.borderRadius;
         }
-        addFocusHandlers(element, styles);
+        if (!this.focusHandlerElements.has(element)) {
+            addFocusHandlers(element, styles, position);
+            this.focusHandlerElements.add(element);
+        }
     }
     generateFieldIds(containerId) {
         return {

package/dist/esm/tokenize/spreedly-secure.js

@@ -13,6 +13,7 @@ export function fetchSpreedlySecurityArgs(config, organizationId, embedId) {
             throw new Error('Secure tokenization is not enabled');
         }
         const makeRequest = () => __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const response = yield fetch(`${config.embedApiBaseUrl}/spreedly/security-args`, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
@@ -24,7 +25,8 @@ export function fetchSpreedlySecurityArgs(config, organizationId, embedId) {
             if (!response.ok) {
                 throw new Error(`Security args request failed: ${response.status}`);
             }
-            return response.json();
+            const data = yield response.json();
+            return (_a = data.result) !== null && _a !== void 0 ? _a : data;
         });
         try {
             return yield makeRequest();

package/dist/esm/tokenize/tokenizer-utils.d.ts

@@ -6,7 +6,7 @@ export declare function parseExpiryDate(value: string): {
 export declare function formatExpiryInput(value: string): string;
 export declare function withTimeout<T>(promise: Promise<T>, timeoutMs: number, errorMessage: string): Promise<T>;
 export declare function getConnectedBorderRadius(baseRadius: string, position: 'left' | 'middle' | 'right', isConnected: boolean): string;
-export declare function addFocusHandlers(element: HTMLElement, styles: TokenizerStylingComplete, onFocus?: () => void, onBlur?: () => void): void;
+export declare function addFocusHandlers(element: HTMLElement, styles: TokenizerStylingComplete, position?: 'left' | 'middle' | 'right', onFocus?: () => void, onBlur?: () => void): void;
 export declare function createFieldContainer(id: string, flex: string, minWidth?: string, maxWidth?: string): HTMLDivElement;
 export declare function createInputElement(id: string, type: string, placeholder: string, maxLength?: number): HTMLInputElement;
 export declare function validateRoutingNumber(routingNumber: string): boolean;

package/dist/esm/tokenize/tokenizer-utils.js

@@ -39,7 +39,7 @@ export function getConnectedBorderRadius(baseRadius, position, isConnected) {
             return baseRadius;
     }
 }
-export function addFocusHandlers(element, styles, onFocus, onBlur) {
+export function addFocusHandlers(element, styles, position, onFocus, onBlur) {
     element.addEventListener('focus', () => {
         if (styles.focus) {
             Object.assign(element.style, styles.focus);
@@ -47,7 +47,28 @@ export function addFocusHandlers(element, styles, onFocus, onBlur) {
         onFocus === null || onFocus === void 0 ? void 0 : onFocus();
     });
     element.addEventListener('blur', () => {
-        element.style.border = styles.input.border;
+        const isConnected = styles.container.gap === '0';
+        if (isConnected && position) {
+            element.style.borderTop = styles.input.border;
+            element.style.borderBottom = styles.input.border;
+            switch (position) {
+                case 'left':
+                    element.style.borderLeft = styles.input.border;
+                    element.style.borderRight = 'none';
+                    break;
+                case 'middle':
+                    element.style.borderLeft = styles.input.border;
+                    element.style.borderRight = 'none';
+                    break;
+                case 'right':
+                    element.style.borderLeft = styles.input.border;
+                    element.style.borderRight = styles.input.border;
+                    break;
+            }
+        }
+        else {
+            element.style.border = styles.input.border;
+        }
         element.style.outline = '';
         element.style.boxShadow = '';
         onBlur === null || onBlur === void 0 ? void 0 : onBlur();

package/dist/esm/typeAdapters.js

@@ -102,16 +102,18 @@ export function buildCashPaymentPayload(organizationId, input) {
             utmFields.utm_term = input.utm.term;
         }
     }
+    let remainingMeta = input.customerMeta
+        ? Object.assign({}, input.customerMeta) : {};
     if (input.customerMeta) {
         [1, 2, 3, 4, 5].forEach((customNoteIndex) => {
             const key = `custom_note_${customNoteIndex}`;
-            if (input.customerMeta[key]) {
-                donationOptions[key] = input.customerMeta[key];
-                delete input.customerMeta[key];
+            if (remainingMeta[key]) {
+                donationOptions[key] = remainingMeta[key];
+                delete remainingMeta[key];
             }
         });
     }
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, donationOptions), billingAddress), billingContact), payment), utmFields), { customer_meta: input.customerMeta || {}, recaptcha_token: input.recaptchaToken, recaptcha_type: input.recaptchaType });
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, donationOptions), billingAddress), billingContact), payment), utmFields), { customer_meta: remainingMeta, recaptcha_token: input.recaptchaToken, recaptcha_type: input.recaptchaType });
 }
 export function buildDonationResult(response) {
     let campaign;

package/dist/tokenize/CardConnectTokenizer.d.ts

@@ -16,6 +16,7 @@ export declare class CardConnectTokenizer extends Tokenizer {
     private accountTypeEl?;
     private enableTestMode;
     private cachedTokenResult?;
+    private acceptAutoToken;
     private tokenizationPromise?;
     private tokenizationResolve?;
     private tokenizationReject?;

package/dist/tokenize/CardConnectTokenizer.js

@@ -22,6 +22,7 @@ class CardConnectTokenizer extends Tokenizer_1.Tokenizer {
         this.containerId = containerId;
         this.layout = layout;
         this.enableTestMode = false;
+        this.acceptAutoToken = true;
         this.mode = mode;
         this.enableTestMode = enableTestMode;
         this.iframe = iframe;
@@ -271,10 +272,15 @@ class CardConnectTokenizer extends Tokenizer_1.Tokenizer {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
             if (this.cachedTokenResult && this.cachedTokenResult.errorCode === '0') {
+                const cardType = this.cachedTokenResult.cardType
+                    ? this.normalizeCardType(this.cachedTokenResult.cardType)
+                    : this.normalizeCardType('unknown');
                 return {
                     token: this.cachedTokenResult.token,
-                    lastFour: this.cachedTokenResult.token.slice(-4),
-                    cardType: this.normalizeCardType('unknown'),
+                    lastFour: this.cachedTokenResult.last4 ||
+                        this.cachedTokenResult.token.slice(-4),
+                    cardType,
+                    paymentMethodType: 'credit_card',
                     provider: 'cardconnect',
                 };
             }
@@ -319,13 +325,15 @@ class CardConnectTokenizer extends Tokenizer_1.Tokenizer {
             }
             const baseUrl = new URL(this.iframeUrl).origin;
             const result = yield CardConnectTokenizer.tokenizeBankAccount(routingNumber, accountNumber, baseUrl);
-            return {
+            const paymentToken = {
                 token: result.token,
                 lastFour: accountNumber.slice(-4),
                 accountType: accountType,
                 paymentMethodType: 'bank_account',
                 provider: 'cardconnect',
             };
+            this.emit('tokenReady', paymentToken);
+            return paymentToken;
         });
     }
     validate() {
@@ -463,9 +471,23 @@ class CardConnectTokenizer extends Tokenizer_1.Tokenizer {
             }, this.expectedOrigin);
         }
         this.cachedTokenResult = undefined;
-        this.tokenizationPromise = undefined;
-        this.tokenizationResolve = undefined;
-        this.tokenizationReject = undefined;
+        this.acceptAutoToken = false;
+        if (this.tokenizationTimeout) {
+            clearTimeout(this.tokenizationTimeout);
+            this.tokenizationTimeout = undefined;
+        }
+        if (this.tokenizationReject) {
+            const reject = this.tokenizationReject;
+            this.tokenizationPromise = undefined;
+            this.tokenizationResolve = undefined;
+            this.tokenizationReject = undefined;
+            reject(new types_1.TokenizationError('Tokenizer cleared', 'CLEARED'));
+        }
+        else {
+            this.tokenizationPromise = undefined;
+            this.tokenizationResolve = undefined;
+            this.tokenizationReject = undefined;
+        }
         if (this.mode === 'bank_account') {
             this.currentValidationState = {
                 isValid: false,
@@ -509,6 +531,7 @@ class CardConnectTokenizer extends Tokenizer_1.Tokenizer {
         }
     }
     destroy() {
+        this.markDestroyed();
         if (this.tokenizationTimeout) {
             clearTimeout(this.tokenizationTimeout);
             this.tokenizationTimeout = undefined;
@@ -550,6 +573,7 @@ class CardConnectTokenizer extends Tokenizer_1.Tokenizer {
                 lastFour: this.cachedTokenResult.last4 ||
                     this.cachedTokenResult.token.slice(-4),
                 cardType,
+                paymentMethodType: 'credit_card',
                 provider: 'cardconnect',
             };
         }
@@ -562,6 +586,9 @@ class CardConnectTokenizer extends Tokenizer_1.Tokenizer {
         try {
             const data = typeof event.data === 'string' ? JSON.parse(event.data) : event.data;
             if (data.token && data.errorCode !== undefined) {
+                if (!this.acceptAutoToken && !this.tokenizationResolve) {
+                    return;
+                }
                 this.cachedTokenResult = data;
                 if (this.tokenizationTimeout) {
                     clearTimeout(this.tokenizationTimeout);
@@ -579,6 +606,7 @@ class CardConnectTokenizer extends Tokenizer_1.Tokenizer {
                         token: data.token,
                         lastFour: data.last4 || data.token.slice(-4),
                         cardType,
+                        paymentMethodType: 'credit_card',
                         provider: 'cardconnect',
                     };
                     if (this.tokenizationResolve) {
@@ -608,10 +636,12 @@ class CardConnectTokenizer extends Tokenizer_1.Tokenizer {
                 }
             }
             if (data.event === 'validation' || data.validationError !== undefined) {
+                this.acceptAutoToken = true;
                 this.handleValidationMessage(data);
             }
             if ((data.event === 'input' || data.event === 'change') &&
                 data.cardType) {
+                this.acceptAutoToken = true;
                 const cardType = this.normalizeCardType(data.cardType);
                 if (cardType !== this.currentCardType) {
                     this.currentCardType = cardType;

package/dist/tokenize/PayPalTokenizer.js

@@ -238,6 +238,7 @@ class PayPalTokenizer extends Tokenizer_1.Tokenizer {
             const token = {
                 token: data.orderID,
                 lastFour: data.orderID.slice(-4),
+                paymentMethodType: 'paypal',
                 provider: 'paypal_checkout',
                 paymentMethodId: this.paymentMethodId,
                 paymentTransactionId: this.paymentTransactionId,
@@ -283,6 +284,7 @@ class PayPalTokenizer extends Tokenizer_1.Tokenizer {
     focus(field) {
     }
     destroy() {
+        this.markDestroyed();
         if (this.buttonsInstance) {
             try {
                 this.buttonsInstance.close();

package/dist/tokenize/SpreedlyTokenizer.d.ts

@@ -42,6 +42,7 @@ export declare class SpreedlyTokenizer extends Tokenizer {
     private init;
     tokenize(paymentData: PaymentData): Promise<PaymentToken>;
     private tokenizeCardInternal;
+    private executeCardTokenization;
     private createCanadianBankAccountFields;
     private tokenizeBankAccountInternal;
     validate(): Promise<ValidationResult>;