@cinerino/sdk 6.1.0-alpha.0 → 6.1.0-alpha.2

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

@@ -1,5 +1,5 @@
 import * as factory from '../factory';
-import { IProjectionSearchConditions, ISearchResult, IUnset, Service } from '../service';
+import { IProjectionSearchConditions, IUnset, Service } from '../service';
 /**
  * 顧客サービス
  */
@@ -17,7 +17,7 @@ export declare class CustomerService extends Service {
     /**
      * 顧客検索
      */
-    search(params: Omit<factory.customer.ISearchConditions, 'project'> & IProjectionSearchConditions): Promise<ISearchResult<factory.customer.ICustomer[]>>;
+    search(params: Omit<factory.customer.ISearchConditions, 'project'> & IProjectionSearchConditions): Promise<factory.customer.ICustomer[]>;
     /**
      * 顧客編集
      */

package/lib/abstract/chevreAdmin/customer.js

@@ -126,18 +126,9 @@ var CustomerService = /** @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/chevreAuth/token.d.ts

@@ -13,6 +13,7 @@ export declare class TokenService extends Service<IOptions> {
      * トークンを取得する
      */
     getToken(params: {
+        grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer';
         assertion: string;
         code: string;
     }): Promise<ICredentials>;

package/lib/abstract/chevreAuth/token.js

@@ -70,16 +70,19 @@ var TokenService = /** @class */ (function (_super) {
      */
     TokenService.prototype.getToken = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var assertion, code;
+            var assertion, code, grant_type;
             var _this = this;
             return __generator(this, function (_a) {
-                assertion = params.assertion, code = params.code;
+                assertion = params.assertion, code = params.code, grant_type = params.grant_type;
                 return [2 /*return*/, this.fetch({
                         uri: '/token',
                         method: 'POST',
-                        body: { assertion: assertion },
+                        form: new URLSearchParams({ assertion: assertion, grant_type: grant_type }),
                         qs: { code: code },
-                        expectedStatusCodes: [http_status_1.OK]
+                        expectedStatusCodes: [http_status_1.OK],
+                        headers: {
+                            'Content-Type': 'application/x-www-form-urlencoded'
+                        }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                         return [2 /*return*/, response.json()];

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

@@ -84,7 +84,7 @@ var CustomerService = /** @class */ (function (_super) {
      */
     CustomerService.prototype.search = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, auth, endpoint, project, seller, chevreAdmin, customerService, data;
+            var _a, auth, endpoint, project, seller, chevreAdmin, customerService;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -98,10 +98,7 @@ var CustomerService = /** @class */ (function (_super) {
                             })];
                     case 2:
                         customerService = _b.sent();
-                        return [4 /*yield*/, customerService.search(params)];
-                    case 3:
-                        data = (_b.sent()).data;
-                        return [2 /*return*/, data];
+                        return [2 /*return*/, customerService.search(params)];
                 }
             });
         });

package/lib/abstract/service.d.ts

@@ -44,7 +44,7 @@ export interface IAdditionalOptions {
 }
 export interface IFetchOptions {
     uri: string;
-    form?: any;
+    form?: URLSearchParams;
     qs?: any;
     method: string;
     headers?: {

package/lib/abstract/service.js

@@ -102,11 +102,8 @@ var Service = /** @class */ (function () {
                     Accept: 'application/json',
                     'Content-Type': 'application/json'
                 }, defaultOptions.headers);
-                fetchOptions = {
-                    method: defaultOptions.method,
-                    headers: headers,
-                    body: JSON.stringify(defaultOptions.body)
-                };
+                fetchOptions = __assign({ method: defaultOptions.method, headers: headers, body: JSON.stringify(defaultOptions.body) }, (defaultOptions.form instanceof URLSearchParams) ? { body: defaultOptions.form } : undefined // form対応(2024-05-14~)
+                );
                 retryableStatusCodes = (this.options.disableAutoRetry === true)
                     ? []
                     : __spreadArray(__spreadArray([], (Array.isArray(this.options.retryableStatusCodes)) ? this.options.retryableStatusCodes : []), (Array.isArray(defaultOptions.retryableStatusCodes)) ? defaultOptions.retryableStatusCodes : []);

package/lib/bundle.js

@@ -6928,18 +6928,9 @@ var CustomerService = /** @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()];
+                    }); }); })];
             });
         });
     };
@@ -13550,16 +13541,19 @@ var TokenService = /** @class */ (function (_super) {
      */
     TokenService.prototype.getToken = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var assertion, code;
+            var assertion, code, grant_type;
             var _this = this;
             return __generator(this, function (_a) {
-                assertion = params.assertion, code = params.code;
+                assertion = params.assertion, code = params.code, grant_type = params.grant_type;
                 return [2 /*return*/, this.fetch({
                         uri: '/token',
                         method: 'POST',
-                        body: { assertion: assertion },
+                        form: new URLSearchParams({ assertion: assertion, grant_type: grant_type }),
                         qs: { code: code },
-                        expectedStatusCodes: [http_status_1.OK]
+                        expectedStatusCodes: [http_status_1.OK],
+                        headers: {
+                            'Content-Type': 'application/x-www-form-urlencoded'
+                        }
                     })
                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                         return [2 /*return*/, response.json()];
@@ -19512,7 +19506,7 @@ var CustomerService = /** @class */ (function (_super) {
      */
     CustomerService.prototype.search = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, auth, endpoint, project, seller, chevreAdmin, customerService, data;
+            var _a, auth, endpoint, project, seller, chevreAdmin, customerService;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -19526,10 +19520,7 @@ var CustomerService = /** @class */ (function (_super) {
                             })];
                     case 2:
                         customerService = _b.sent();
-                        return [4 /*yield*/, customerService.search(params)];
-                    case 3:
-                        data = (_b.sent()).data;
-                        return [2 /*return*/, data];
+                        return [2 /*return*/, customerService.search(params)];
                 }
             });
         });
@@ -21839,11 +21830,8 @@ var Service = /** @class */ (function () {
                     Accept: 'application/json',
                     'Content-Type': 'application/json'
                 }, defaultOptions.headers);
-                fetchOptions = {
-                    method: defaultOptions.method,
-                    headers: headers,
-                    body: JSON.stringify(defaultOptions.body)
-                };
+                fetchOptions = __assign({ method: defaultOptions.method, headers: headers, body: JSON.stringify(defaultOptions.body) }, (defaultOptions.form instanceof URLSearchParams) ? { body: defaultOptions.form } : undefined // form対応(2024-05-14~)
+                );
                 retryableStatusCodes = (this.options.disableAutoRetry === true)
                     ? []
                     : __spreadArray(__spreadArray([], (Array.isArray(this.options.retryableStatusCodes)) ? this.options.retryableStatusCodes : []), (Array.isArray(defaultOptions.retryableStatusCodes)) ? defaultOptions.retryableStatusCodes : []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cinerino/sdk",
-  "version": "6.1.0-alpha.0",
+  "version": "6.1.0-alpha.2",
   "description": "Cinerino SDK",
   "main": "./lib/index.js",
   "browser": {
@@ -92,7 +92,7 @@
     "watchify": "^3.11.1"
   },
   "dependencies": {
-    "@chevre/factory": "4.369.0-alpha.11",
+    "@chevre/factory": "4.369.1",
     "debug": "^3.2.6",
     "http-status": "^1.4.2",
     "idtoken-verifier": "^2.0.3",