@cinerino/sdk 11.0.0-alpha.7 → 11.0.0-alpha.9

package/example/src/chevre/{searchProjects.ts → admin/findMyProjects.ts}

@@ -1,6 +1,6 @@
 // tslint:disable:no-implicit-dependencies no-console no-magic-numbers
-import * as client from '../../../lib/';
-import * as auth from '../auth/authAsAdmin';
+import * as client from '../../../../lib/';
+import * as auth from '../../auth/authAsAdmin';
 
 async function main() {
     const authClient = await auth.login();
@@ -13,7 +13,7 @@ async function main() {
         auth: authClient
     })).createMeInstance();
 
-    const { data } = await meService.searchProjects({
+    const data = await meService.findMyProjects({
         limit: 10,
         page: 1
     });
@@ -25,33 +25,33 @@ async function main() {
         async () => {
             i += 1;
             try {
-                const searchProjectsResult = await meService.searchProjects({
+                const searchProjectsResult = await meService.findMyProjects({
                     limit: 10,
                     page: 1
                 });
-                console.log(searchProjectsResult.data.length, 'projects returned', i);
+                console.log(searchProjectsResult.length, 'projects returned', i);
             } catch (error) {
                 console.error(error, i);
             }
         },
         // tslint:disable-next-line:no-magic-numbers
-        1
+        1000
     );
     setInterval(
         async () => {
             i += 1;
             try {
-                const searchProjectsResult = await meService.searchProjects({
+                const searchProjectsResult = await meService.findMyProjects({
                     limit: 10,
                     page: 1
                 });
-                console.log(searchProjectsResult.data.length, 'projects returned', i);
+                console.log(searchProjectsResult.length, 'projects returned', i);
             } catch (error) {
                 console.error(error, i);
             }
         },
         // tslint:disable-next-line:no-magic-numbers
-        1
+        1000
     );
 }
 

package/example/src/st/admin/getToken.ts

@@ -23,7 +23,7 @@ export async function getToken() {
             state: '',
             grant_type: 'client_credentials',
             // aws_client_metadata
-            aws_client_metadata: JSON.stringify({ projectId: 'cinerino', applicationType: 'SoftwareApplication' })
+            // aws_client_metadata: JSON.stringify({ projectId: 'cinerino', applicationType: 'SoftwareApplication' })
         };
         const secret = Buffer.from(`${config.clientId}:${config.clientSecret}`, 'utf8')
             .toString('base64');

package/lib/abstract/chevreAdmin/me.d.ts

@@ -1,5 +1,5 @@
 import * as factory from '../factory';
-import { IOptions, IProjectionSearchConditions, ISearchResult, Service } from '../service';
+import { IOptions, Service } from '../service';
 export interface ISearchProjectConditions {
     limit?: number;
     page?: number;
@@ -8,13 +8,14 @@ export interface ISearchProjectConditions {
         $regex?: string;
     };
 }
+export declare type IMyProject = Pick<factory.project.IProject, 'id' | 'logo' | 'name'>;
 /**
- * 管理者サービス
+ * 管理者(自分自身)サービス
  */
 export declare class MeService extends Service<IOptions> {
     constructor(options: Pick<IOptions, 'auth' | 'endpoint' | 'transporter'>);
     /**
      * マイプロジェクト検索
      */
-    searchProjects(params: ISearchProjectConditions & IProjectionSearchConditions): Promise<ISearchResult<Omit<factory.project.IProject, 'settings'>[]>>;
+    findMyProjects(params: ISearchProjectConditions): Promise<IMyProject[]>;
 }

package/lib/abstract/chevreAdmin/me.js

@@ -66,7 +66,7 @@ exports.MeService = void 0;
 var http_status_1 = require("http-status");
 var service_1 = require("../service");
 /**
- * 管理者サービス
+ * 管理者(自分自身)サービス
  */
 var MeService = /** @class */ (function (_super) {
     __extends(MeService, _super);
@@ -76,7 +76,7 @@ var MeService = /** @class */ (function (_super) {
     /**
      * マイプロジェクト検索
      */
-    MeService.prototype.searchProjects = function (params) {
+    MeService.prototype.findMyProjects = function (params) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
@@ -86,18 +86,9 @@ var MeService = /** @class */ (function (_super) {
                         qs: params,
                         expectedStatusCodes: [http_status_1.OK]
                     })
-                        .then(function (response) { return __awaiter(_this, void 0, void 0, function () {
-                        var _a;
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0:
-                                    _a = {};
-                                    return [4 /*yield*/, response.json()];
-                                case 1: return [2 /*return*/, (_a.data = _b.sent(),
-                                        _a)];
-                            }
-                        });
-                    }); })];
+                        .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, response.json()];
+                    }); }); })];
             });
         });
     };

package/lib/abstract/chevreConsole/me.d.ts

@@ -1,5 +1,5 @@
 import * as factory from '../factory';
-import { IOptions, IProjectionSearchConditions, ISearchResult, Service } from '../service';
+import { IOptions, ISearchResult, Service } from '../service';
 export interface ISearchProjectConditions {
     limit?: number;
     page?: number;
@@ -8,15 +8,21 @@ export interface ISearchProjectConditions {
         $regex?: string;
     };
 }
+export declare type IMyProject = Pick<factory.project.IProject, 'alternateName' | 'id' | 'logo' | 'hasMerchantReturnPolicy' | 'name' | 'subscription' | 'typeOf'>;
+export interface IProjectionSearchConditions {
+    $projection?: {
+        [key in keyof IMyProject]?: 1;
+    };
+}
 /**
- * 管理者サービス
+ * 管理者(自分自身)サービス
  */
 export declare class MeService extends Service<IOptions> {
     constructor(options: Pick<IOptions, 'auth' | 'endpoint' | 'transporter'>);
     /**
      * マイプロジェクト検索
      */
-    searchProjects(params: ISearchProjectConditions & IProjectionSearchConditions): Promise<ISearchResult<Omit<factory.project.IProject, 'settings'>[]>>;
+    findMyProjects(params: ISearchProjectConditions & IProjectionSearchConditions): Promise<ISearchResult<IMyProject[]>>;
     /**
      * リクエストユーザーのPMとしてのロールを検索する
      */

package/lib/abstract/chevreConsole/me.js

@@ -66,7 +66,7 @@ exports.MeService = void 0;
 var http_status_1 = require("http-status");
 var service_1 = require("../service");
 /**
- * 管理者サービス
+ * 管理者(自分自身)サービス
  */
 var MeService = /** @class */ (function (_super) {
     __extends(MeService, _super);
@@ -76,7 +76,7 @@ var MeService = /** @class */ (function (_super) {
     /**
      * マイプロジェクト検索
      */
-    MeService.prototype.searchProjects = function (params) {
+    MeService.prototype.findMyProjects = function (params) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {

package/lib/abstract/chevreConsole/permission.d.ts

@@ -1,11 +1,19 @@
 import { Service } from '../service';
 /**
- * MyPermissionサービス
+ * 権限サービス
+ * リクエストユーザーと権限の関係性について知るためのサービス
  */
 export declare class PermissionService extends Service {
     /**
      * 権限検索
      * @exprimental
      */
-    search(): Promise<any>;
+    findMyPermissions(): Promise<any>;
+    /**
+     * トークンを権限へ変換する
+     * @exprimental
+     */
+    token2permissions(params: {
+        token: string;
+    }): Promise<any>;
 }

package/lib/abstract/chevreConsole/permission.js

@@ -55,7 +55,8 @@ exports.PermissionService = void 0;
 var http_status_1 = require("http-status");
 var service_1 = require("../service");
 /**
- * MyPermissionサービス
+ * 権限サービス
+ * リクエストユーザーと権限の関係性について知るためのサービス
  */
 var PermissionService = /** @class */ (function (_super) {
     __extends(PermissionService, _super);
@@ -66,7 +67,7 @@ var PermissionService = /** @class */ (function (_super) {
      * 権限検索
      * @exprimental
      */
-    PermissionService.prototype.search = function () {
+    PermissionService.prototype.findMyPermissions = function () {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
@@ -81,6 +82,28 @@ var PermissionService = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * トークンを権限へ変換する
+     * @exprimental
+     */
+    PermissionService.prototype.token2permissions = function (params) {
+        return __awaiter(this, void 0, void 0, function () {
+            var token;
+            var _this = this;
+            return __generator(this, function (_a) {
+                token = params.token;
+                return [2 /*return*/, this.fetch({
+                        uri: '/permissions/token2permissions',
+                        method: 'POST',
+                        body: { token: token },
+                        expectedStatusCodes: [http_status_1.OK]
+                    })
+                        .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, response.json()];
+                    }); }); })];
+            });
+        });
+    };
     return PermissionService;
 }(service_1.Service));
 exports.PermissionService = PermissionService;

package/lib/abstract/cloud/admin/me.js

@@ -78,7 +78,7 @@ var MeService = /** @class */ (function (_super) {
      */
     MeService.prototype.searchProjects = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, auth, endpoint, chevreAdmin, meService, data;
+            var _a, auth, endpoint, chevreAdmin, meService;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -89,10 +89,7 @@ var MeService = /** @class */ (function (_super) {
                         return [4 /*yield*/, chevreAdmin.createMeInstance()];
                     case 2:
                         meService = _b.sent();
-                        return [4 /*yield*/, meService.searchProjects(__assign(__assign({}, params), { $projection: { _id: 1, logo: 1, name: 1 } }))];
-                    case 3:
-                        data = (_b.sent()).data;
-                        return [2 /*return*/, data];
+                        return [2 /*return*/, meService.findMyProjects(params)];
                 }
             });
         });

package/lib/abstract/index.d.ts

@@ -1,7 +1,6 @@
 import type * as Chevre from './chevre';
 import type * as ChevreAdmin from './chevreAdmin';
 import type * as ChevreAsset from './chevreAsset';
-import type * as ChevreAuth from './chevreAuth';
 import type * as ChevreConsole from './chevreConsole';
 import type * as ChevrePay from './chevrePay';
 import type * as ChevreTxc from './chevreTxc';
@@ -20,7 +19,6 @@ export declare function loadChevre(...params: ConstructorParameters<typeof Chevr
 export declare function loadChevreAsset(...params: ConstructorParameters<typeof ChevreAsset.ChevreAsset>): Promise<ChevreAsset.ChevreAsset>;
 export declare function loadChevreAdmin(...params: ConstructorParameters<typeof ChevreAdmin.ChevreAdmin>): Promise<ChevreAdmin.ChevreAdmin>;
 export declare function loadChevreConsole(...params: ConstructorParameters<typeof ChevreConsole.ChevreConsole>): Promise<ChevreConsole.ChevreConsole>;
-export declare function loadChevreAuth(...params: ConstructorParameters<typeof ChevreAuth.ChevreAuth>): Promise<ChevreAuth.ChevreAuth>;
 export declare function loadChevrePay(...params: ConstructorParameters<typeof ChevrePay.ChevrePay>): Promise<ChevrePay.ChevrePay>;
 export declare function loadChevreTxn(...params: ConstructorParameters<typeof ChevreTxn.ChevreTxn>): Promise<ChevreTxn.ChevreTxn>;
 export declare function loadChevreTxc(...params: ConstructorParameters<typeof ChevreTxc.ChevreTxc>): Promise<ChevreTxc.ChevreTxc>;
@@ -47,5 +45,5 @@ export declare function loadCloudTxc(...params: ConstructorParameters<typeof Clo
  */
 export declare function loadCloudTxn(...params: ConstructorParameters<typeof CloudTxn.CloudTxn>): Promise<CloudTxn.CloudTxn>;
 export declare function loadWaiterAdmin(...params: ConstructorParameters<typeof ChevreAdmin.ChevreAdmin>): Promise<WaiterAdmin.WaiterAdmin>;
-export { factory, Chevre as chevre, ChevreAdmin as chevreAdmin, ChevreAsset as chevreAsset, ChevreAuth as chevreAuth, ChevreConsole as chevreConsole, ChevrePay as chevrePay, ChevreTxc as chevreTxc, ChevreTxn as chevreTxn, CloudAdmin as cloudAdmin, CloudAsset as cloudAsset, CloudPay as cloudPay, CloudTxc as cloudTxc, CloudTxn as cloudTxn, Pecorino as pecorino, Service as service, WaiterAdmin as waiterAdmin };
+export { factory, Chevre as chevre, ChevreAdmin as chevreAdmin, ChevreAsset as chevreAsset, ChevreConsole as chevreConsole, ChevrePay as chevrePay, ChevreTxc as chevreTxc, ChevreTxn as chevreTxn, CloudAdmin as cloudAdmin, CloudAsset as cloudAsset, CloudPay as cloudPay, CloudTxc as cloudTxc, CloudTxn as cloudTxn, Pecorino as pecorino, Service as service, WaiterAdmin as waiterAdmin };
 export { transporters };

package/lib/abstract/index.js

@@ -41,7 +41,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
     return to;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transporters = exports.factory = exports.loadWaiterAdmin = exports.loadCloudTxn = exports.loadCloudTxc = exports.loadCloudPay = exports.loadCloudAsset = exports.loadCloudAdmin = exports.loadService = exports.loadPecorino = exports.loadChevreTxc = exports.loadChevreTxn = exports.loadChevrePay = exports.loadChevreAuth = exports.loadChevreConsole = exports.loadChevreAdmin = exports.loadChevreAsset = exports.loadChevre = void 0;
+exports.transporters = exports.factory = exports.loadWaiterAdmin = exports.loadCloudTxn = exports.loadCloudTxc = exports.loadCloudPay = exports.loadCloudAsset = exports.loadCloudAdmin = exports.loadService = exports.loadPecorino = exports.loadChevreTxc = exports.loadChevreTxn = exports.loadChevrePay = exports.loadChevreConsole = exports.loadChevreAdmin = exports.loadChevreAsset = exports.loadChevre = void 0;
 var factory = require("./factory");
 exports.factory = factory;
 var transporters = require("./transporters");
@@ -138,29 +138,6 @@ function loadChevreConsole() {
     });
 }
 exports.loadChevreConsole = loadChevreConsole;
-var chevreAuth;
-// tslint:disable-next-line:no-single-line-block-comment
-/* istanbul ignore next */
-function loadChevreAuth() {
-    var params = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        params[_i] = arguments[_i];
-    }
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!(chevreAuth === undefined)) return [3 /*break*/, 2];
-                    return [4 /*yield*/, Promise.resolve().then(function () { return require('./chevreAuth'); })];
-                case 1:
-                    chevreAuth = (_a.sent()).ChevreAuth;
-                    _a.label = 2;
-                case 2: return [2 /*return*/, new (chevreAuth.bind.apply(chevreAuth, __spreadArray([void 0], params)))()];
-            }
-        });
-    });
-}
-exports.loadChevreAuth = loadChevreAuth;
 var chevrePay;
 // tslint:disable-next-line:no-single-line-block-comment
 /* istanbul ignore next */