@vendure/payments-plugin 2.0.0-next.3 → 2.0.0-next.7
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/package/braintree/braintree.plugin.d.ts +4 -4
- package/package/braintree/braintree.plugin.js +5 -5
- package/package/braintree/braintree.resolver.d.ts +4 -3
- package/package/braintree/braintree.resolver.js +13 -4
- package/package/braintree/braintree.resolver.js.map +1 -1
- package/package.json +5 -5
|
@@ -122,12 +122,12 @@ import { BraintreePluginOptions } from './types';
|
|
|
122
122
|
* });
|
|
123
123
|
* }
|
|
124
124
|
*
|
|
125
|
-
* async function generateClientToken(
|
|
125
|
+
* async function generateClientToken() {
|
|
126
126
|
* const { generateBraintreeClientToken } = await graphQlClient.query(gql`
|
|
127
|
-
* query GenerateBraintreeClientToken
|
|
128
|
-
* generateBraintreeClientToken
|
|
127
|
+
* query GenerateBraintreeClientToken {
|
|
128
|
+
* generateBraintreeClientToken
|
|
129
129
|
* }
|
|
130
|
-
*
|
|
130
|
+
* `);
|
|
131
131
|
* return generateBraintreeClientToken;
|
|
132
132
|
* }
|
|
133
133
|
*
|
|
@@ -135,12 +135,12 @@ const constants_1 = require("./constants");
|
|
|
135
135
|
* });
|
|
136
136
|
* }
|
|
137
137
|
*
|
|
138
|
-
* async function generateClientToken(
|
|
138
|
+
* async function generateClientToken() {
|
|
139
139
|
* const { generateBraintreeClientToken } = await graphQlClient.query(gql`
|
|
140
|
-
* query GenerateBraintreeClientToken
|
|
141
|
-
* generateBraintreeClientToken
|
|
140
|
+
* query GenerateBraintreeClientToken {
|
|
141
|
+
* generateBraintreeClientToken
|
|
142
142
|
* }
|
|
143
|
-
*
|
|
143
|
+
* `);
|
|
144
144
|
* return generateBraintreeClientToken;
|
|
145
145
|
* }
|
|
146
146
|
*
|
|
@@ -230,7 +230,7 @@ BraintreePlugin = BraintreePlugin_1 = __decorate([
|
|
|
230
230
|
shopApiExtensions: {
|
|
231
231
|
schema: (0, apollo_server_core_1.gql) `
|
|
232
232
|
extend type Query {
|
|
233
|
-
generateBraintreeClientToken(orderId: ID
|
|
233
|
+
generateBraintreeClientToken(orderId: ID): String!
|
|
234
234
|
}
|
|
235
235
|
`,
|
|
236
236
|
resolvers: [braintree_resolver_1.BraintreeResolver],
|
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import { ID, OrderService, RequestContext, TransactionalConnection } from '@vendure/core';
|
|
1
|
+
import { ActiveOrderService, ID, OrderService, RequestContext, TransactionalConnection } from '@vendure/core';
|
|
2
2
|
import { BraintreePluginOptions } from './types';
|
|
3
3
|
export declare class BraintreeResolver {
|
|
4
4
|
private connection;
|
|
5
5
|
private orderService;
|
|
6
|
+
private activeOrderService;
|
|
6
7
|
private options;
|
|
7
|
-
constructor(connection: TransactionalConnection, orderService: OrderService, options: BraintreePluginOptions);
|
|
8
|
+
constructor(connection: TransactionalConnection, orderService: OrderService, activeOrderService: ActiveOrderService, options: BraintreePluginOptions);
|
|
8
9
|
generateBraintreeClientToken(ctx: RequestContext, { orderId }: {
|
|
9
|
-
orderId
|
|
10
|
+
orderId?: ID;
|
|
10
11
|
}): Promise<string>;
|
|
11
12
|
private getPaymentMethodArgs;
|
|
12
13
|
}
|
|
@@ -20,14 +20,22 @@ const braintree_common_1 = require("./braintree-common");
|
|
|
20
20
|
const braintree_handler_1 = require("./braintree.handler");
|
|
21
21
|
const constants_1 = require("./constants");
|
|
22
22
|
let BraintreeResolver = class BraintreeResolver {
|
|
23
|
-
constructor(connection, orderService, options) {
|
|
23
|
+
constructor(connection, orderService, activeOrderService, options) {
|
|
24
24
|
this.connection = connection;
|
|
25
25
|
this.orderService = orderService;
|
|
26
|
+
this.activeOrderService = activeOrderService;
|
|
26
27
|
this.options = options;
|
|
27
28
|
}
|
|
28
29
|
async generateBraintreeClientToken(ctx, { orderId }) {
|
|
29
30
|
var _a;
|
|
30
|
-
|
|
31
|
+
if (orderId) {
|
|
32
|
+
core_1.Logger.warn(`The orderId argument to the generateBraintreeClientToken mutation has been deprecated and may be omitted.`);
|
|
33
|
+
}
|
|
34
|
+
const sessionOrder = await this.activeOrderService.getOrderFromContext(ctx);
|
|
35
|
+
if (!sessionOrder) {
|
|
36
|
+
throw new core_1.InternalServerError(`Cannot generate Braintree clientToken as there is no active Order.`);
|
|
37
|
+
}
|
|
38
|
+
const order = await this.orderService.findOne(ctx, sessionOrder.id);
|
|
31
39
|
if (order && order.customer) {
|
|
32
40
|
const customerId = (_a = order.customer.customFields.braintreeCustomerId) !== null && _a !== void 0 ? _a : undefined;
|
|
33
41
|
const args = await this.getPaymentMethodArgs(ctx);
|
|
@@ -65,9 +73,10 @@ __decorate([
|
|
|
65
73
|
], BraintreeResolver.prototype, "generateBraintreeClientToken", null);
|
|
66
74
|
BraintreeResolver = __decorate([
|
|
67
75
|
(0, graphql_1.Resolver)(),
|
|
68
|
-
__param(
|
|
76
|
+
__param(3, (0, common_1.Inject)(constants_1.BRAINTREE_PLUGIN_OPTIONS)),
|
|
69
77
|
__metadata("design:paramtypes", [core_1.TransactionalConnection,
|
|
70
|
-
core_1.OrderService,
|
|
78
|
+
core_1.OrderService,
|
|
79
|
+
core_1.ActiveOrderService, Object])
|
|
71
80
|
], BraintreeResolver);
|
|
72
81
|
exports.BraintreeResolver = BraintreeResolver;
|
|
73
82
|
//# sourceMappingURL=braintree.resolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"braintree.resolver.js","sourceRoot":"","sources":["../../src/braintree/braintree.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwC;AACxC,6CAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"braintree.resolver.js","sourceRoot":"","sources":["../../src/braintree/braintree.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwC;AACxC,6CAAwD;AACxD,wCAUuB;AAEvB,yDAAgD;AAChD,2DAAoE;AACpE,2CAAkE;AAIlE,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAC1B,YACY,UAAmC,EACnC,YAA0B,EAC1B,kBAAsC,EACJ,OAA+B;QAHjE,eAAU,GAAV,UAAU,CAAyB;QACnC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACJ,YAAO,GAAP,OAAO,CAAwB;IAC1E,CAAC;IAGJ,KAAK,CAAC,4BAA4B,CAAQ,GAAmB,EAAU,EAAE,OAAO,EAAoB;;QAChG,IAAI,OAAO,EAAE;YACT,aAAM,CAAC,IAAI,CACP,2GAA2G,CAC9G,CAAC;SACL;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAC5E,IAAI,CAAC,YAAY,EAAE;YACf,MAAM,IAAI,0BAAmB,CACzB,oEAAoE,CACvE,CAAC;SACL;QACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;QACpE,IAAI,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE;YACzB,MAAM,UAAU,GAAG,MAAA,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,mBAAmB,mCAAI,SAAS,CAAC;YAChF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAClD,MAAM,OAAO,GAAG,IAAA,6BAAU,EAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI;gBACA,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;gBAClE,OAAO,MAAM,CAAC,WAAW,CAAC;aAC7B;YAAC,OAAO,CAAM,EAAE;gBACb,aAAM,CAAC,KAAK,CACR,6EAA6E,EAC7E,qBAAS,CACZ,CAAC;gBACF,MAAM,CAAC,CAAC;aACX;SACJ;aAAM;YACH,MAAM,IAAI,0BAAmB,CAAC,IAAI,qBAAS,iDAAiD,CAAC,CAAC;SACjG;IACL,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,GAAmB;QAClD,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,oBAAa,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAChF,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,iDAA6B,CAAC,IAAI,CAC7D,CAAC;QAEF,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,IAAI,0BAAmB,CAAC,IAAI,qBAAS,0CAA0C,CAAC,CAAC;SAC1F;QACD,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC5C,uCACO,IAAI,KACP,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,KAAK,IACvB;QACN,CAAC,EAAE,EAA2B,CAAC,CAAC;IACpC,CAAC;CACJ,CAAA;AA/CG;IADC,IAAA,eAAK,GAAE;IAC4B,WAAA,IAAA,UAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,cAAI,GAAE,CAAA;;qCAAvB,qBAAc;;qEA8B5D;AAvCQ,iBAAiB;IAD7B,IAAA,kBAAQ,GAAE;IAMF,WAAA,IAAA,eAAM,EAAC,oCAAwB,CAAC,CAAA;qCAHb,8BAAuB;QACrB,mBAAY;QACN,yBAAkB;GAJzC,iBAAiB,CAwD7B;AAxDY,8CAAiB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/payments-plugin",
|
|
3
|
-
"version": "2.0.0-next.
|
|
3
|
+
"version": "2.0.0-next.7",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "package/index.js",
|
|
6
6
|
"types": "package/index.d.ts",
|
|
@@ -28,14 +28,14 @@
|
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@mollie/api-client": "^3.6.0",
|
|
30
30
|
"@types/braintree": "^2.22.15",
|
|
31
|
-
"@vendure/common": "^2.0.0-next.
|
|
32
|
-
"@vendure/core": "^2.0.0-next.
|
|
33
|
-
"@vendure/testing": "^2.0.0-next.
|
|
31
|
+
"@vendure/common": "^2.0.0-next.7",
|
|
32
|
+
"@vendure/core": "^2.0.0-next.7",
|
|
33
|
+
"@vendure/testing": "^2.0.0-next.7",
|
|
34
34
|
"braintree": "^3.0.0",
|
|
35
35
|
"nock": "^13.1.4",
|
|
36
36
|
"rimraf": "^3.0.2",
|
|
37
37
|
"stripe": "^8.197.0",
|
|
38
38
|
"typescript": "4.5.5"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "4b6233fb0945cf7c25d8810bb4d30b8b7397b576"
|
|
41
41
|
}
|