@cloudcommerce/app-paypal 2.48.13 → 2.48.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/util/paypal-api.js +17 -5
- package/lib/util/paypal-api.js.map +1 -1
- package/package.json +4 -4
package/lib/util/paypal-api.js
CHANGED
|
@@ -38,9 +38,9 @@ export const getPaypalAxios = async () => {
|
|
|
38
38
|
},
|
|
39
39
|
});
|
|
40
40
|
if (data?.access_token) {
|
|
41
|
-
_tokenExpiresAt = data.expires_in
|
|
42
|
-
? Date.now() + (data.expires_in * 1000)
|
|
43
|
-
: Date.now() + (
|
|
41
|
+
_tokenExpiresAt = data.expires_in > 0
|
|
42
|
+
? Date.now() + (Math.min(data.expires_in, 8 * 60 * 60) * 1000)
|
|
43
|
+
: Date.now() + (8 * 60 * 60 * 1000);
|
|
44
44
|
docRef.set({
|
|
45
45
|
data,
|
|
46
46
|
expiresAt: Timestamp.fromMillis(_tokenExpiresAt),
|
|
@@ -67,8 +67,20 @@ export const getPaypalAxios = async () => {
|
|
|
67
67
|
|
|
68
68
|
export const createPaypalPayment = async (paypalPayment) => {
|
|
69
69
|
const paypalAxios = await getPaypalAxios();
|
|
70
|
-
|
|
71
|
-
|
|
70
|
+
try {
|
|
71
|
+
const { data } = await paypalAxios.post('/v1/payments/payment', paypalPayment);
|
|
72
|
+
return data;
|
|
73
|
+
} catch (_err) {
|
|
74
|
+
const err = _err;
|
|
75
|
+
if (err.response?.status === 401) {
|
|
76
|
+
const { PAYPAL_CLIENT_ID } = process.env;
|
|
77
|
+
const docRef = getFirestore().doc(`paypalTokens/${PAYPAL_CLIENT_ID}`);
|
|
78
|
+
await docRef.delete().catch(logger.warn);
|
|
79
|
+
_paypalAxios = undefined;
|
|
80
|
+
_tokenExpiresAt = undefined;
|
|
81
|
+
}
|
|
82
|
+
throw err;
|
|
83
|
+
}
|
|
72
84
|
};
|
|
73
85
|
|
|
74
86
|
export const readPaypalPayment = async (paymentId) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paypal-api.js","sourceRoot":"","sources":["../../src/util/paypal-api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAEpE,IAAI,YAAuC,CAAC;AAC5C,IAAI,eAAmC,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;IACvC,IAAI,eAAe,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,eAAe,GAAG,IAAI,EAAE,CAAC;QAC3D,YAAY,GAAG,SAAS,CAAC;QACzB,eAAe,GAAG,SAAS,CAAC;IAC9B,CAAC;IACD,IAAI,YAAY;QAAE,OAAO,YAAY,CAAC;IACtC,MAAM,EACJ,gBAAgB,EAChB,oBAAoB,EACpB,UAAU,GACX,GAAG,OAAO,CAAC,GAAG,CAAC;IAChB,MAAM,OAAO,GAAG,UAAU,KAAK,SAAS;QACtC,CAAC,CAAC,mCAAmC;QACrC,CAAC,CAAC,2BAA2B,CAAC;IAChC,IAAI,KAAyB,CAAC;IAC9B,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC,GAAG,CAAC,gBAAgB,gBAAgB,EAAE,CAAC,CAAC;IACtE,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;IACnC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,CAGhD,CAAC;QACF,eAAe,GAAG,SAAS,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;QACpD,IAAI,eAAe,IAAI,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC;YAC3D,KAAK,GAAG,IAAI,EAAE,YAAY,CAAC;QAC7B,CAAC;IACH,CAAC;IACD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,CAAC;YACH,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,KAAK,CAAC,IAAI,CAC/B,kBAAkB,EAClB,+BAA+B,EAC/B;gBACE,OAAO;gBACP,OAAO,EAAE;oBACP,cAAc,EAAE,mCAAmC;iBACpD;gBACD,IAAI,EAAE;oBACJ,QAAQ,EAAE,gBAAiB;oBAC3B,QAAQ,EAAE,oBAAqB;iBAChC;aACF,CACF,CAAC;YACF,IAAI,IAAI,EAAE,YAAY,EAAE,CAAC;gBACvB,eAAe,GAAG,IAAI,CAAC,UAAU;
|
|
1
|
+
{"version":3,"file":"paypal-api.js","sourceRoot":"","sources":["../../src/util/paypal-api.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudcommerce/app-paypal",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.48.
|
|
4
|
+
"version": "2.48.14",
|
|
5
5
|
"description": "e-com.plus Cloud Commerce app to integrate PayPal Plus",
|
|
6
6
|
"main": "lib/paypal.js",
|
|
7
7
|
"exports": {
|
|
@@ -31,11 +31,11 @@
|
|
|
31
31
|
"axios": "^1.10.0",
|
|
32
32
|
"firebase-admin": "^13.4.0",
|
|
33
33
|
"firebase-functions": "^6.4.0",
|
|
34
|
-
"@cloudcommerce/api": "2.48.
|
|
35
|
-
"@cloudcommerce/firebase": "2.48.
|
|
34
|
+
"@cloudcommerce/api": "2.48.14",
|
|
35
|
+
"@cloudcommerce/firebase": "2.48.14"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@cloudcommerce/types": "2.48.
|
|
38
|
+
"@cloudcommerce/types": "2.48.14"
|
|
39
39
|
},
|
|
40
40
|
"scripts": {
|
|
41
41
|
"build": "bash scripts/build.sh"
|