@cinerino/sdk 12.7.0-alpha.2 → 12.7.0-alpha.4
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/example/src/chevre/admin/updateEventsSellerMakesOfferByIdentifier.ts +4 -4
- package/example/src/cloud/transaction/processPlaceOrderUsingTicketIssuedThroughCreditCard.ts +7 -1
- package/lib/abstract/chevreAdmin/event.d.ts +1 -8
- package/lib/abstract/chevrePay/payment.d.ts +2 -5
- package/lib/abstract/chevrePay/payment.js +12 -6
- package/lib/abstract/cloud/admin/event.d.ts +0 -2
- package/lib/abstract/cloud/admin/event.js +6 -4
- package/lib/abstract/cloud/pay/payment.d.ts +12 -0
- package/lib/abstract/cloud/pay/payment.js +31 -12
- package/lib/bundle.js +335 -304
- package/package.json +2 -2
|
@@ -49,8 +49,8 @@ async function main() {
|
|
|
49
49
|
validFrom: moment(`${today}T00:00:00+09:00`)
|
|
50
50
|
.toDate(),
|
|
51
51
|
validThrough: moment(`${today}T14:00:00Z`)
|
|
52
|
-
.toDate()
|
|
53
|
-
identifier: '12345678x1'
|
|
52
|
+
.toDate()
|
|
53
|
+
// identifier: '12345678x1'
|
|
54
54
|
},
|
|
55
55
|
{
|
|
56
56
|
typeOf: client.factory.offerType.Offer,
|
|
@@ -62,8 +62,8 @@ async function main() {
|
|
|
62
62
|
validFrom: moment(`${today}T00:00:00+09:00`)
|
|
63
63
|
.toDate(),
|
|
64
64
|
validThrough: moment(`${today}T14:00:00Z`)
|
|
65
|
-
.toDate()
|
|
66
|
-
identifier: '12345678x2'
|
|
65
|
+
.toDate()
|
|
66
|
+
// identifier: '12345678x2'
|
|
67
67
|
}
|
|
68
68
|
]
|
|
69
69
|
}
|
package/example/src/cloud/transaction/processPlaceOrderUsingTicketIssuedThroughCreditCard.ts
CHANGED
|
@@ -9,10 +9,11 @@ const project = { id: String(process.env.PROJECT_ID) };
|
|
|
9
9
|
* 出力メンバーシップを持つ決済サービスID
|
|
10
10
|
*/
|
|
11
11
|
const PAYMENT_SERVICE_ID = '64f193ad5e79fe8a06ca3156';
|
|
12
|
+
|
|
12
13
|
/**
|
|
13
14
|
* 予約対象イベントID
|
|
14
15
|
*/
|
|
15
|
-
const EVENT_ID = '
|
|
16
|
+
const EVENT_ID = '6909c6185407a11616fc869a';
|
|
16
17
|
const profile = {
|
|
17
18
|
email: <string>process.env.TEST_PROFILE_EMAIL,
|
|
18
19
|
givenName: 'Taro',
|
|
@@ -151,6 +152,11 @@ async function main() {
|
|
|
151
152
|
ticketedPermit: { issuedThrough: { id: PAYMENT_SERVICE_ID } },
|
|
152
153
|
purpose: { id: transaction.id, typeOf: client.factory.transactionType.PlaceOrder }
|
|
153
154
|
});
|
|
155
|
+
// ↓決済方法チケットでも承認可能か?
|
|
156
|
+
// const { ticketToken } = await paymentService.issueTicketThroughCreditCard({
|
|
157
|
+
// ticketedInvoice: { issuedThrough: { id: PAYMENT_SERVICE_ID } },
|
|
158
|
+
// purpose: { id: transaction.id, typeOf: client.factory.transactionType.PlaceOrder }
|
|
159
|
+
// });
|
|
154
160
|
console.log('ticket issued. ticketToken:', ticketToken);
|
|
155
161
|
|
|
156
162
|
await wait(3000);
|
|
@@ -22,14 +22,7 @@ export interface IUpdateEventSellerMakesOfferParamsByIdentifier {
|
|
|
22
22
|
identifier: string;
|
|
23
23
|
offers: {
|
|
24
24
|
seller: {
|
|
25
|
-
makesOffer: (factory.event.screeningEvent.ISellerMakesOffer4create & {
|
|
26
|
-
/**
|
|
27
|
-
* アプリケーションオファーコード
|
|
28
|
-
* イベント内でユニーク必須
|
|
29
|
-
* 8-32文字の^[0-9a-zA-Z]+$
|
|
30
|
-
*/
|
|
31
|
-
identifier: string;
|
|
32
|
-
})[];
|
|
25
|
+
makesOffer: (factory.event.screeningEvent.ISellerMakesOffer4create & {})[];
|
|
33
26
|
};
|
|
34
27
|
};
|
|
35
28
|
location?: never;
|
|
@@ -37,9 +37,7 @@ export declare class PaymentService extends Service {
|
|
|
37
37
|
authorizeCreditCard(params: {
|
|
38
38
|
object: IAuthorizeCreditCardObject;
|
|
39
39
|
purpose: IPurpose;
|
|
40
|
-
},
|
|
41
|
-
async?: boolean;
|
|
42
|
-
}): Promise<IAuthorizeResult>;
|
|
40
|
+
}, __?: {}): Promise<IAuthorizeResult>;
|
|
43
41
|
/**
|
|
44
42
|
* 決済カード決済承認
|
|
45
43
|
*/
|
|
@@ -48,8 +46,7 @@ export declare class PaymentService extends Service {
|
|
|
48
46
|
ticketToken: string;
|
|
49
47
|
};
|
|
50
48
|
purpose: IPurpose;
|
|
51
|
-
}, options
|
|
52
|
-
async?: boolean;
|
|
49
|
+
}, options: {
|
|
53
50
|
/**
|
|
54
51
|
* 決済カード認証アクションID
|
|
55
52
|
*/
|
|
@@ -154,7 +154,7 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
154
154
|
/**
|
|
155
155
|
* クレジットカード決済承認
|
|
156
156
|
*/
|
|
157
|
-
PaymentService.prototype.authorizeCreditCard = function (params,
|
|
157
|
+
PaymentService.prototype.authorizeCreditCard = function (params, __) {
|
|
158
158
|
return __awaiter(this, void 0, void 0, function () {
|
|
159
159
|
var object, purpose, amount, issuedThrough, paymentMethod, creditCard, method, paymentMethodId, name, additionalProperty, ticketToken;
|
|
160
160
|
var _this = this;
|
|
@@ -169,8 +169,10 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
169
169
|
object: __assign(__assign(__assign(__assign(__assign(__assign({ amount: amount, issuedThrough: issuedThrough, paymentMethod: paymentMethod }, (creditCard !== undefined && creditCard !== null) ? { creditCard: creditCard } : undefined), (typeof name === 'string') ? { name: name } : undefined), (typeof method === 'string') ? { method: method } : undefined), (typeof paymentMethodId === 'string') ? { paymentMethodId: paymentMethodId } : undefined), (typeof ticketToken === 'string') ? { ticketToken: ticketToken } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty: additionalProperty } : undefined),
|
|
170
170
|
purpose: purpose
|
|
171
171
|
},
|
|
172
|
-
qs:
|
|
173
|
-
|
|
172
|
+
qs: {
|
|
173
|
+
async: true,
|
|
174
|
+
purpose: { id: purpose.id } // 追加(2024-04-01~)
|
|
175
|
+
}
|
|
174
176
|
})
|
|
175
177
|
.then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
176
178
|
return [2 /*return*/, response.json()];
|
|
@@ -183,11 +185,12 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
183
185
|
*/
|
|
184
186
|
PaymentService.prototype.authorizeMovieTicket = function (params, options) {
|
|
185
187
|
return __awaiter(this, void 0, void 0, function () {
|
|
186
|
-
var object, purpose, issuedThrough, paymentMethod, movieTickets, name, additionalProperty, ticketToken;
|
|
188
|
+
var object, purpose, issuedThrough, paymentMethod, movieTickets, name, additionalProperty, ticketToken, checkedActionId;
|
|
187
189
|
var _this = this;
|
|
188
190
|
return __generator(this, function (_a) {
|
|
189
191
|
object = params.object, purpose = params.purpose;
|
|
190
192
|
issuedThrough = object.issuedThrough, paymentMethod = object.paymentMethod, movieTickets = object.movieTickets, name = object.name, additionalProperty = object.additionalProperty, ticketToken = object.ticketToken;
|
|
193
|
+
checkedActionId = options.checkedActionId;
|
|
191
194
|
return [2 /*return*/, this.fetch({
|
|
192
195
|
uri: "/payment/" + factory.service.paymentService.PaymentServiceType.MovieTicket + "/authorize",
|
|
193
196
|
method: 'POST',
|
|
@@ -196,8 +199,11 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
196
199
|
object: __assign(__assign(__assign(__assign({ issuedThrough: issuedThrough, paymentMethod: paymentMethod }, (Array.isArray(movieTickets)) ? { movieTickets: movieTickets } : undefined), (typeof name === 'string') ? { name: name } : undefined), (typeof ticketToken === 'string') ? { ticketToken: ticketToken } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty: additionalProperty } : undefined),
|
|
197
200
|
purpose: purpose
|
|
198
201
|
},
|
|
199
|
-
qs:
|
|
200
|
-
|
|
202
|
+
qs: {
|
|
203
|
+
checkedActionId: checkedActionId,
|
|
204
|
+
async: true,
|
|
205
|
+
purpose: { id: purpose.id } // 追加(2024-04-01~)
|
|
206
|
+
}
|
|
201
207
|
})
|
|
202
208
|
.then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
203
209
|
return [2 /*return*/, response.json()];
|
|
@@ -11,7 +11,6 @@ export declare class EventService extends Service {
|
|
|
11
11
|
/**
|
|
12
12
|
* イベント冪等複数作成
|
|
13
13
|
* イベント識別子をキーにして、存在しなければ作成する
|
|
14
|
-
* アプリケーションオファーは設定されない
|
|
15
14
|
*/
|
|
16
15
|
createIfNotExistByIdentifier(params: ICreateParamsByIdentifier[], options: {
|
|
17
16
|
/**
|
|
@@ -32,7 +31,6 @@ export declare class EventService extends Service {
|
|
|
32
31
|
* 識別子によるイベント複数更新
|
|
33
32
|
* 識別子のイベントが存在しなければNotFound
|
|
34
33
|
* 座席有無は変更できない
|
|
35
|
-
* アプリケーションオファーは変更できない
|
|
36
34
|
*/
|
|
37
35
|
updateEventsByIdentifier(params: IUpdateParamsByIdentifier[], options: {
|
|
38
36
|
typeOf: factory.eventType.ScreeningEvent;
|
|
@@ -77,7 +77,6 @@ var EventService = /** @class */ (function (_super) {
|
|
|
77
77
|
/**
|
|
78
78
|
* イベント冪等複数作成
|
|
79
79
|
* イベント識別子をキーにして、存在しなければ作成する
|
|
80
|
-
* アプリケーションオファーは設定されない
|
|
81
80
|
*/
|
|
82
81
|
EventService.prototype.createIfNotExistByIdentifier = function (params, options) {
|
|
83
82
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -95,7 +94,9 @@ var EventService = /** @class */ (function (_super) {
|
|
|
95
94
|
})];
|
|
96
95
|
case 2:
|
|
97
96
|
eventService = _b.sent();
|
|
98
|
-
return [4 /*yield*/, eventService.createIfNotExistByIdentifier(params, __assign(__assign({}, options), {
|
|
97
|
+
return [4 /*yield*/, eventService.createIfNotExistByIdentifier(params, __assign(__assign({}, options), {
|
|
98
|
+
// disableOverwriteMakesOffer: true // force true(2025-10-28~)
|
|
99
|
+
disableOverwriteMakesOffer: false // force false(2025-11-12~)
|
|
99
100
|
}))];
|
|
100
101
|
case 3:
|
|
101
102
|
_b.sent();
|
|
@@ -108,7 +109,6 @@ var EventService = /** @class */ (function (_super) {
|
|
|
108
109
|
* 識別子によるイベント複数更新
|
|
109
110
|
* 識別子のイベントが存在しなければNotFound
|
|
110
111
|
* 座席有無は変更できない
|
|
111
|
-
* アプリケーションオファーは変更できない
|
|
112
112
|
*/
|
|
113
113
|
EventService.prototype.updateEventsByIdentifier = function (params, options) {
|
|
114
114
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -126,7 +126,9 @@ var EventService = /** @class */ (function (_super) {
|
|
|
126
126
|
})];
|
|
127
127
|
case 2:
|
|
128
128
|
eventService = _b.sent();
|
|
129
|
-
return [4 /*yield*/, eventService.updateEventsByIdentifier(params, __assign(__assign({}, options), {
|
|
129
|
+
return [4 /*yield*/, eventService.updateEventsByIdentifier(params, __assign(__assign({}, options), {
|
|
130
|
+
// disableOverwriteMakesOffer: true // force true(2025-10-28~)
|
|
131
|
+
disableOverwriteMakesOffer: false // force false(2025-11-12~)
|
|
130
132
|
}))];
|
|
131
133
|
case 3:
|
|
132
134
|
_b.sent();
|
|
@@ -18,6 +18,12 @@ export declare class PaymentService extends Service {
|
|
|
18
18
|
authorizeCreditCardAsync(params: {
|
|
19
19
|
object: IAuthorizeCreditCardObject;
|
|
20
20
|
purpose: IPurpose;
|
|
21
|
+
}, options?: {
|
|
22
|
+
/**
|
|
23
|
+
* min: 1000 ms
|
|
24
|
+
*/
|
|
25
|
+
intervalAfterIssueTicketInMS?: number;
|
|
26
|
+
disableIssueTicket: boolean;
|
|
21
27
|
}): Promise<{
|
|
22
28
|
/**
|
|
23
29
|
* task ID
|
|
@@ -52,6 +58,12 @@ export declare class PaymentService extends Service {
|
|
|
52
58
|
publishCreditCardPaymentUrlAsync(params: {
|
|
53
59
|
object: IPublishPaymentUrlObject;
|
|
54
60
|
purpose: IPurpose;
|
|
61
|
+
}, options?: {
|
|
62
|
+
/**
|
|
63
|
+
* min: 1000 ms
|
|
64
|
+
*/
|
|
65
|
+
intervalAfterIssueTicketInMS?: number;
|
|
66
|
+
disableIssueTicket: boolean;
|
|
55
67
|
}): Promise<{
|
|
56
68
|
/**
|
|
57
69
|
* task ID
|
|
@@ -83,7 +83,7 @@ var http_status_1 = require("http-status");
|
|
|
83
83
|
var factory = require("../../factory");
|
|
84
84
|
var index_1 = require("../../index");
|
|
85
85
|
var service_1 = require("../../service");
|
|
86
|
-
var
|
|
86
|
+
var MIN_INTERVAL_AFTER_ISSUE_TICKET_MS = 1000;
|
|
87
87
|
var RETRY_ISSUE_TICKET_INTERVAL_MS = 5000;
|
|
88
88
|
function wait(waitInMilliseconds) {
|
|
89
89
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -133,13 +133,15 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
133
133
|
/**
|
|
134
134
|
* クレジットカード決済承認(非同期)
|
|
135
135
|
*/
|
|
136
|
-
PaymentService.prototype.authorizeCreditCardAsync = function (params) {
|
|
136
|
+
PaymentService.prototype.authorizeCreditCardAsync = function (params, options) {
|
|
137
137
|
return __awaiter(this, void 0, void 0, function () {
|
|
138
|
-
var object, purpose, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService, ticketToken;
|
|
138
|
+
var object, purpose, intervalAfterIssueTicketInMS, disableIssueTicket, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService, ticketToken;
|
|
139
139
|
return __generator(this, function (_b) {
|
|
140
140
|
switch (_b.label) {
|
|
141
141
|
case 0:
|
|
142
142
|
object = params.object, purpose = params.purpose;
|
|
143
|
+
intervalAfterIssueTicketInMS = options === null || options === void 0 ? void 0 : options.intervalAfterIssueTicketInMS;
|
|
144
|
+
disableIssueTicket = (options === null || options === void 0 ? void 0 : options.disableIssueTicket) === true;
|
|
143
145
|
_a = this.options, auth = _a.auth, endpoint = _a.endpoint, project = _a.project, seller = _a.seller, disableAutoRetry = _a.disableAutoRetry, retryableStatusCodes = _a.retryableStatusCodes;
|
|
144
146
|
return [4 /*yield*/, index_1.loadChevrePay({ auth: auth, endpoint: endpoint, disableAutoRetry: disableAutoRetry })];
|
|
145
147
|
case 1:
|
|
@@ -154,7 +156,11 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
154
156
|
})];
|
|
155
157
|
case 2:
|
|
156
158
|
paymentService = _b.sent();
|
|
157
|
-
return [4 /*yield*/, this.issueTicketThroughCreditCardIfNotExists({ object: object, purpose: purpose }, {
|
|
159
|
+
return [4 /*yield*/, this.issueTicketThroughCreditCardIfNotExists({ object: object, purpose: purpose }, {
|
|
160
|
+
checkPaymentMethodId: true,
|
|
161
|
+
intervalAfterIssueTicketInMS: intervalAfterIssueTicketInMS,
|
|
162
|
+
disableIssueTicket: disableIssueTicket
|
|
163
|
+
})];
|
|
158
164
|
case 3:
|
|
159
165
|
ticketToken = (_b.sent()).ticketToken;
|
|
160
166
|
return [2 /*return*/, paymentService.authorizeCreditCard({
|
|
@@ -196,7 +202,7 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
196
202
|
return [2 /*return*/, paymentService.authorizeMovieTicket({
|
|
197
203
|
object: __assign(__assign({}, object), { ticketToken: ticketToken }),
|
|
198
204
|
purpose: purpose
|
|
199
|
-
}, {
|
|
205
|
+
}, { checkedActionId: checkedActionId })];
|
|
200
206
|
}
|
|
201
207
|
});
|
|
202
208
|
});
|
|
@@ -204,13 +210,15 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
204
210
|
/**
|
|
205
211
|
* 決済採用(決済ロケーション発行)(非同期)
|
|
206
212
|
*/
|
|
207
|
-
PaymentService.prototype.publishCreditCardPaymentUrlAsync = function (params) {
|
|
213
|
+
PaymentService.prototype.publishCreditCardPaymentUrlAsync = function (params, options) {
|
|
208
214
|
return __awaiter(this, void 0, void 0, function () {
|
|
209
|
-
var object, purpose, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService, ticketToken;
|
|
215
|
+
var object, purpose, intervalAfterIssueTicketInMS, disableIssueTicket, _a, auth, endpoint, project, seller, disableAutoRetry, retryableStatusCodes, chevrePay, paymentService, ticketToken;
|
|
210
216
|
return __generator(this, function (_b) {
|
|
211
217
|
switch (_b.label) {
|
|
212
218
|
case 0:
|
|
213
219
|
object = params.object, purpose = params.purpose;
|
|
220
|
+
intervalAfterIssueTicketInMS = options === null || options === void 0 ? void 0 : options.intervalAfterIssueTicketInMS;
|
|
221
|
+
disableIssueTicket = (options === null || options === void 0 ? void 0 : options.disableIssueTicket) === true;
|
|
214
222
|
_a = this.options, auth = _a.auth, endpoint = _a.endpoint, project = _a.project, seller = _a.seller, disableAutoRetry = _a.disableAutoRetry, retryableStatusCodes = _a.retryableStatusCodes;
|
|
215
223
|
return [4 /*yield*/, index_1.loadChevrePay({ auth: auth, endpoint: endpoint, disableAutoRetry: disableAutoRetry })];
|
|
216
224
|
case 1:
|
|
@@ -226,7 +234,11 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
226
234
|
})];
|
|
227
235
|
case 2:
|
|
228
236
|
paymentService = _b.sent();
|
|
229
|
-
return [4 /*yield*/, this.issueTicketThroughCreditCardIfNotExists({ object: object, purpose: purpose }, {
|
|
237
|
+
return [4 /*yield*/, this.issueTicketThroughCreditCardIfNotExists({ object: object, purpose: purpose }, {
|
|
238
|
+
checkPaymentMethodId: false,
|
|
239
|
+
intervalAfterIssueTicketInMS: intervalAfterIssueTicketInMS,
|
|
240
|
+
disableIssueTicket: disableIssueTicket
|
|
241
|
+
})];
|
|
230
242
|
case 3:
|
|
231
243
|
ticketToken = (_b.sent()).ticketToken;
|
|
232
244
|
return [2 /*return*/, paymentService.publishCreditCardPaymentUrlAsync({
|
|
@@ -654,14 +666,21 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
654
666
|
};
|
|
655
667
|
PaymentService.prototype.issueTicketThroughCreditCardIfNotExists = function (params, options) {
|
|
656
668
|
return __awaiter(this, void 0, void 0, function () {
|
|
657
|
-
var object, purpose, checkPaymentMethodId,
|
|
669
|
+
var object, purpose, checkPaymentMethodId, disableIssueTicket, ticketToken, intervalAfterIssueTicketInMS, issueForcibly, paymentMethodId, automaticallyIssuedTicket;
|
|
658
670
|
return __generator(this, function (_a) {
|
|
659
671
|
switch (_a.label) {
|
|
660
672
|
case 0:
|
|
661
673
|
object = params.object, purpose = params.purpose;
|
|
662
|
-
checkPaymentMethodId = options.checkPaymentMethodId;
|
|
663
|
-
issueForcibly = false;
|
|
674
|
+
checkPaymentMethodId = options.checkPaymentMethodId, disableIssueTicket = options.disableIssueTicket;
|
|
664
675
|
ticketToken = object.ticketToken;
|
|
676
|
+
if (disableIssueTicket) {
|
|
677
|
+
return [2 /*return*/, { ticketToken: ticketToken }];
|
|
678
|
+
}
|
|
679
|
+
intervalAfterIssueTicketInMS = (typeof options.intervalAfterIssueTicketInMS === 'number'
|
|
680
|
+
&& options.intervalAfterIssueTicketInMS > MIN_INTERVAL_AFTER_ISSUE_TICKET_MS)
|
|
681
|
+
? options.intervalAfterIssueTicketInMS
|
|
682
|
+
: MIN_INTERVAL_AFTER_ISSUE_TICKET_MS;
|
|
683
|
+
issueForcibly = false;
|
|
665
684
|
paymentMethodId = object.paymentMethodId;
|
|
666
685
|
if (checkPaymentMethodId) {
|
|
667
686
|
// 承認時は、ticketTokenもpaymentMethodIdも指定がない場合に、自動発行
|
|
@@ -686,7 +705,7 @@ var PaymentService = /** @class */ (function (_super) {
|
|
|
686
705
|
case 1:
|
|
687
706
|
automaticallyIssuedTicket = _a.sent();
|
|
688
707
|
// n秒待機
|
|
689
|
-
return [4 /*yield*/, wait(
|
|
708
|
+
return [4 /*yield*/, wait(intervalAfterIssueTicketInMS)];
|
|
690
709
|
case 2:
|
|
691
710
|
// n秒待機
|
|
692
711
|
_a.sent();
|