@chevre/domain 22.0.0-alpha.1 → 22.0.0-alpha.4

package/example/src/chevre/findReservationByCode.ts

@@ -28,11 +28,23 @@ async function main() {
         ticket: {
             ticketToken: CODE
         }
-    })({
-        authorization: authorizationRepo,
-        order: orderRepo,
-        ticket: ticketRepo
-    });
+    })(
+        {
+            authorization: authorizationRepo,
+            order: orderRepo,
+            ticket: ticketRepo
+        },
+        {
+            jwt: await chevre.credentials.JWT.createInstance({
+                secret: <string>process.env.TOKEN_SECRET,
+                issuers: (typeof process.env.TOKEN_ISSUERS_BY_AUTHORIZATION === 'string')
+                    ? process.env.TOKEN_ISSUERS_BY_AUTHORIZATION.split(' ')
+                    : [],
+                version: (typeof process.env.TOKEN_VERSION === 'string') ? process.env.TOKEN_VERSION : '2024-05-02',
+                payloadTypPrefix: (typeof process.env.TOKEN_PAYLOAD_TYP_PREFIX === 'string') ? process.env.TOKEN_PAYLOAD_TYP_PREFIX : 'chevre'
+            })
+        }
+    );
     console.log('verified.');
 
     const result = await (await chevre.service.reserve.createService()).findByCode({

package/example/src/chevre/findValidAuthorization.ts

@@ -33,10 +33,22 @@ async function main() {
         issuer: 'https://example.com',
         audience: 'https://example.com',
         useJti: true
-    })({
-        authorization: authorizationRepo,
-        ticket: ticketRepo
-    });
+    })(
+        {
+            authorization: authorizationRepo,
+            ticket: ticketRepo
+        },
+        {
+            jwt: await chevre.credentials.JWT.createInstance({
+                secret: <string>process.env.TOKEN_SECRET,
+                issuers: (typeof process.env.TOKEN_ISSUERS_BY_AUTHORIZATION === 'string')
+                    ? process.env.TOKEN_ISSUERS_BY_AUTHORIZATION.split(' ')
+                    : [],
+                version: (typeof process.env.TOKEN_VERSION === 'string') ? process.env.TOKEN_VERSION : '2024-05-02',
+                payloadTypPrefix: (typeof process.env.TOKEN_PAYLOAD_TYP_PREFIX === 'string') ? process.env.TOKEN_PAYLOAD_TYP_PREFIX : 'chevre'
+            })
+        }
+    );
     console.log('token:', token);
 }
 

package/example/src/chevre/importCategoryCodesFromCOA.ts

@@ -1,28 +1,25 @@
 // tslint:disable:no-console
-import * as COA from '@motionpicture/coa-service';
-// import * as redis from 'redis';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
 const project = { id: String(process.env.PROJECT_ID) };
 
-const coaAuthClient = new COA.auth.RefreshToken({
-    endpoint: chevre.credentials.coa.endpoint,
-    refreshToken: chevre.credentials.coa.refreshToken,
-    useFetch: chevre.credentials.coa.useFetch
-});
-
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
     const categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
-    const masterService = new COA.service.Master(
+    const coaAuthClient = new (await chevre.loadCOA()).auth.RefreshToken({
+        endpoint: '',
+        refreshToken: '',
+        useFetch: true
+    });
+    const masterService = new (await chevre.loadCOA()).service.Master(
         {
-            endpoint: chevre.credentials.coa.endpoint,
+            endpoint: '',
             auth: coaAuthClient
         },
-        { timeout: chevre.credentials.coa.timeout }
+        { timeout: 20000 }
     );
 
     await (await chevre.service.offer.createService()).event.importCategoryCodesFromCOA({

package/example/src/chevre/importEventsFromCOA.ts

@@ -18,6 +18,19 @@ async function main() {
     const movieTheaterRepo = await chevre.repository.place.MovieTheater.createInstance(mongoose.connection);
     const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
 
+    const coaAuthClient = new (await chevre.loadCOA()).auth.RefreshToken({
+        endpoint: '',
+        refreshToken: '',
+        useFetch: true
+    });
+    const masterService = new (await chevre.loadCOA()).service.Master(
+        {
+            endpoint: '',
+            auth: coaAuthClient
+        },
+        { timeout: 20000 }
+    );
+
     await (await chevre.service.event.createService()).importFromCOA({
         project: {
             id: project.id,
@@ -39,7 +52,8 @@ async function main() {
         event: eventRepo,
         movieTheater: movieTheaterRepo,
         screeningRoom: screeningRoomRepo,
-        seller: sellerRepo
+        seller: sellerRepo,
+        masterService
     });
     console.log('imported');
 }

package/example/src/chevre/migrateCognitoUser.ts

@@ -1,4 +1,7 @@
 // tslint:disable:no-console
+import { CognitoIdentityProvider } from '@aws-sdk/client-cognito-identity-provider';
+import { fromEnv } from '@aws-sdk/credential-providers';
+
 import { chevre } from '../../../lib/index';
 
 export const USERPOOL_ID_OLD = String(process.env.USERPOOL_ID_OLD);
@@ -9,11 +12,21 @@ const NEW_USERPOOL_PROVIDER_NAME = 'SSKTS';
 export async function migrateUser(params: {
     id: string;
 }): Promise<void> {
+    const awsCredentials = fromEnv();
+    const cognitoIdentityServiceProvider = new CognitoIdentityProvider({
+        apiVersion: 'latest',
+        region: 'ap-northeast-1',
+        credentials: awsCredentials
+    });
+
     // 旧会員を取得
     let oldPerson: chevre.factory.person.IPerson | undefined;
 
     try {
-        const oldPersonRepo = await chevre.repository.Person.createInstance({ userPoolId: USERPOOL_ID_OLD });
+        const oldPersonRepo = await chevre.repository.Person.createInstance({
+            userPoolId: USERPOOL_ID_OLD,
+            cognitoIdentityServiceProvider
+        });
         oldPerson = await oldPersonRepo.findById({ userId: params.id });
         console.log('oldPerson found', oldPerson.id, oldPerson.givenName, oldPerson.familyName);
     } catch (error) {
@@ -33,7 +46,10 @@ export async function migrateUser(params: {
     }
 
     // create user
-    const newPersonRepo = await chevre.repository.Person.createInstance({ userPoolId: USERPOOL_ID_NEW });
+    const newPersonRepo = await chevre.repository.Person.createInstance({
+        userPoolId: USERPOOL_ID_NEW,
+        cognitoIdentityServiceProvider
+    });
     const newUsername = `${NEW_USERPOOL_PROVIDER_NAME}_${oldPerson.id}`;
     const newUserId = await new Promise<string>((resolve, reject) => {
         newPersonRepo.cognitoIdentityServiceProvider.adminCreateUser(

package/example/src/chevre/person/updateProfile.ts

@@ -1,9 +1,18 @@
+import { CognitoIdentityProvider } from '@aws-sdk/client-cognito-identity-provider';
+import { fromEnv } from '@aws-sdk/credential-providers';
+
 // tslint:disable:no-console no-magic-numbers
 import { chevre } from '../../../../lib/index';
 
 async function main() {
+    const awsCredentials = fromEnv();
     const personRepo = await chevre.repository.Person.createInstance({
-        userPoolId: <string>process.env.COGNITO_USER_POOL_ID
+        userPoolId: <string>process.env.COGNITO_USER_POOL_ID,
+        cognitoIdentityServiceProvider: new CognitoIdentityProvider({
+            apiVersion: 'latest',
+            region: 'ap-northeast-1',
+            credentials: awsCredentials
+        })
     });
 
     const username = 'xxx';

package/example/src/chevre/searchReservationsByOrder.ts

@@ -8,19 +8,31 @@ const project = { id: String(process.env.PROJECT_ID) };
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
+    const coaAuthClient = new (await chevre.loadCOA()).auth.RefreshToken({
+        endpoint: '',
+        refreshToken: '',
+        useFetch: true
+    });
+
     const { reservations } = await (await chevre.service.reserve.createService()).searchByOrder({
         limit: 10,
         page: 1,
         project: { id: project.id },
         orderNumber: 'CIN3-0760465-8981560',
-        // orderNumber: 'SSK1-3743647-5975553',
-        // orderNumber: 'SSK9-4864565-8689164',
         typeOf: chevre.factory.reservationType.EventReservation
     })({
         acceptedOffer: await chevre.repository.AcceptedOffer.createInstance(mongoose.connection),
         order: await chevre.repository.Order.createInstance(mongoose.connection),
-        reservation: await chevre.repository.Reservation.createInstance(mongoose.connection)
+        reservation: await chevre.repository.Reservation.createInstance(mongoose.connection),
+        reserveService: new (await chevre.loadCOA()).service.Reserve(
+            {
+                endpoint: '',
+                auth: coaAuthClient
+            },
+            { timeout: 20000 }
+        )
     });
+
     console.log(reservations);
     console.log(reservations.length, 'reservations found');
 }

package/lib/chevre/credentials/coa.d.ts

@@ -0,0 +1,17 @@
+interface IOptions {
+    endpoint: string;
+    refreshToken: string;
+    timeout: number;
+    useFetch: boolean;
+}
+/**
+ * COA認証情報
+ */
+declare class COACredentials {
+    readonly endpoint: string;
+    readonly refreshToken: string;
+    readonly timeout: number;
+    readonly useFetch: boolean;
+    constructor(options: IOptions);
+}
+export { COACredentials };

package/lib/chevre/credentials/coa.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.COACredentials = void 0;
+/**
+ * COA認証情報
+ */
+class COACredentials {
+    constructor(options) {
+        this.timeout = 20000;
+        const { endpoint, refreshToken, timeout, useFetch } = options;
+        this.endpoint = endpoint;
+        this.refreshToken = refreshToken;
+        this.timeout = timeout;
+        this.useFetch = useFetch;
+    }
+}
+exports.COACredentials = COACredentials;

package/lib/chevre/credentials/jwt.d.ts

@@ -0,0 +1,23 @@
+interface IOptions {
+    secret: string;
+    /**
+     * トークン検証時の発行者リスト
+     */
+    issuers: string[];
+    version: string;
+    payloadTypPrefix: string;
+}
+/**
+ * トークン認証情報
+ */
+declare class JWTCredentials {
+    readonly secret: string;
+    /**
+     * トークン検証時の発行者リスト
+     */
+    readonly issuers: string[];
+    readonly version: string;
+    readonly payloadTypPrefix: string;
+    constructor(options: IOptions);
+}
+export { JWTCredentials };

package/lib/chevre/credentials/jwt.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JWTCredentials = void 0;
+/**
+ * トークン認証情報
+ */
+class JWTCredentials {
+    constructor(options) {
+        this.version = '2024-05-02'; // 追加(2024-05-02~)
+        this.payloadTypPrefix = 'chevre';
+        const { secret, issuers, version, payloadTypPrefix } = options;
+        this.issuers = issuers;
+        this.payloadTypPrefix = payloadTypPrefix;
+        this.secret = secret;
+        this.version = version;
+    }
+}
+exports.JWTCredentials = JWTCredentials;

package/lib/chevre/credentials.d.ts

@@ -1,40 +1,25 @@
+import type { COACredentials } from './credentials/coa';
+import type { JWTCredentials } from './credentials/jwt';
 /**
  * 外部サービスを使用するための認証情報
  */
-export declare const credentials: {
-    aws: {
-        accessKeyId: string;
-        secretAccessKey: string;
-        tokenIssuerEndpoint: string;
-    };
-    chevre: {
-        authorizeServerDomain: string;
-        clientId: string;
-        clientSecret: string;
-        endpoint: string;
-    };
-    coa: {
-        endpoint: string;
-        refreshToken: string;
-        timeout: number;
-        useFetch: boolean;
-    };
-    customSearch: {
+export declare namespace credentials {
+    const customSearch: {
         engineId: string;
         apiKey: string;
     };
-    gmo: {
+    const gmo: {
         timeout: number;
         timeoutBackground: number | undefined;
         useFetch: boolean;
     };
-    lineNotify: {
+    const lineNotify: {
         url: string | undefined;
         accessToken: string | undefined;
         accessTokenAlert: string | undefined;
         accessTokenInfo: string | undefined;
     };
-    movieticketReserve: {
+    const movieticketReserve: {
         /**
          * 着券時タイムアウト
          */
@@ -44,16 +29,15 @@ export declare const credentials: {
          */
         timeoutCheck: number;
     };
-    sendGrid: {
+    const sendGrid: {
         apiKey: string | undefined;
     };
-    jwt: {
-        secret: string;
-        /**
-         * トークン検証時の発行者リスト
-         */
-        issuers: string[];
-        version: string;
-        payloadTypPrefix: string;
-    };
-};
+    type COA = COACredentials;
+    namespace COA {
+        function createInstance(...params: ConstructorParameters<typeof COACredentials>): Promise<COACredentials>;
+    }
+    type JWT = JWTCredentials;
+    namespace JWT {
+        function createInstance(...params: ConstructorParameters<typeof JWTCredentials>): Promise<JWTCredentials>;
+    }
+}

package/lib/chevre/credentials.js

@@ -1,47 +1,75 @@
 "use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.credentials = void 0;
+// export const credentials = {
+// migrate to JWTCredentials(2024-07-11~)
+// jwt: {
+//     secret: <string>process.env.TOKEN_SECRET,
+//     // RESOURCE_SERVER_IDENTIFIERとは分離して指定可能に拡張(2024-05-02~)
+//     // issuer: (typeof process.env.TOKEN_ISSUER_BY_AUTHORIZATION === 'string')
+//     //     ? process.env.TOKEN_ISSUER_BY_AUTHORIZATION
+//     //     : <string>process.env.RESOURCE_SERVER_IDENTIFIER,
+//     /**
+//      * トークン検証時の発行者リスト
+//      */
+//     issuers: (typeof process.env.TOKEN_ISSUERS_BY_AUTHORIZATION === 'string')
+//         ? process.env.TOKEN_ISSUERS_BY_AUTHORIZATION.split(' ')
+//         : [], // 追加(2024-05-02~)
+//     version: (typeof process.env.TOKEN_VERSION === 'string') ? process.env.TOKEN_VERSION : '2024-05-02', // 追加(2024-05-02~)
+//     payloadTypPrefix: (typeof process.env.TOKEN_PAYLOAD_TYP_PREFIX === 'string') ? process.env.TOKEN_PAYLOAD_TYP_PREFIX : 'chevre'
+// }
+// };
 /**
  * 外部サービスを使用するための認証情報
  */
-exports.credentials = {
-    aws: {
-        accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-        tokenIssuerEndpoint: process.env.TOKEN_ISSUER_ENDPOINT
-    },
-    chevre: {
-        authorizeServerDomain: process.env.CHEVRE_AUTHORIZE_SERVER_DOMAIN,
-        clientId: process.env.CHEVRE_CLIENT_ID,
-        clientSecret: process.env.CHEVRE_CLIENT_SECRET,
-        endpoint: process.env.CHEVRE_ENDPOINT
-    },
-    coa: {
-        endpoint: process.env.COA_ENDPOINT,
-        refreshToken: process.env.COA_REFRESH_TOKEN,
-        // tslint:disable-next-line:no-magic-numbers
-        timeout: (typeof process.env.COA_TIMEOUT === 'string') ? Number(process.env.COA_TIMEOUT) : 20000,
-        useFetch: process.env.COA_USE_FETCH === '1'
-    },
-    customSearch: {
+var credentials;
+(function (credentials) {
+    // export const aws = {
+    //     accessKeyId: <string>process.env.AWS_ACCESS_KEY_ID,
+    //     secretAccessKey: <string>process.env.AWS_SECRET_ACCESS_KEY,
+    //     tokenIssuerEndpoint: <string>process.env.TOKEN_ISSUER_ENDPOINT
+    // };
+    // export const chevre = {
+    //     authorizeServerDomain: <string>process.env.CHEVRE_AUTHORIZE_SERVER_DOMAIN,
+    //     clientId: <string>process.env.CHEVRE_CLIENT_ID,
+    //     clientSecret: <string>process.env.CHEVRE_CLIENT_SECRET,
+    //     endpoint: <string>process.env.CHEVRE_ENDPOINT
+    // };
+    // export const coa = {
+    //     endpoint: <string>process.env.COA_ENDPOINT,
+    //     refreshToken: <string>process.env.COA_REFRESH_TOKEN,
+    //     // tslint:disable-next-line:no-magic-numbers
+    //     timeout: (typeof process.env.COA_TIMEOUT === 'string') ? Number(process.env.COA_TIMEOUT) : 20000,
+    //     useFetch: process.env.COA_USE_FETCH === '1'
+    // };
+    credentials.customSearch = {
         engineId: process.env.CUSTOM_SEARCH_ENGINE_ID,
         apiKey: process.env.GOOGLE_API_KEY
-    },
-    gmo: {
+    };
+    credentials.gmo = {
         // tslint:disable-next-line:no-magic-numbers
         timeout: (typeof process.env.GMO_TIMEOUT === 'string') ? Number(process.env.GMO_TIMEOUT) : 5000,
         timeoutBackground: (typeof process.env.GMO_TIMEOUT_BACKGROUND === 'string')
             ? Number(process.env.GMO_TIMEOUT_BACKGROUND)
             : undefined,
         useFetch: process.env.GMO_USE_FETCH === '1'
-    },
-    lineNotify: {
+    };
+    credentials.lineNotify = {
         url: process.env.LINE_NOTIFY_URL,
         accessToken: process.env.LINE_NOTIFY_ACCESS_TOKEN,
         accessTokenAlert: process.env.LINE_NOTIFY_ACCESS_TOKEN_ALERT,
         accessTokenInfo: process.env.LINE_NOTIFY_ACCESS_TOKEN_INFO
-    },
-    movieticketReserve: {
+    };
+    credentials.movieticketReserve = {
         /**
          * 着券時タイムアウト
          */
@@ -52,23 +80,34 @@ exports.credentials = {
          */
         // tslint:disable-next-line:no-magic-numbers
         timeoutCheck: (typeof process.env.MVTK_TIMEOUT_CHECK === 'string') ? Number(process.env.MVTK_TIMEOUT_CHECK) : 5000
-    },
-    sendGrid: {
+    };
+    credentials.sendGrid = {
         apiKey: process.env.SENDGRID_API_KEY
-    },
-    jwt: {
-        secret: process.env.TOKEN_SECRET,
-        // RESOURCE_SERVER_IDENTIFIERとは分離して指定可能に拡張(2024-05-02~)
-        // issuer: (typeof process.env.TOKEN_ISSUER_BY_AUTHORIZATION === 'string')
-        //     ? process.env.TOKEN_ISSUER_BY_AUTHORIZATION
-        //     : <string>process.env.RESOURCE_SERVER_IDENTIFIER,
-        /**
-         * トークン検証時の発行者リスト
-         */
-        issuers: (typeof process.env.TOKEN_ISSUERS_BY_AUTHORIZATION === 'string')
-            ? process.env.TOKEN_ISSUERS_BY_AUTHORIZATION.split(' ')
-            : [],
-        version: (typeof process.env.TOKEN_VERSION === 'string') ? process.env.TOKEN_VERSION : '2024-05-02',
-        payloadTypPrefix: (typeof process.env.TOKEN_PAYLOAD_TYP_PREFIX === 'string') ? process.env.TOKEN_PAYLOAD_TYP_PREFIX : 'chevre'
-    }
-};
+    };
+    let COA;
+    (function (COA) {
+        let cred;
+        function createInstance(...params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (cred === undefined) {
+                    cred = (yield Promise.resolve().then(() => require('./credentials/coa'))).COACredentials;
+                }
+                return new cred(...params);
+            });
+        }
+        COA.createInstance = createInstance;
+    })(COA = credentials.COA || (credentials.COA = {}));
+    let JWT;
+    (function (JWT) {
+        let cred;
+        function createInstance(...params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (cred === undefined) {
+                    cred = (yield Promise.resolve().then(() => require('./credentials/jwt'))).JWTCredentials;
+                }
+                return new cred(...params);
+            });
+        }
+        JWT.createInstance = createInstance;
+    })(JWT = credentials.JWT || (credentials.JWT = {}));
+})(credentials = exports.credentials || (exports.credentials = {}));

package/lib/chevre/index.d.ts

@@ -1,6 +1,7 @@
 /**
  * index module
  */
+import type * as COAService from '@motionpicture/coa-service';
 import type * as GMOService from '@motionpicture/gmo-service';
 import type * as Pecorinoapi from './pecorinoapi';
 import { credentials } from './credentials';
@@ -12,4 +13,5 @@ import * as service from './service';
 import * as settings from './settings';
 export { credentials, errorHandler, eventEmitter, factory, repository, service, settings };
 export declare function loadPecorinoapi(): Promise<typeof Pecorinoapi>;
+export declare function loadCOA(): Promise<typeof COAService>;
 export declare function loadGMO(): Promise<typeof GMOService>;

package/lib/chevre/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadGMO = exports.loadPecorinoapi = exports.settings = exports.service = exports.repository = exports.factory = exports.eventEmitter = exports.errorHandler = exports.credentials = void 0;
+exports.loadGMO = exports.loadCOA = exports.loadPecorinoapi = exports.settings = exports.service = exports.repository = exports.factory = exports.eventEmitter = exports.errorHandler = exports.credentials = void 0;
 const credentials_1 = require("./credentials");
 Object.defineProperty(exports, "credentials", { enumerable: true, get: function () { return credentials_1.credentials; } });
 const errorHandler = require("./errorHandler");
@@ -34,6 +34,16 @@ function loadPecorinoapi() {
     });
 }
 exports.loadPecorinoapi = loadPecorinoapi;
+let COA;
+function loadCOA() {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (COA === undefined) {
+            COA = yield Promise.resolve().then(() => require('@motionpicture/coa-service'));
+        }
+        return COA;
+    });
+}
+exports.loadCOA = loadCOA;
 let GMO;
 function loadGMO() {
     return __awaiter(this, void 0, void 0, function* () {

package/lib/chevre/repo/authorization.d.ts

@@ -1,6 +1,5 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-export type ICode = string;
 type IFindValidOneResult = Pick<factory.authorization.IAuthorization, 'object' | 'typeOf' | 'audience' | 'issuedBy'> & {
     id: string;
 };
@@ -26,7 +25,7 @@ export declare class AuthorizationRepo {
         project: {
             id: string;
         };
-        code: ICode;
+        code: string;
     }): Promise<IFindValidOneResult>;
     /**
      * 有効な承認を参照する

package/lib/chevre/repo/person.d.ts

@@ -1,4 +1,4 @@
-import { CognitoIdentityProvider } from '@aws-sdk/client-cognito-identity-provider';
+import type { CognitoIdentityProvider } from '@aws-sdk/client-cognito-identity-provider';
 import type { AttributeType } from '@aws-sdk/client-cognito-identity-provider/dist-types/models/models_0';
 import * as factory from '../factory';
 export type IPerson = factory.person.IPerson;
@@ -8,7 +8,8 @@ export type IPerson = factory.person.IPerson;
 export declare class PersonRepo {
     readonly cognitoIdentityServiceProvider: CognitoIdentityProvider;
     private readonly userPoolId;
-    constructor(params: {
+    constructor(options: {
+        cognitoIdentityServiceProvider: CognitoIdentityProvider;
         userPoolId: string;
     });
     static ATTRIBUTE2PROFILE(params: {

package/lib/chevre/repo/person.js

@@ -10,22 +10,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PersonRepo = void 0;
-const client_cognito_identity_provider_1 = require("@aws-sdk/client-cognito-identity-provider");
-const credential_providers_1 = require("@aws-sdk/credential-providers");
+// import { fromEnv } from '@aws-sdk/credential-providers';
 const google_libphonenumber_1 = require("google-libphonenumber");
 const factory = require("../factory");
-const awsCredentials = (0, credential_providers_1.fromEnv)();
+// const awsCredentials = fromEnv();
 /**
  * 会員リポジトリ
  */
 class PersonRepo {
-    constructor(params) {
-        this.userPoolId = params.userPoolId;
-        this.cognitoIdentityServiceProvider = new client_cognito_identity_provider_1.CognitoIdentityProvider({
-            apiVersion: 'latest',
-            region: 'ap-northeast-1',
-            credentials: awsCredentials
-        });
+    constructor(options) {
+        const { cognitoIdentityServiceProvider, userPoolId } = options;
+        this.userPoolId = userPoolId;
+        this.cognitoIdentityServiceProvider = cognitoIdentityServiceProvider;
+        // this.cognitoIdentityServiceProvider = new CognitoIdentityProvider({
+        //     apiVersion: 'latest',
+        //     region: 'ap-northeast-1',
+        //     credentials: awsCredentials
+        // });
     }
     static ATTRIBUTE2PROFILE(params) {
         let additionalProperty = [];

package/lib/chevre/service/aggregation/event/importFromCOA.d.ts

@@ -1,3 +1,7 @@
+/**
+ * COAイベント集計サービス
+ */
+import type * as COA from '@motionpicture/coa-service';
 import type { EventRepo } from '../../../repo/event';
 import * as factory from '../../../factory';
 /**
@@ -13,4 +17,5 @@ export declare function importFromCOA(params: {
     importThrough: Date;
 }): (repos: {
     event: EventRepo;
+    reserveService: COA.service.Reserve;
 }) => Promise<void>;