@cinerino/sdk 11.0.0-alpha.9 → 11.1.0-alpha.0

package/example/playground/public/lib/bundle.js

@@ -15831,16 +15831,18 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.publishCreditCardPaymentUrlAsync = function (params) {
         return __awaiter(this, void 0, void 0, function () {
+            var object, purpose;
             var _this = this;
             return __generator(this, function (_a) {
+                object = params.object, purpose = params.purpose;
                 return [2 /*return*/, this.fetch({
                         uri: "/payment/" + factory.service.paymentService.PaymentServiceType.CreditCard + "/publishPaymentUrl",
                         method: 'POST',
                         expectedStatusCodes: [http_status_1.ACCEPTED],
-                        body: params,
+                        body: { object: object, purpose: purpose },
                         qs: {
                             async: true,
-                            purpose: { id: params.purpose.id } // 追加(2024-04-01~)
+                            purpose: { id: purpose.id } // 追加(2024-04-01~)
                         }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {

package/example/src/auth/authAsAdmin.ts

@@ -15,6 +15,9 @@ export async function login() {
         redirectUri: 'https://localhost/signIn',
         logoutUri: 'https://localhost/signOut'
     });
+    auth.onTokenRefreshed(async (params) => {
+        console.log('onTokenRefreshed called.', params);
+    });
 
     const scopes: string[] = [];
     const state = '12345';
@@ -48,13 +51,13 @@ export async function login() {
                         return;
                     }
 
-                    let credentials = await auth.getToken(code, codeVerifier);
+                    const credentials = await auth.getToken(code, codeVerifier);
                     // console.log('credentials published', credentials);
 
                     auth.setCredentials(credentials);
 
-                    credentials = await auth.refreshAccessToken();
-                    console.log('credentials refreshed', credentials);
+                    // credentials = await auth.refreshAccessToken();
+                    // console.log('credentials refreshed', credentials);
 
                     // rl.close();
                     resolve();

package/example/src/cloud/transaction/processPlaceOrderByCreditCard3DS.ts

@@ -113,6 +113,17 @@ async function main() {
             authorizeSeatReservationResults.push(authorizeSeatReservationResult);
         }
 
+        // 出力メンバーシップ対応の場合チケット発行
+        const { ticketToken } = await paymentService.issueTicketThroughCreditCard({
+            ticketedPermit: {
+                issuedThrough: {
+                    id: paymentServiceId
+                }
+            },
+            purpose: { id: transaction.id, typeOf: client.factory.transactionType.PlaceOrder }
+        });
+        console.log('ticketToken issued.', ticketToken);
+
         // 決済URL発行
         const { paymentMethodId, paymentUrl } = await publishPaymentUrlAsyncForcibly({
             object: {
@@ -123,7 +134,8 @@ async function main() {
                     ...creditCard,
                     retUrl: String(process.env.SECURE_TRAN_RET_URL) // callbackを指定すると3DSとして処理される
                 },
-                issuedThrough: { id: paymentServiceId }
+                issuedThrough: { id: paymentServiceId },
+                ticketToken
             },
             purpose: { id: transaction.id, typeOf: client.factory.transactionType.PlaceOrder }
         })({ paymentService });
@@ -172,7 +184,8 @@ async function main() {
                             paymentMethodId, // URL発行時のpaymentMethodIdを指定
                             method: '1',
                             creditCard,
-                            issuedThrough: { id: paymentServiceId }
+                            issuedThrough: { id: paymentServiceId },
+                            ticketToken
                         },
                         purpose: { id: transaction.id, typeOf: client.factory.transactionType.PlaceOrder }
                     })({ paymentService });
@@ -385,7 +398,7 @@ async function wait(waitInMilliseconds: number) {
 const USE_FORCE_AUTHORIZE_PAYMENT_ASYNC_GIVE_UP_SECONDS = 10;
 const USE_FORCE_AUTHORIZE_PAYMENT_ASYNC_CHECK_INTERVAL_MS = 1000;
 function publishPaymentUrlAsyncForcibly(params: {
-    object: Pick<client.factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'paymentMethod' | 'method'>;
+    object: Pick<client.factory.action.authorize.paymentMethod.any.IObjectWithoutDetail, 'amount' | 'creditCard' | 'issuedThrough' | 'paymentMethod' | 'method' | 'ticketToken'>;
     purpose: {
         typeOf: client.factory.transactionType.PlaceOrder;
         id: string;
@@ -443,7 +456,7 @@ function publishPaymentUrlAsyncForcibly(params: {
 function authorizeCreditCardAsyncForcibly(params: {
     object: Pick<
         client.factory.action.authorize.paymentMethod.any.IObjectWithoutDetail,
-        'amount' | 'issuedThrough' | 'paymentMethod' | 'creditCard' | 'method' | 'paymentMethodId' | 'name' | 'additionalProperty'
+        'amount' | 'issuedThrough' | 'paymentMethod' | 'creditCard' | 'method' | 'paymentMethodId' | 'name' | 'additionalProperty' | 'ticketToken'
     >;
     purpose: {
         typeOf: client.factory.transactionType.PlaceOrder;

package/lib/abstract/chevrePay/payment/factory.d.ts

@@ -37,7 +37,7 @@ export declare type IAuthorizeMovieTicketObject = Pick<factory.action.authorize.
 export declare type IAuthorizePaymentCardObject = Pick<factory.action.authorize.paymentMethod.any.IAuthorizePaymentCardObject, 'amount' | 'issuedThrough' | 'paymentMethod' | 'fromLocation' | 'name' | 'additionalProperty'> & {
     description?: string;
 };
-export declare type IPublishPaymentUrlObject = Pick<factory.action.authorize.paymentMethod.any.IAuthorizeCreditCardObject, 'amount' | 'creditCard' | 'issuedThrough' | 'paymentMethod' | 'method'>;
+export declare type IPublishPaymentUrlObject = Pick<factory.action.authorize.paymentMethod.any.IAuthorizeCreditCardObject, 'amount' | 'creditCard' | 'issuedThrough' | 'paymentMethod' | 'method' | 'ticketToken'>;
 export declare type IPublishPaymentUrlResult = Pick<factory.action.accept.pay.IResult, 'paymentMethodId' | 'paymentUrl'>;
 export interface IFindAuthorizeActionResult {
     /**

package/lib/abstract/chevrePay/payment.js

@@ -221,16 +221,18 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.publishCreditCardPaymentUrlAsync = function (params) {
         return __awaiter(this, void 0, void 0, function () {
+            var object, purpose;
             var _this = this;
             return __generator(this, function (_a) {
+                object = params.object, purpose = params.purpose;
                 return [2 /*return*/, this.fetch({
                         uri: "/payment/" + factory.service.paymentService.PaymentServiceType.CreditCard + "/publishPaymentUrl",
                         method: 'POST',
                         expectedStatusCodes: [http_status_1.ACCEPTED],
-                        body: params,
+                        body: { object: object, purpose: purpose },
                         qs: {
                             async: true,
-                            purpose: { id: params.purpose.id } // 追加(2024-04-01~)
+                            purpose: { id: purpose.id } // 追加(2024-04-01~)
                         }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {

package/lib/auth/clientCredentialsClient.d.ts

@@ -1,4 +1,4 @@
-import ICredentials from './credentials';
+import { ICredentials } from './credentials';
 import OAuth2client from './oAuth2client';
 export interface IOptions {
     domain: string;

package/lib/auth/credentials.d.ts

@@ -31,4 +31,4 @@ interface ICredentials {
     idTokenPayload?: any;
     state?: string;
 }
-export default ICredentials;
+export { ICredentials };

package/lib/auth/oAuth2client.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import type { AuthClient } from '../abstract/auth/authClient';
-import type ICredentials from './credentials';
+import { ICredentials } from './credentials';
 import { LoginTicket } from './loginTicket';
 export declare const MAX_RETRY_NUM = 2;
 export interface IGenerateAuthUrlOpts {
@@ -8,6 +8,8 @@ export interface IGenerateAuthUrlOpts {
     state: string;
     codeVerifier?: string;
 }
+declare type IOnTokenRefreshedParams = Pick<ICredentials, 'access_token' | 'expiry_date' | 'id_token' | 'token_type' | 'refresh_token'>;
+declare type IOnTokenRefreshed = (params: IOnTokenRefreshedParams) => Promise<void>;
 export interface IOptions {
     domain: string;
     clientId?: string;
@@ -47,6 +49,10 @@ export default class OAuth2client implements AuthClient {
      */
     credentials: ICredentials;
     options: IOptions;
+    /**
+     * 認証クライアントインスタンス内で発生するイベント
+     */
+    private readonly events;
     constructor(options: IOptions);
     static BASE64URLENCODE(str: Buffer): string;
     static SHA256(buffer: any): Buffer;
@@ -89,6 +95,10 @@ export default class OAuth2client implements AuthClient {
      * 結果にはIDトークンの付加情報が含まれます。
      */
     verifyIdToken(options: IVerifyIdTokenOptions): LoginTicket;
+    /**
+     * トークン更新イベントハンドラを登録する
+     */
+    onTokenRefreshed(params: IOnTokenRefreshed): void;
     /**
      * Provides a request implementation with OAuth 2.0 flow.
      * If credentials have a refresh_token, in cases of HTTP
@@ -120,3 +130,4 @@ export default class OAuth2client implements AuthClient {
      */
     private verifySignedJwt;
 }
+export {};

package/lib/auth/oAuth2client.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -70,6 +81,7 @@ var OAuth2client = /** @class */ (function () {
         // TODO add minimum validation
         this.options = options;
         this.credentials = {};
+        this.events = {};
     }
     OAuth2client.BASE64URLENCODE = function (str) {
         return str.toString('base64')
@@ -188,12 +200,22 @@ var OAuth2client = /** @class */ (function () {
                     throw new Error('No refresh token is set.');
                 }
                 return [2 /*return*/, this.refreshToken(this.credentials.refresh_token)
-                        .then(function (tokens) {
-                        tokens.refresh_token = _this.credentials.refresh_token;
-                        debug('setting credentials...', tokens);
-                        _this.credentials = tokens;
-                        return _this.credentials;
-                    })];
+                        .then(function (refreshTokenResult) { return __awaiter(_this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    // tokens.refresh_token = this.credentials.refresh_token;
+                                    debug('setting credentials...', refreshTokenResult);
+                                    this.credentials = __assign(__assign({}, refreshTokenResult), { refresh_token: this.credentials.refresh_token });
+                                    if (!(typeof this.events.onTokenRefreshed === 'function')) return [3 /*break*/, 2];
+                                    return [4 /*yield*/, this.events.onTokenRefreshed(this.credentials)];
+                                case 1:
+                                    _a.sent();
+                                    _a.label = 2;
+                                case 2: return [2 /*return*/, this.credentials];
+                            }
+                        });
+                    }); })];
             });
         });
     };
@@ -339,6 +361,12 @@ var OAuth2client = /** @class */ (function () {
         // return this.verifySignedJwt(options.idToken, options.audience, OAuth2Client.ISSUERS_);
         return this.verifySignedJwt(this.credentials.id_token, options.audience);
     };
+    /**
+     * トークン更新イベントハンドラを登録する
+     */
+    OAuth2client.prototype.onTokenRefreshed = function (params) {
+        this.events.onTokenRefreshed = params;
+    };
     /**
      * Provides a request implementation with OAuth 2.0 flow.
      * If credentials have a refresh_token, in cases of HTTP
@@ -404,7 +432,7 @@ var OAuth2client = /** @class */ (function () {
                 debug('fetching...', options);
                 return [2 /*return*/, fetch("https://" + this.options.domain + OAuth2client.OAUTH2_TOKEN_URI, options)
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () {
-                        var body, body, tokens;
+                        var body, body, result, refreshTokenResponse, access_token, id_token, expires_in, token_type;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -420,17 +448,29 @@ var OAuth2client = /** @class */ (function () {
                                     body = _a.sent();
                                     throw new Error(body);
                                 case 4: return [3 /*break*/, 7];
-                                case 5: return [4 /*yield*/, response.json()];
+                                case 5:
+                                    result = void 0;
+                                    return [4 /*yield*/, response.json()];
                                 case 6:
-                                    tokens = _a.sent();
+                                    refreshTokenResponse = _a.sent();
                                     // tslint:disable-next-line:no-single-line-block-comment
                                     /* istanbul ignore else */
-                                    if (tokens && tokens.expires_in) {
-                                        // tslint:disable-next-line:no-magic-numbers
-                                        tokens.expiry_date = ((new Date()).getTime() + (tokens.expires_in * 1000));
-                                        delete tokens.expires_in;
+                                    if (refreshTokenResponse !== undefined && typeof refreshTokenResponse.expires_in === 'number') {
+                                        access_token = refreshTokenResponse.access_token, id_token = refreshTokenResponse.id_token, expires_in = refreshTokenResponse.expires_in, token_type = refreshTokenResponse.token_type;
+                                        result = {
+                                            access_token: access_token, id_token: id_token, token_type: token_type,
+                                            // tslint:disable-next-line:no-magic-numbers
+                                            expiry_date: ((new Date()).getTime() + (expires_in * 1000))
+                                        };
+                                        // delete tokens.expires_in;
                                     }
-                                    return [2 /*return*/, tokens];
+                                    else {
+                                        // 想定していないリフレッシュトークンレスポンスはログ出力
+                                        // tslint:disable-next-line:no-console
+                                        console.error('unexpected refreshToken response:', refreshTokenResponse);
+                                        throw new Error('unexpected refreshToken response.');
+                                    }
+                                    return [2 /*return*/, result];
                                 case 7: return [2 /*return*/];
                             }
                         });

package/lib/bundle.js

@@ -17193,16 +17193,18 @@ var PaymentService = /** @class */ (function (_super) {
      */
     PaymentService.prototype.publishCreditCardPaymentUrlAsync = function (params) {
         return __awaiter(this, void 0, void 0, function () {
+            var object, purpose;
             var _this = this;
             return __generator(this, function (_a) {
+                object = params.object, purpose = params.purpose;
                 return [2 /*return*/, this.fetch({
                         uri: "/payment/" + factory.service.paymentService.PaymentServiceType.CreditCard + "/publishPaymentUrl",
                         method: 'POST',
                         expectedStatusCodes: [http_status_1.ACCEPTED],
-                        body: params,
+                        body: { object: object, purpose: purpose },
                         qs: {
                             async: true,
-                            purpose: { id: params.purpose.id } // 追加(2024-04-01~)
+                            purpose: { id: purpose.id } // 追加(2024-04-01~)
                         }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
@@ -27224,6 +27226,17 @@ exports.LoginTicket = LoginTicket;
 },{}],173:[function(require,module,exports){
 (function (Buffer){
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -27295,6 +27308,7 @@ var OAuth2client = /** @class */ (function () {
         // TODO add minimum validation
         this.options = options;
         this.credentials = {};
+        this.events = {};
     }
     OAuth2client.BASE64URLENCODE = function (str) {
         return str.toString('base64')
@@ -27413,12 +27427,22 @@ var OAuth2client = /** @class */ (function () {
                     throw new Error('No refresh token is set.');
                 }
                 return [2 /*return*/, this.refreshToken(this.credentials.refresh_token)
-                        .then(function (tokens) {
-                        tokens.refresh_token = _this.credentials.refresh_token;
-                        debug('setting credentials...', tokens);
-                        _this.credentials = tokens;
-                        return _this.credentials;
-                    })];
+                        .then(function (refreshTokenResult) { return __awaiter(_this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    // tokens.refresh_token = this.credentials.refresh_token;
+                                    debug('setting credentials...', refreshTokenResult);
+                                    this.credentials = __assign(__assign({}, refreshTokenResult), { refresh_token: this.credentials.refresh_token });
+                                    if (!(typeof this.events.onTokenRefreshed === 'function')) return [3 /*break*/, 2];
+                                    return [4 /*yield*/, this.events.onTokenRefreshed(this.credentials)];
+                                case 1:
+                                    _a.sent();
+                                    _a.label = 2;
+                                case 2: return [2 /*return*/, this.credentials];
+                            }
+                        });
+                    }); })];
             });
         });
     };
@@ -27564,6 +27588,12 @@ var OAuth2client = /** @class */ (function () {
         // return this.verifySignedJwt(options.idToken, options.audience, OAuth2Client.ISSUERS_);
         return this.verifySignedJwt(this.credentials.id_token, options.audience);
     };
+    /**
+     * トークン更新イベントハンドラを登録する
+     */
+    OAuth2client.prototype.onTokenRefreshed = function (params) {
+        this.events.onTokenRefreshed = params;
+    };
     /**
      * Provides a request implementation with OAuth 2.0 flow.
      * If credentials have a refresh_token, in cases of HTTP
@@ -27629,7 +27659,7 @@ var OAuth2client = /** @class */ (function () {
                 debug('fetching...', options);
                 return [2 /*return*/, fetch("https://" + this.options.domain + OAuth2client.OAUTH2_TOKEN_URI, options)
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () {
-                        var body, body, tokens;
+                        var body, body, result, refreshTokenResponse, access_token, id_token, expires_in, token_type;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -27645,17 +27675,29 @@ var OAuth2client = /** @class */ (function () {
                                     body = _a.sent();
                                     throw new Error(body);
                                 case 4: return [3 /*break*/, 7];
-                                case 5: return [4 /*yield*/, response.json()];
+                                case 5:
+                                    result = void 0;
+                                    return [4 /*yield*/, response.json()];
                                 case 6:
-                                    tokens = _a.sent();
+                                    refreshTokenResponse = _a.sent();
                                     // tslint:disable-next-line:no-single-line-block-comment
                                     /* istanbul ignore else */
-                                    if (tokens && tokens.expires_in) {
-                                        // tslint:disable-next-line:no-magic-numbers
-                                        tokens.expiry_date = ((new Date()).getTime() + (tokens.expires_in * 1000));
-                                        delete tokens.expires_in;
+                                    if (refreshTokenResponse !== undefined && typeof refreshTokenResponse.expires_in === 'number') {
+                                        access_token = refreshTokenResponse.access_token, id_token = refreshTokenResponse.id_token, expires_in = refreshTokenResponse.expires_in, token_type = refreshTokenResponse.token_type;
+                                        result = {
+                                            access_token: access_token, id_token: id_token, token_type: token_type,
+                                            // tslint:disable-next-line:no-magic-numbers
+                                            expiry_date: ((new Date()).getTime() + (expires_in * 1000))
+                                        };
+                                        // delete tokens.expires_in;
                                     }
-                                    return [2 /*return*/, tokens];
+                                    else {
+                                        // 想定していないリフレッシュトークンレスポンスはログ出力
+                                        // tslint:disable-next-line:no-console
+                                        console.error('unexpected refreshToken response:', refreshTokenResponse);
+                                        throw new Error('unexpected refreshToken response.');
+                                    }
+                                    return [2 /*return*/, result];
                                 case 7: return [2 /*return*/];
                             }
                         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cinerino/sdk",
-  "version": "11.0.0-alpha.9",
+  "version": "11.1.0-alpha.0",
   "description": "Cinerino SDK",
   "main": "./lib/index.js",
   "browser": {