diff --git a/generator/src/main/resources/line-bot-sdk-nodejs-generator/api-single.pebble b/generator/src/main/resources/line-bot-sdk-nodejs-generator/api-single.pebble index 0783156cc..08daeb585 100644 --- a/generator/src/main/resources/line-bot-sdk-nodejs-generator/api-single.pebble +++ b/generator/src/main/resources/line-bot-sdk-nodejs-generator/api-single.pebble @@ -73,7 +73,7 @@ export class {{operations.classname}} { {% endif -%} */ public async {{op.nickname}}({% for param in op.allParams %}{{param.paramName}}{% if not param.required %}?{% endif %}: {{param.dataType}}, {% endfor %}) : Promise<{% if op.returnType %}{{ op.returnType }}{% else %}Types.MessageAPIResponseBase{% endif %}> { - return (await this.{{op.nickname}}WithHttpInfo({% for param in op.allParams %}{{param.paramName}}, {% endfor %}))[1]; + return (await this.{{op.nickname}}WithHttpInfo({% for param in op.allParams %}{{param.paramName}}, {% endfor %})).body; } /** @@ -93,7 +93,7 @@ export class {{operations.classname}} { * @see {{op.summary}} Documentation {% endif -%} */ - public async {{op.nickname}}WithHttpInfo({% for param in op.allParams %}{{param.paramName}}{% if not param.required %}?{% endif %}: {{param.dataType}}, {% endfor %}) : Promise<[Response, {% if op.returnType %}{{ op.returnType }}{% else %}Types.MessageAPIResponseBase{% endif %}]> { + public async {{op.nickname}}WithHttpInfo({% for param in op.allParams %}{{param.paramName}}{% if not param.required %}?{% endif %}: {{param.dataType}}, {% endfor %}) : Promise> { {% if op.isMultipart %} {% include "./apiBody/multipart.pebble" %} {% else %} diff --git a/generator/src/main/resources/line-bot-sdk-nodejs-generator/apiBody/multipart.pebble b/generator/src/main/resources/line-bot-sdk-nodejs-generator/apiBody/multipart.pebble index cfa33cb77..df550222f 100644 --- a/generator/src/main/resources/line-bot-sdk-nodejs-generator/apiBody/multipart.pebble +++ b/generator/src/main/resources/line-bot-sdk-nodejs-generator/apiBody/multipart.pebble @@ -14,4 +14,4 @@ {% endfor %}, form, ); - return [res, await res.json()]; + return {httpResponse: res, body: await res.json()}; diff --git a/generator/src/main/resources/line-bot-sdk-nodejs-generator/apiBody/normal.pebble b/generator/src/main/resources/line-bot-sdk-nodejs-generator/apiBody/normal.pebble index d307ef093..19e4f9b2d 100644 --- a/generator/src/main/resources/line-bot-sdk-nodejs-generator/apiBody/normal.pebble +++ b/generator/src/main/resources/line-bot-sdk-nodejs-generator/apiBody/normal.pebble @@ -6,7 +6,7 @@ .replace('{' + "{{param.baseName}}" + '}', String({{param.paramName}})) {% endfor %} ); - return [response, convertResponseToReadable(response)]; + return {httpResponse: response, body: convertResponseToReadable(response)}; {% else %} {% if op.hasBodyParam %}const params = {{op.bodyParam.paramName}}; {% elseif op.hasFormParams %}const formParams = { @@ -43,5 +43,5 @@ {% elseif op.hasQueryParams %}queryParams,{% endif %} {% if op.hasHeaderParams %}{headers: headerParams},{% endif %} ); - return [res, await res.json()]; + return {httpResponse: res, body: await res.json()}; {% endif %} diff --git a/lib/channel-access-token/api/channelAccessTokenClient.ts b/lib/channel-access-token/api/channelAccessTokenClient.ts index 93acb525c..90f0371e6 100644 --- a/lib/channel-access-token/api/channelAccessTokenClient.ts +++ b/lib/channel-access-token/api/channelAccessTokenClient.ts @@ -75,7 +75,7 @@ export class ChannelAccessTokenClient { clientAssertionType, clientAssertion, ) - )[1]; + ).body; } /** @@ -89,7 +89,7 @@ export class ChannelAccessTokenClient { public async getsAllValidChannelAccessTokenKeyIdsWithHttpInfo( clientAssertionType: string, clientAssertion: string, - ): Promise<[Response, ChannelAccessTokenKeyIdsResponse]> { + ): Promise> { const queryParams = { clientAssertionType: clientAssertionType, clientAssertion: clientAssertion, @@ -99,7 +99,7 @@ export class ChannelAccessTokenClient { "/oauth2/v2.1/tokens/kid", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Issue short-lived channel access token @@ -120,7 +120,7 @@ export class ChannelAccessTokenClient { clientId, clientSecret, ) - )[1]; + ).body; } /** @@ -136,7 +136,7 @@ export class ChannelAccessTokenClient { grantType?: string, clientId?: string, clientSecret?: string, - ): Promise<[Response, IssueShortLivedChannelAccessTokenResponse]> { + ): Promise> { const formParams = { grant_type: grantType, client_id: clientId, @@ -152,7 +152,7 @@ export class ChannelAccessTokenClient { "/v2/oauth/accessToken", formParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Issues a channel access token that allows you to specify a desired expiration date. This method lets you use JWT assertion for authentication. @@ -173,7 +173,7 @@ export class ChannelAccessTokenClient { clientAssertionType, clientAssertion, ) - )[1]; + ).body; } /** @@ -189,7 +189,7 @@ export class ChannelAccessTokenClient { grantType?: string, clientAssertionType?: string, clientAssertion?: string, - ): Promise<[Response, IssueChannelAccessTokenResponse]> { + ): Promise> { const formParams = { grant_type: grantType, client_assertion_type: clientAssertionType, @@ -205,7 +205,7 @@ export class ChannelAccessTokenClient { "/oauth2/v2.1/token", formParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Issues a new stateless channel access token, which doesn\'t have max active token limit unlike the other token types. The newly issued token is only valid for 15 minutes but can not be revoked until it naturally expires. @@ -232,7 +232,7 @@ export class ChannelAccessTokenClient { clientId, clientSecret, ) - )[1]; + ).body; } /** @@ -252,7 +252,7 @@ export class ChannelAccessTokenClient { clientAssertion?: string, clientId?: string, clientSecret?: string, - ): Promise<[Response, IssueStatelessChannelAccessTokenResponse]> { + ): Promise> { const formParams = { grant_type: grantType, client_assertion_type: clientAssertionType, @@ -267,7 +267,7 @@ export class ChannelAccessTokenClient { }); const res = await this.httpClient.postForm("/oauth2/v3/token", formParams); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Revoke short-lived or long-lived channel access token @@ -278,7 +278,7 @@ export class ChannelAccessTokenClient { public async revokeChannelToken( accessToken?: string, ): Promise { - return (await this.revokeChannelTokenWithHttpInfo(accessToken))[1]; + return (await this.revokeChannelTokenWithHttpInfo(accessToken)).body; } /** @@ -290,7 +290,7 @@ export class ChannelAccessTokenClient { */ public async revokeChannelTokenWithHttpInfo( accessToken?: string, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const formParams = { access_token: accessToken, }; @@ -301,7 +301,7 @@ export class ChannelAccessTokenClient { }); const res = await this.httpClient.postForm("/v2/oauth/revoke", formParams); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Revoke channel access token v2.1 @@ -322,7 +322,7 @@ export class ChannelAccessTokenClient { clientSecret, accessToken, ) - )[1]; + ).body; } /** @@ -338,7 +338,7 @@ export class ChannelAccessTokenClient { clientId?: string, clientSecret?: string, accessToken?: string, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const formParams = { client_id: clientId, client_secret: clientSecret, @@ -354,7 +354,7 @@ export class ChannelAccessTokenClient { "/oauth2/v2.1/revoke", formParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Verify the validity of short-lived and long-lived channel access tokens @@ -365,7 +365,7 @@ export class ChannelAccessTokenClient { public async verifyChannelToken( accessToken?: string, ): Promise { - return (await this.verifyChannelTokenWithHttpInfo(accessToken))[1]; + return (await this.verifyChannelTokenWithHttpInfo(accessToken)).body; } /** @@ -377,7 +377,7 @@ export class ChannelAccessTokenClient { */ public async verifyChannelTokenWithHttpInfo( accessToken?: string, - ): Promise<[Response, VerifyChannelAccessTokenResponse]> { + ): Promise> { const formParams = { access_token: accessToken, }; @@ -388,7 +388,7 @@ export class ChannelAccessTokenClient { }); const res = await this.httpClient.postForm("/v2/oauth/verify", formParams); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * You can verify whether a Channel access token with a user-specified expiration (Channel Access Token v2.1) is valid. @@ -399,7 +399,7 @@ export class ChannelAccessTokenClient { public async verifyChannelTokenByJWT( accessToken: string, ): Promise { - return (await this.verifyChannelTokenByJWTWithHttpInfo(accessToken))[1]; + return (await this.verifyChannelTokenByJWTWithHttpInfo(accessToken)).body; } /** @@ -411,12 +411,12 @@ export class ChannelAccessTokenClient { */ public async verifyChannelTokenByJWTWithHttpInfo( accessToken: string, - ): Promise<[Response, VerifyChannelAccessTokenResponse]> { + ): Promise> { const queryParams = { accessToken: accessToken, }; const res = await this.httpClient.get("/oauth2/v2.1/verify", queryParams); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } } diff --git a/lib/insight/api/insightClient.ts b/lib/insight/api/insightClient.ts index fd57157fb..e9de618ad 100644 --- a/lib/insight/api/insightClient.ts +++ b/lib/insight/api/insightClient.ts @@ -67,7 +67,7 @@ export class InsightClient { * @see Documentation */ public async getFriendsDemographics(): Promise { - return (await this.getFriendsDemographicsWithHttpInfo())[1]; + return (await this.getFriendsDemographicsWithHttpInfo()).body; } /** @@ -77,10 +77,10 @@ export class InsightClient { * @see Documentation */ public async getFriendsDemographicsWithHttpInfo(): Promise< - [Response, GetFriendsDemographicsResponse] + Types.ApiResponseType > { const res = await this.httpClient.get("/v2/bot/insight/demographic"); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Returns statistics about how users interact with narrowcast messages or broadcast messages sent from your LINE Official Account. @@ -92,7 +92,7 @@ export class InsightClient { public async getMessageEvent( requestId: string, ): Promise { - return (await this.getMessageEventWithHttpInfo(requestId))[1]; + return (await this.getMessageEventWithHttpInfo(requestId)).body; } /** @@ -105,7 +105,7 @@ export class InsightClient { */ public async getMessageEventWithHttpInfo( requestId: string, - ): Promise<[Response, GetMessageEventResponse]> { + ): Promise> { const queryParams = { requestId: requestId, }; @@ -114,7 +114,7 @@ export class InsightClient { "/v2/bot/insight/message/event", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Returns the number of users who have added the LINE Official Account on or before a specified date. @@ -126,7 +126,7 @@ export class InsightClient { public async getNumberOfFollowers( date?: string, ): Promise { - return (await this.getNumberOfFollowersWithHttpInfo(date))[1]; + return (await this.getNumberOfFollowersWithHttpInfo(date)).body; } /** @@ -139,7 +139,7 @@ export class InsightClient { */ public async getNumberOfFollowersWithHttpInfo( date?: string, - ): Promise<[Response, GetNumberOfFollowersResponse]> { + ): Promise> { const queryParams = { date: date, }; @@ -148,7 +148,7 @@ export class InsightClient { "/v2/bot/insight/followers", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Returns the number of messages sent from LINE Official Account on a specified day. @@ -160,7 +160,7 @@ export class InsightClient { public async getNumberOfMessageDeliveries( date: string, ): Promise { - return (await this.getNumberOfMessageDeliveriesWithHttpInfo(date))[1]; + return (await this.getNumberOfMessageDeliveriesWithHttpInfo(date)).body; } /** @@ -173,7 +173,7 @@ export class InsightClient { */ public async getNumberOfMessageDeliveriesWithHttpInfo( date: string, - ): Promise<[Response, GetNumberOfMessageDeliveriesResponse]> { + ): Promise> { const queryParams = { date: date, }; @@ -182,7 +182,7 @@ export class InsightClient { "/v2/bot/insight/message/delivery", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * You can check the per-unit statistics of how users interact with push messages and multicast messages sent from your LINE Official Account. @@ -203,7 +203,7 @@ export class InsightClient { from, to, ) - )[1]; + ).body; } /** @@ -219,7 +219,7 @@ export class InsightClient { customAggregationUnit: string, from: string, to: string, - ): Promise<[Response, GetStatisticsPerUnitResponse]> { + ): Promise> { const queryParams = { customAggregationUnit: customAggregationUnit, from: from, @@ -230,6 +230,6 @@ export class InsightClient { "/v2/bot/insight/message/event/aggregation", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } } diff --git a/lib/liff/api/liffClient.ts b/lib/liff/api/liffClient.ts index 8e809d37d..7cc3a777d 100644 --- a/lib/liff/api/liffClient.ts +++ b/lib/liff/api/liffClient.ts @@ -69,7 +69,7 @@ export class LiffClient { public async addLIFFApp( addLiffAppRequest: AddLiffAppRequest, ): Promise { - return (await this.addLIFFAppWithHttpInfo(addLiffAppRequest))[1]; + return (await this.addLIFFAppWithHttpInfo(addLiffAppRequest)).body; } /** @@ -81,11 +81,11 @@ export class LiffClient { */ public async addLIFFAppWithHttpInfo( addLiffAppRequest: AddLiffAppRequest, - ): Promise<[Response, AddLiffAppResponse]> { + ): Promise> { const params = addLiffAppRequest; const res = await this.httpClient.post("/liff/v1/apps", params); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Deletes a LIFF app from a channel. @@ -97,7 +97,7 @@ export class LiffClient { public async deleteLIFFApp( liffId: string, ): Promise { - return (await this.deleteLIFFAppWithHttpInfo(liffId))[1]; + return (await this.deleteLIFFAppWithHttpInfo(liffId)).body; } /** @@ -110,11 +110,11 @@ export class LiffClient { */ public async deleteLIFFAppWithHttpInfo( liffId: string, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const res = await this.httpClient.delete( "/liff/v1/apps/{liffId}".replace("{liffId}", String(liffId)), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Gets information on all the LIFF apps added to the channel. @@ -123,7 +123,7 @@ export class LiffClient { * @see Get all LIFF apps Documentation */ public async getAllLIFFApps(): Promise { - return (await this.getAllLIFFAppsWithHttpInfo())[1]; + return (await this.getAllLIFFAppsWithHttpInfo()).body; } /** @@ -134,10 +134,10 @@ export class LiffClient { * @see Get all LIFF apps Documentation */ public async getAllLIFFAppsWithHttpInfo(): Promise< - [Response, GetAllLiffAppsResponse] + Types.ApiResponseType > { const res = await this.httpClient.get("/liff/v1/apps"); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Update LIFF app settings @@ -150,9 +150,8 @@ export class LiffClient { liffId: string, updateLiffAppRequest: UpdateLiffAppRequest, ): Promise { - return ( - await this.updateLIFFAppWithHttpInfo(liffId, updateLiffAppRequest) - )[1]; + return (await this.updateLIFFAppWithHttpInfo(liffId, updateLiffAppRequest)) + .body; } /** @@ -166,13 +165,13 @@ export class LiffClient { public async updateLIFFAppWithHttpInfo( liffId: string, updateLiffAppRequest: UpdateLiffAppRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = updateLiffAppRequest; const res = await this.httpClient.put( "/liff/v1/apps/{liffId}".replace("{liffId}", String(liffId)), params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } } diff --git a/lib/manage-audience/api/manageAudienceBlobClient.ts b/lib/manage-audience/api/manageAudienceBlobClient.ts index 88442906a..28597832d 100644 --- a/lib/manage-audience/api/manageAudienceBlobClient.ts +++ b/lib/manage-audience/api/manageAudienceBlobClient.ts @@ -76,7 +76,7 @@ export class ManageAudienceBlobClient { audienceGroupId, uploadDescription, ) - )[1]; + ).body; } /** @@ -92,7 +92,7 @@ export class ManageAudienceBlobClient { file: Blob, audienceGroupId?: number, uploadDescription?: string, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const form = new FormData(); form.append("audienceGroupId", String(audienceGroupId)); form.append("uploadDescription", String(uploadDescription)); @@ -102,7 +102,7 @@ export class ManageAudienceBlobClient { "/v2/bot/audienceGroup/upload/byFile", form, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Create audience for uploading user IDs (by file). @@ -126,7 +126,7 @@ export class ManageAudienceBlobClient { isIfaAudience, uploadDescription, ) - )[1]; + ).body; } /** @@ -144,7 +144,7 @@ export class ManageAudienceBlobClient { description?: string, isIfaAudience?: boolean, uploadDescription?: string, - ): Promise<[Response, CreateAudienceGroupResponse]> { + ): Promise> { const form = new FormData(); form.append("description", String(description)); form.append("isIfaAudience", String(isIfaAudience)); @@ -155,6 +155,6 @@ export class ManageAudienceBlobClient { "/v2/bot/audienceGroup/upload/byFile", form, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } } diff --git a/lib/manage-audience/api/manageAudienceClient.ts b/lib/manage-audience/api/manageAudienceClient.ts index 5ab38fb12..e6f5e49c7 100644 --- a/lib/manage-audience/api/manageAudienceClient.ts +++ b/lib/manage-audience/api/manageAudienceClient.ts @@ -80,7 +80,7 @@ export class ManageAudienceClient { public async activateAudienceGroup( audienceGroupId: number, ): Promise { - return (await this.activateAudienceGroupWithHttpInfo(audienceGroupId))[1]; + return (await this.activateAudienceGroupWithHttpInfo(audienceGroupId)).body; } /** @@ -92,14 +92,14 @@ export class ManageAudienceClient { */ public async activateAudienceGroupWithHttpInfo( audienceGroupId: number, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const res = await this.httpClient.put( "/v2/bot/audienceGroup/{audienceGroupId}/activate".replace( "{audienceGroupId}", String(audienceGroupId), ), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Add user IDs or Identifiers for Advertisers (IFAs) to an audience for uploading user IDs (by JSON) @@ -114,7 +114,7 @@ export class ManageAudienceClient { await this.addAudienceToAudienceGroupWithHttpInfo( addAudienceToAudienceGroupRequest, ) - )[1]; + ).body; } /** @@ -126,14 +126,14 @@ export class ManageAudienceClient { */ public async addAudienceToAudienceGroupWithHttpInfo( addAudienceToAudienceGroupRequest: AddAudienceToAudienceGroupRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = addAudienceToAudienceGroupRequest; const res = await this.httpClient.put( "/v2/bot/audienceGroup/upload", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Create audience for uploading user IDs (by JSON) @@ -146,7 +146,7 @@ export class ManageAudienceClient { ): Promise { return ( await this.createAudienceGroupWithHttpInfo(createAudienceGroupRequest) - )[1]; + ).body; } /** @@ -158,14 +158,14 @@ export class ManageAudienceClient { */ public async createAudienceGroupWithHttpInfo( createAudienceGroupRequest: CreateAudienceGroupRequest, - ): Promise<[Response, CreateAudienceGroupResponse]> { + ): Promise> { const params = createAudienceGroupRequest; const res = await this.httpClient.post( "/v2/bot/audienceGroup/upload", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Create audience for click-based retargeting @@ -180,7 +180,7 @@ export class ManageAudienceClient { await this.createClickBasedAudienceGroupWithHttpInfo( createClickBasedAudienceGroupRequest, ) - )[1]; + ).body; } /** @@ -192,14 +192,14 @@ export class ManageAudienceClient { */ public async createClickBasedAudienceGroupWithHttpInfo( createClickBasedAudienceGroupRequest: CreateClickBasedAudienceGroupRequest, - ): Promise<[Response, CreateClickBasedAudienceGroupResponse]> { + ): Promise> { const params = createClickBasedAudienceGroupRequest; const res = await this.httpClient.post( "/v2/bot/audienceGroup/click", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Create audience for impression-based retargeting @@ -214,7 +214,7 @@ export class ManageAudienceClient { await this.createImpBasedAudienceGroupWithHttpInfo( createImpBasedAudienceGroupRequest, ) - )[1]; + ).body; } /** @@ -226,11 +226,11 @@ export class ManageAudienceClient { */ public async createImpBasedAudienceGroupWithHttpInfo( createImpBasedAudienceGroupRequest: CreateImpBasedAudienceGroupRequest, - ): Promise<[Response, CreateImpBasedAudienceGroupResponse]> { + ): Promise> { const params = createImpBasedAudienceGroupRequest; const res = await this.httpClient.post("/v2/bot/audienceGroup/imp", params); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Delete audience @@ -241,7 +241,7 @@ export class ManageAudienceClient { public async deleteAudienceGroup( audienceGroupId: number, ): Promise { - return (await this.deleteAudienceGroupWithHttpInfo(audienceGroupId))[1]; + return (await this.deleteAudienceGroupWithHttpInfo(audienceGroupId)).body; } /** @@ -253,14 +253,14 @@ export class ManageAudienceClient { */ public async deleteAudienceGroupWithHttpInfo( audienceGroupId: number, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const res = await this.httpClient.delete( "/v2/bot/audienceGroup/{audienceGroupId}".replace( "{audienceGroupId}", String(audienceGroupId), ), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Gets audience data. @@ -271,7 +271,7 @@ export class ManageAudienceClient { public async getAudienceData( audienceGroupId: number, ): Promise { - return (await this.getAudienceDataWithHttpInfo(audienceGroupId))[1]; + return (await this.getAudienceDataWithHttpInfo(audienceGroupId)).body; } /** @@ -283,14 +283,14 @@ export class ManageAudienceClient { */ public async getAudienceDataWithHttpInfo( audienceGroupId: number, - ): Promise<[Response, GetAudienceDataResponse]> { + ): Promise> { const res = await this.httpClient.get( "/v2/bot/audienceGroup/{audienceGroupId}".replace( "{audienceGroupId}", String(audienceGroupId), ), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get the authority level of the audience @@ -298,7 +298,7 @@ export class ManageAudienceClient { * @see Documentation */ public async getAudienceGroupAuthorityLevel(): Promise { - return (await this.getAudienceGroupAuthorityLevelWithHttpInfo())[1]; + return (await this.getAudienceGroupAuthorityLevelWithHttpInfo()).body; } /** @@ -308,12 +308,12 @@ export class ManageAudienceClient { * @see Documentation */ public async getAudienceGroupAuthorityLevelWithHttpInfo(): Promise< - [Response, GetAudienceGroupAuthorityLevelResponse] + Types.ApiResponseType > { const res = await this.httpClient.get( "/v2/bot/audienceGroup/authorityLevel", ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Gets data for more than one audience. @@ -343,7 +343,7 @@ export class ManageAudienceClient { includesExternalPublicGroups, createRoute, ) - )[1]; + ).body; } /** @@ -365,7 +365,7 @@ export class ManageAudienceClient { size?: number, includesExternalPublicGroups?: boolean, createRoute?: AudienceGroupCreateRoute, - ): Promise<[Response, GetAudienceGroupsResponse]> { + ): Promise> { const queryParams = { page: page, description: description, @@ -379,7 +379,7 @@ export class ManageAudienceClient { "/v2/bot/audienceGroup/list", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Change the authority level of the audience @@ -394,7 +394,7 @@ export class ManageAudienceClient { await this.updateAudienceGroupAuthorityLevelWithHttpInfo( updateAudienceGroupAuthorityLevelRequest, ) - )[1]; + ).body; } /** @@ -406,14 +406,14 @@ export class ManageAudienceClient { */ public async updateAudienceGroupAuthorityLevelWithHttpInfo( updateAudienceGroupAuthorityLevelRequest: UpdateAudienceGroupAuthorityLevelRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = updateAudienceGroupAuthorityLevelRequest; const res = await this.httpClient.put( "/v2/bot/audienceGroup/authorityLevel", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Renames an existing audience. @@ -431,7 +431,7 @@ export class ManageAudienceClient { audienceGroupId, updateAudienceGroupDescriptionRequest, ) - )[1]; + ).body; } /** @@ -445,7 +445,7 @@ export class ManageAudienceClient { public async updateAudienceGroupDescriptionWithHttpInfo( audienceGroupId: number, updateAudienceGroupDescriptionRequest: UpdateAudienceGroupDescriptionRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = updateAudienceGroupDescriptionRequest; const res = await this.httpClient.put( @@ -455,6 +455,6 @@ export class ManageAudienceClient { ), params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } } diff --git a/lib/messaging-api/api/messagingApiBlobClient.ts b/lib/messaging-api/api/messagingApiBlobClient.ts index 366c91206..d25338488 100644 --- a/lib/messaging-api/api/messagingApiBlobClient.ts +++ b/lib/messaging-api/api/messagingApiBlobClient.ts @@ -64,7 +64,7 @@ export class MessagingApiBlobClient { * @see Documentation */ public async getMessageContent(messageId: string): Promise { - return (await this.getMessageContentWithHttpInfo(messageId))[1]; + return (await this.getMessageContentWithHttpInfo(messageId)).body; } /** @@ -76,14 +76,17 @@ export class MessagingApiBlobClient { */ public async getMessageContentWithHttpInfo( messageId: string, - ): Promise<[Response, Readable]> { + ): Promise> { const response = await this.httpClient.get( "/v2/bot/message/{messageId}/content".replace( "{" + "messageId" + "}", String(messageId), ), ); - return [response, convertResponseToReadable(response)]; + return { + httpResponse: response, + body: convertResponseToReadable(response), + }; } /** * Get a preview image of the image or video @@ -92,7 +95,7 @@ export class MessagingApiBlobClient { * @see Documentation */ public async getMessageContentPreview(messageId: string): Promise { - return (await this.getMessageContentPreviewWithHttpInfo(messageId))[1]; + return (await this.getMessageContentPreviewWithHttpInfo(messageId)).body; } /** @@ -104,14 +107,17 @@ export class MessagingApiBlobClient { */ public async getMessageContentPreviewWithHttpInfo( messageId: string, - ): Promise<[Response, Readable]> { + ): Promise> { const response = await this.httpClient.get( "/v2/bot/message/{messageId}/content/preview".replace( "{" + "messageId" + "}", String(messageId), ), ); - return [response, convertResponseToReadable(response)]; + return { + httpResponse: response, + body: convertResponseToReadable(response), + }; } /** * Verify the preparation status of a video or audio for getting @@ -124,7 +130,7 @@ export class MessagingApiBlobClient { ): Promise { return ( await this.getMessageContentTranscodingByMessageIdWithHttpInfo(messageId) - )[1]; + ).body; } /** @@ -136,14 +142,14 @@ export class MessagingApiBlobClient { */ public async getMessageContentTranscodingByMessageIdWithHttpInfo( messageId: string, - ): Promise<[Response, GetMessageContentTranscodingResponse]> { + ): Promise> { const res = await this.httpClient.get( "/v2/bot/message/{messageId}/content/transcoding".replace( "{messageId}", String(messageId), ), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Download rich menu image. @@ -152,7 +158,7 @@ export class MessagingApiBlobClient { * @see Documentation */ public async getRichMenuImage(richMenuId: string): Promise { - return (await this.getRichMenuImageWithHttpInfo(richMenuId))[1]; + return (await this.getRichMenuImageWithHttpInfo(richMenuId)).body; } /** @@ -164,14 +170,17 @@ export class MessagingApiBlobClient { */ public async getRichMenuImageWithHttpInfo( richMenuId: string, - ): Promise<[Response, Readable]> { + ): Promise> { const response = await this.httpClient.get( "/v2/bot/richmenu/{richMenuId}/content".replace( "{" + "richMenuId" + "}", String(richMenuId), ), ); - return [response, convertResponseToReadable(response)]; + return { + httpResponse: response, + body: convertResponseToReadable(response), + }; } /** * Upload rich menu image @@ -184,7 +193,7 @@ export class MessagingApiBlobClient { richMenuId: string, body?: Blob, ): Promise { - return (await this.setRichMenuImageWithHttpInfo(richMenuId, body))[1]; + return (await this.setRichMenuImageWithHttpInfo(richMenuId, body)).body; } /** @@ -198,7 +207,7 @@ export class MessagingApiBlobClient { public async setRichMenuImageWithHttpInfo( richMenuId: string, body?: Blob, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = body; const res = await this.httpClient.postBinaryContent( @@ -208,6 +217,6 @@ export class MessagingApiBlobClient { ), params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } } diff --git a/lib/messaging-api/api/messagingApiClient.ts b/lib/messaging-api/api/messagingApiClient.ts index d1a1ae6fa..b3c21673b 100644 --- a/lib/messaging-api/api/messagingApiClient.ts +++ b/lib/messaging-api/api/messagingApiClient.ts @@ -109,9 +109,8 @@ export class MessagingApiClient { public async audienceMatch( audienceMatchMessagesRequest: AudienceMatchMessagesRequest, ): Promise { - return ( - await this.audienceMatchWithHttpInfo(audienceMatchMessagesRequest) - )[1]; + return (await this.audienceMatchWithHttpInfo(audienceMatchMessagesRequest)) + .body; } /** @@ -123,11 +122,11 @@ export class MessagingApiClient { */ public async audienceMatchWithHttpInfo( audienceMatchMessagesRequest: AudienceMatchMessagesRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = audienceMatchMessagesRequest; const res = await this.httpClient.post("/bot/ad/multicast/phone", params); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Sends a message to multiple users at any time. @@ -140,9 +139,8 @@ export class MessagingApiClient { broadcastRequest: BroadcastRequest, xLineRetryKey?: string, ): Promise { - return ( - await this.broadcastWithHttpInfo(broadcastRequest, xLineRetryKey) - )[1]; + return (await this.broadcastWithHttpInfo(broadcastRequest, xLineRetryKey)) + .body; } /** @@ -156,7 +154,7 @@ export class MessagingApiClient { public async broadcastWithHttpInfo( broadcastRequest: BroadcastRequest, xLineRetryKey?: string, - ): Promise<[Response, object]> { + ): Promise> { const params = broadcastRequest; const headerParams = { @@ -169,7 +167,7 @@ export class MessagingApiClient { { headers: headerParams }, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Cancel default rich menu @@ -177,7 +175,7 @@ export class MessagingApiClient { * @see Documentation */ public async cancelDefaultRichMenu(): Promise { - return (await this.cancelDefaultRichMenuWithHttpInfo())[1]; + return (await this.cancelDefaultRichMenuWithHttpInfo()).body; } /** @@ -187,10 +185,10 @@ export class MessagingApiClient { * @see Documentation */ public async cancelDefaultRichMenuWithHttpInfo(): Promise< - [Response, Types.MessageAPIResponseBase] + Types.ApiResponseType > { const res = await this.httpClient.delete("/v2/bot/user/all/richmenu"); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Create rich menu @@ -201,7 +199,7 @@ export class MessagingApiClient { public async createRichMenu( richMenuRequest: RichMenuRequest, ): Promise { - return (await this.createRichMenuWithHttpInfo(richMenuRequest))[1]; + return (await this.createRichMenuWithHttpInfo(richMenuRequest)).body; } /** @@ -213,11 +211,11 @@ export class MessagingApiClient { */ public async createRichMenuWithHttpInfo( richMenuRequest: RichMenuRequest, - ): Promise<[Response, RichMenuIdResponse]> { + ): Promise> { const params = richMenuRequest; const res = await this.httpClient.post("/v2/bot/richmenu", params); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Create rich menu alias @@ -230,7 +228,7 @@ export class MessagingApiClient { ): Promise { return ( await this.createRichMenuAliasWithHttpInfo(createRichMenuAliasRequest) - )[1]; + ).body; } /** @@ -242,11 +240,11 @@ export class MessagingApiClient { */ public async createRichMenuAliasWithHttpInfo( createRichMenuAliasRequest: CreateRichMenuAliasRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = createRichMenuAliasRequest; const res = await this.httpClient.post("/v2/bot/richmenu/alias", params); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Deletes a rich menu. @@ -257,7 +255,7 @@ export class MessagingApiClient { public async deleteRichMenu( richMenuId: string, ): Promise { - return (await this.deleteRichMenuWithHttpInfo(richMenuId))[1]; + return (await this.deleteRichMenuWithHttpInfo(richMenuId)).body; } /** @@ -269,14 +267,14 @@ export class MessagingApiClient { */ public async deleteRichMenuWithHttpInfo( richMenuId: string, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const res = await this.httpClient.delete( "/v2/bot/richmenu/{richMenuId}".replace( "{richMenuId}", String(richMenuId), ), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Delete rich menu alias @@ -287,7 +285,7 @@ export class MessagingApiClient { public async deleteRichMenuAlias( richMenuAliasId: string, ): Promise { - return (await this.deleteRichMenuAliasWithHttpInfo(richMenuAliasId))[1]; + return (await this.deleteRichMenuAliasWithHttpInfo(richMenuAliasId)).body; } /** @@ -299,14 +297,14 @@ export class MessagingApiClient { */ public async deleteRichMenuAliasWithHttpInfo( richMenuAliasId: string, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const res = await this.httpClient.delete( "/v2/bot/richmenu/alias/{richMenuAliasId}".replace( "{richMenuAliasId}", String(richMenuAliasId), ), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get result of message delivery using phone number @@ -317,7 +315,7 @@ export class MessagingApiClient { public async getAdPhoneMessageStatistics( date: string, ): Promise { - return (await this.getAdPhoneMessageStatisticsWithHttpInfo(date))[1]; + return (await this.getAdPhoneMessageStatisticsWithHttpInfo(date)).body; } /** @@ -329,7 +327,7 @@ export class MessagingApiClient { */ public async getAdPhoneMessageStatisticsWithHttpInfo( date: string, - ): Promise<[Response, NumberOfMessagesResponse]> { + ): Promise> { const queryParams = { date: date, }; @@ -338,7 +336,7 @@ export class MessagingApiClient { "/v2/bot/message/delivery/ad_phone", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get name list of units used this month @@ -351,7 +349,8 @@ export class MessagingApiClient { limit?: string, start?: string, ): Promise { - return (await this.getAggregationUnitNameListWithHttpInfo(limit, start))[1]; + return (await this.getAggregationUnitNameListWithHttpInfo(limit, start)) + .body; } /** @@ -365,7 +364,7 @@ export class MessagingApiClient { public async getAggregationUnitNameListWithHttpInfo( limit?: string, start?: string, - ): Promise<[Response, GetAggregationUnitNameListResponse]> { + ): Promise> { const queryParams = { limit: limit, start: start, @@ -375,7 +374,7 @@ export class MessagingApiClient { "/v2/bot/message/aggregation/list", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get number of units used this month @@ -383,7 +382,7 @@ export class MessagingApiClient { * @see Documentation */ public async getAggregationUnitUsage(): Promise { - return (await this.getAggregationUnitUsageWithHttpInfo())[1]; + return (await this.getAggregationUnitUsageWithHttpInfo()).body; } /** @@ -393,10 +392,10 @@ export class MessagingApiClient { * @see Documentation */ public async getAggregationUnitUsageWithHttpInfo(): Promise< - [Response, GetAggregationUnitUsageResponse] + Types.ApiResponseType > { const res = await this.httpClient.get("/v2/bot/message/aggregation/info"); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get bot info @@ -404,7 +403,7 @@ export class MessagingApiClient { * @see Documentation */ public async getBotInfo(): Promise { - return (await this.getBotInfoWithHttpInfo())[1]; + return (await this.getBotInfoWithHttpInfo()).body; } /** @@ -413,9 +412,11 @@ export class MessagingApiClient { * * @see Documentation */ - public async getBotInfoWithHttpInfo(): Promise<[Response, BotInfoResponse]> { + public async getBotInfoWithHttpInfo(): Promise< + Types.ApiResponseType + > { const res = await this.httpClient.get("/v2/bot/info"); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Gets the ID of the default rich menu set with the Messaging API. @@ -423,7 +424,7 @@ export class MessagingApiClient { * @see Documentation */ public async getDefaultRichMenuId(): Promise { - return (await this.getDefaultRichMenuIdWithHttpInfo())[1]; + return (await this.getDefaultRichMenuIdWithHttpInfo()).body; } /** @@ -433,10 +434,10 @@ export class MessagingApiClient { * @see Documentation */ public async getDefaultRichMenuIdWithHttpInfo(): Promise< - [Response, RichMenuIdResponse] + Types.ApiResponseType > { const res = await this.httpClient.get("/v2/bot/user/all/richmenu"); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get a list of users who added your LINE Official Account as a friend @@ -449,7 +450,7 @@ export class MessagingApiClient { start?: string, limit?: number, ): Promise { - return (await this.getFollowersWithHttpInfo(start, limit))[1]; + return (await this.getFollowersWithHttpInfo(start, limit)).body; } /** @@ -463,14 +464,14 @@ export class MessagingApiClient { public async getFollowersWithHttpInfo( start?: string, limit?: number, - ): Promise<[Response, GetFollowersResponse]> { + ): Promise> { const queryParams = { start: start, limit: limit, }; const res = await this.httpClient.get("/v2/bot/followers/ids", queryParams); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get number of users in a group chat @@ -481,7 +482,7 @@ export class MessagingApiClient { public async getGroupMemberCount( groupId: string, ): Promise { - return (await this.getGroupMemberCountWithHttpInfo(groupId))[1]; + return (await this.getGroupMemberCountWithHttpInfo(groupId)).body; } /** @@ -493,14 +494,14 @@ export class MessagingApiClient { */ public async getGroupMemberCountWithHttpInfo( groupId: string, - ): Promise<[Response, GroupMemberCountResponse]> { + ): Promise> { const res = await this.httpClient.get( "/v2/bot/group/{groupId}/members/count".replace( "{groupId}", String(groupId), ), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get group chat member profile @@ -513,7 +514,7 @@ export class MessagingApiClient { groupId: string, userId: string, ): Promise { - return (await this.getGroupMemberProfileWithHttpInfo(groupId, userId))[1]; + return (await this.getGroupMemberProfileWithHttpInfo(groupId, userId)).body; } /** @@ -527,7 +528,7 @@ export class MessagingApiClient { public async getGroupMemberProfileWithHttpInfo( groupId: string, userId: string, - ): Promise<[Response, GroupUserProfileResponse]> { + ): Promise> { const res = await this.httpClient.get( "/v2/bot/group/{groupId}/member/{userId}" @@ -535,7 +536,7 @@ export class MessagingApiClient { .replace("{userId}", String(userId)), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get group chat member user IDs @@ -548,7 +549,7 @@ export class MessagingApiClient { groupId: string, start?: string, ): Promise { - return (await this.getGroupMembersIdsWithHttpInfo(groupId, start))[1]; + return (await this.getGroupMembersIdsWithHttpInfo(groupId, start)).body; } /** @@ -562,7 +563,7 @@ export class MessagingApiClient { public async getGroupMembersIdsWithHttpInfo( groupId: string, start?: string, - ): Promise<[Response, MembersIdsResponse]> { + ): Promise> { const queryParams = { start: start, }; @@ -574,7 +575,7 @@ export class MessagingApiClient { ), queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get group chat summary @@ -583,7 +584,7 @@ export class MessagingApiClient { * @see Documentation */ public async getGroupSummary(groupId: string): Promise { - return (await this.getGroupSummaryWithHttpInfo(groupId))[1]; + return (await this.getGroupSummaryWithHttpInfo(groupId)).body; } /** @@ -595,11 +596,11 @@ export class MessagingApiClient { */ public async getGroupSummaryWithHttpInfo( groupId: string, - ): Promise<[Response, GroupSummaryResponse]> { + ): Promise> { const res = await this.httpClient.get( "/v2/bot/group/{groupId}/summary".replace("{groupId}", String(groupId)), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Gets the target limit for sending messages in the current month. The total number of the free messages and the additional messages is returned. @@ -607,7 +608,7 @@ export class MessagingApiClient { * @see Documentation */ public async getMessageQuota(): Promise { - return (await this.getMessageQuotaWithHttpInfo())[1]; + return (await this.getMessageQuotaWithHttpInfo()).body; } /** @@ -617,10 +618,10 @@ export class MessagingApiClient { * @see Documentation */ public async getMessageQuotaWithHttpInfo(): Promise< - [Response, MessageQuotaResponse] + Types.ApiResponseType > { const res = await this.httpClient.get("/v2/bot/message/quota"); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Gets the number of messages sent in the current month. @@ -628,7 +629,7 @@ export class MessagingApiClient { * @see Documentation */ public async getMessageQuotaConsumption(): Promise { - return (await this.getMessageQuotaConsumptionWithHttpInfo())[1]; + return (await this.getMessageQuotaConsumptionWithHttpInfo()).body; } /** @@ -638,10 +639,10 @@ export class MessagingApiClient { * @see Documentation */ public async getMessageQuotaConsumptionWithHttpInfo(): Promise< - [Response, QuotaConsumptionResponse] + Types.ApiResponseType > { const res = await this.httpClient.get("/v2/bot/message/quota/consumption"); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Gets the status of a narrowcast message. @@ -652,7 +653,7 @@ export class MessagingApiClient { public async getNarrowcastProgress( requestId: string, ): Promise { - return (await this.getNarrowcastProgressWithHttpInfo(requestId))[1]; + return (await this.getNarrowcastProgressWithHttpInfo(requestId)).body; } /** @@ -664,7 +665,7 @@ export class MessagingApiClient { */ public async getNarrowcastProgressWithHttpInfo( requestId: string, - ): Promise<[Response, NarrowcastProgressResponse]> { + ): Promise> { const queryParams = { requestId: requestId, }; @@ -673,7 +674,7 @@ export class MessagingApiClient { "/v2/bot/message/progress/narrowcast", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get number of sent broadcast messages @@ -684,7 +685,7 @@ export class MessagingApiClient { public async getNumberOfSentBroadcastMessages( date: string, ): Promise { - return (await this.getNumberOfSentBroadcastMessagesWithHttpInfo(date))[1]; + return (await this.getNumberOfSentBroadcastMessagesWithHttpInfo(date)).body; } /** @@ -696,7 +697,7 @@ export class MessagingApiClient { */ public async getNumberOfSentBroadcastMessagesWithHttpInfo( date: string, - ): Promise<[Response, NumberOfMessagesResponse]> { + ): Promise> { const queryParams = { date: date, }; @@ -705,7 +706,7 @@ export class MessagingApiClient { "/v2/bot/message/delivery/broadcast", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get number of sent multicast messages @@ -716,7 +717,7 @@ export class MessagingApiClient { public async getNumberOfSentMulticastMessages( date: string, ): Promise { - return (await this.getNumberOfSentMulticastMessagesWithHttpInfo(date))[1]; + return (await this.getNumberOfSentMulticastMessagesWithHttpInfo(date)).body; } /** @@ -728,7 +729,7 @@ export class MessagingApiClient { */ public async getNumberOfSentMulticastMessagesWithHttpInfo( date: string, - ): Promise<[Response, NumberOfMessagesResponse]> { + ): Promise> { const queryParams = { date: date, }; @@ -737,7 +738,7 @@ export class MessagingApiClient { "/v2/bot/message/delivery/multicast", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get number of sent push messages @@ -748,7 +749,7 @@ export class MessagingApiClient { public async getNumberOfSentPushMessages( date: string, ): Promise { - return (await this.getNumberOfSentPushMessagesWithHttpInfo(date))[1]; + return (await this.getNumberOfSentPushMessagesWithHttpInfo(date)).body; } /** @@ -760,7 +761,7 @@ export class MessagingApiClient { */ public async getNumberOfSentPushMessagesWithHttpInfo( date: string, - ): Promise<[Response, NumberOfMessagesResponse]> { + ): Promise> { const queryParams = { date: date, }; @@ -769,7 +770,7 @@ export class MessagingApiClient { "/v2/bot/message/delivery/push", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get number of sent reply messages @@ -780,7 +781,7 @@ export class MessagingApiClient { public async getNumberOfSentReplyMessages( date: string, ): Promise { - return (await this.getNumberOfSentReplyMessagesWithHttpInfo(date))[1]; + return (await this.getNumberOfSentReplyMessagesWithHttpInfo(date)).body; } /** @@ -792,7 +793,7 @@ export class MessagingApiClient { */ public async getNumberOfSentReplyMessagesWithHttpInfo( date: string, - ): Promise<[Response, NumberOfMessagesResponse]> { + ): Promise> { const queryParams = { date: date, }; @@ -801,7 +802,7 @@ export class MessagingApiClient { "/v2/bot/message/delivery/reply", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get number of sent LINE notification messages @@ -812,7 +813,7 @@ export class MessagingApiClient { public async getPNPMessageStatistics( date: string, ): Promise { - return (await this.getPNPMessageStatisticsWithHttpInfo(date))[1]; + return (await this.getPNPMessageStatisticsWithHttpInfo(date)).body; } /** @@ -824,7 +825,7 @@ export class MessagingApiClient { */ public async getPNPMessageStatisticsWithHttpInfo( date: string, - ): Promise<[Response, NumberOfMessagesResponse]> { + ): Promise> { const queryParams = { date: date, }; @@ -833,7 +834,7 @@ export class MessagingApiClient { "/v2/bot/message/delivery/pnp", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get profile @@ -842,7 +843,7 @@ export class MessagingApiClient { * @see Documentation */ public async getProfile(userId: string): Promise { - return (await this.getProfileWithHttpInfo(userId))[1]; + return (await this.getProfileWithHttpInfo(userId)).body; } /** @@ -854,11 +855,11 @@ export class MessagingApiClient { */ public async getProfileWithHttpInfo( userId: string, - ): Promise<[Response, UserProfileResponse]> { + ): Promise> { const res = await this.httpClient.get( "/v2/bot/profile/{userId}".replace("{userId}", String(userId)), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Gets a rich menu via a rich menu ID. @@ -867,7 +868,7 @@ export class MessagingApiClient { * @see Documentation */ public async getRichMenu(richMenuId: string): Promise { - return (await this.getRichMenuWithHttpInfo(richMenuId))[1]; + return (await this.getRichMenuWithHttpInfo(richMenuId)).body; } /** @@ -879,14 +880,14 @@ export class MessagingApiClient { */ public async getRichMenuWithHttpInfo( richMenuId: string, - ): Promise<[Response, RichMenuResponse]> { + ): Promise> { const res = await this.httpClient.get( "/v2/bot/richmenu/{richMenuId}".replace( "{richMenuId}", String(richMenuId), ), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get rich menu alias information @@ -897,7 +898,7 @@ export class MessagingApiClient { public async getRichMenuAlias( richMenuAliasId: string, ): Promise { - return (await this.getRichMenuAliasWithHttpInfo(richMenuAliasId))[1]; + return (await this.getRichMenuAliasWithHttpInfo(richMenuAliasId)).body; } /** @@ -909,14 +910,14 @@ export class MessagingApiClient { */ public async getRichMenuAliasWithHttpInfo( richMenuAliasId: string, - ): Promise<[Response, RichMenuAliasResponse]> { + ): Promise> { const res = await this.httpClient.get( "/v2/bot/richmenu/alias/{richMenuAliasId}".replace( "{richMenuAliasId}", String(richMenuAliasId), ), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get list of rich menu alias @@ -924,7 +925,7 @@ export class MessagingApiClient { * @see Documentation */ public async getRichMenuAliasList(): Promise { - return (await this.getRichMenuAliasListWithHttpInfo())[1]; + return (await this.getRichMenuAliasListWithHttpInfo()).body; } /** @@ -934,10 +935,10 @@ export class MessagingApiClient { * @see Documentation */ public async getRichMenuAliasListWithHttpInfo(): Promise< - [Response, RichMenuAliasListResponse] + Types.ApiResponseType > { const res = await this.httpClient.get("/v2/bot/richmenu/alias/list"); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get the status of Replace or unlink a linked rich menus in batches. @@ -948,7 +949,7 @@ export class MessagingApiClient { public async getRichMenuBatchProgress( requestId: string, ): Promise { - return (await this.getRichMenuBatchProgressWithHttpInfo(requestId))[1]; + return (await this.getRichMenuBatchProgressWithHttpInfo(requestId)).body; } /** @@ -960,7 +961,7 @@ export class MessagingApiClient { */ public async getRichMenuBatchProgressWithHttpInfo( requestId: string, - ): Promise<[Response, RichMenuBatchProgressResponse]> { + ): Promise> { const queryParams = { requestId: requestId, }; @@ -969,7 +970,7 @@ export class MessagingApiClient { "/v2/bot/richmenu/progress/batch", queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get rich menu ID of user @@ -980,7 +981,7 @@ export class MessagingApiClient { public async getRichMenuIdOfUser( userId: string, ): Promise { - return (await this.getRichMenuIdOfUserWithHttpInfo(userId))[1]; + return (await this.getRichMenuIdOfUserWithHttpInfo(userId)).body; } /** @@ -992,11 +993,11 @@ export class MessagingApiClient { */ public async getRichMenuIdOfUserWithHttpInfo( userId: string, - ): Promise<[Response, RichMenuIdResponse]> { + ): Promise> { const res = await this.httpClient.get( "/v2/bot/user/{userId}/richmenu".replace("{userId}", String(userId)), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get rich menu list @@ -1004,7 +1005,7 @@ export class MessagingApiClient { * @see Documentation */ public async getRichMenuList(): Promise { - return (await this.getRichMenuListWithHttpInfo())[1]; + return (await this.getRichMenuListWithHttpInfo()).body; } /** @@ -1014,10 +1015,10 @@ export class MessagingApiClient { * @see Documentation */ public async getRichMenuListWithHttpInfo(): Promise< - [Response, RichMenuListResponse] + Types.ApiResponseType > { const res = await this.httpClient.get("/v2/bot/richmenu/list"); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get number of users in a multi-person chat @@ -1028,7 +1029,7 @@ export class MessagingApiClient { public async getRoomMemberCount( roomId: string, ): Promise { - return (await this.getRoomMemberCountWithHttpInfo(roomId))[1]; + return (await this.getRoomMemberCountWithHttpInfo(roomId)).body; } /** @@ -1040,11 +1041,11 @@ export class MessagingApiClient { */ public async getRoomMemberCountWithHttpInfo( roomId: string, - ): Promise<[Response, RoomMemberCountResponse]> { + ): Promise> { const res = await this.httpClient.get( "/v2/bot/room/{roomId}/members/count".replace("{roomId}", String(roomId)), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get multi-person chat member profile @@ -1057,7 +1058,7 @@ export class MessagingApiClient { roomId: string, userId: string, ): Promise { - return (await this.getRoomMemberProfileWithHttpInfo(roomId, userId))[1]; + return (await this.getRoomMemberProfileWithHttpInfo(roomId, userId)).body; } /** @@ -1071,7 +1072,7 @@ export class MessagingApiClient { public async getRoomMemberProfileWithHttpInfo( roomId: string, userId: string, - ): Promise<[Response, RoomUserProfileResponse]> { + ): Promise> { const res = await this.httpClient.get( "/v2/bot/room/{roomId}/member/{userId}" @@ -1079,7 +1080,7 @@ export class MessagingApiClient { .replace("{userId}", String(userId)), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get multi-person chat member user IDs @@ -1092,7 +1093,7 @@ export class MessagingApiClient { roomId: string, start?: string, ): Promise { - return (await this.getRoomMembersIdsWithHttpInfo(roomId, start))[1]; + return (await this.getRoomMembersIdsWithHttpInfo(roomId, start)).body; } /** @@ -1106,7 +1107,7 @@ export class MessagingApiClient { public async getRoomMembersIdsWithHttpInfo( roomId: string, start?: string, - ): Promise<[Response, MembersIdsResponse]> { + ): Promise> { const queryParams = { start: start, }; @@ -1115,7 +1116,7 @@ export class MessagingApiClient { "/v2/bot/room/{roomId}/members/ids".replace("{roomId}", String(roomId)), queryParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Get webhook endpoint information @@ -1123,7 +1124,7 @@ export class MessagingApiClient { * @see Documentation */ public async getWebhookEndpoint(): Promise { - return (await this.getWebhookEndpointWithHttpInfo())[1]; + return (await this.getWebhookEndpointWithHttpInfo()).body; } /** @@ -1133,10 +1134,10 @@ export class MessagingApiClient { * @see Documentation */ public async getWebhookEndpointWithHttpInfo(): Promise< - [Response, GetWebhookEndpointResponse] + Types.ApiResponseType > { const res = await this.httpClient.get("/v2/bot/channel/webhook/endpoint"); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Issue link token @@ -1145,7 +1146,7 @@ export class MessagingApiClient { * @see Documentation */ public async issueLinkToken(userId: string): Promise { - return (await this.issueLinkTokenWithHttpInfo(userId))[1]; + return (await this.issueLinkTokenWithHttpInfo(userId)).body; } /** @@ -1157,11 +1158,11 @@ export class MessagingApiClient { */ public async issueLinkTokenWithHttpInfo( userId: string, - ): Promise<[Response, IssueLinkTokenResponse]> { + ): Promise> { const res = await this.httpClient.post( "/v2/bot/user/{userId}/linkToken".replace("{userId}", String(userId)), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Leave group chat @@ -1172,7 +1173,7 @@ export class MessagingApiClient { public async leaveGroup( groupId: string, ): Promise { - return (await this.leaveGroupWithHttpInfo(groupId))[1]; + return (await this.leaveGroupWithHttpInfo(groupId)).body; } /** @@ -1184,11 +1185,11 @@ export class MessagingApiClient { */ public async leaveGroupWithHttpInfo( groupId: string, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const res = await this.httpClient.post( "/v2/bot/group/{groupId}/leave".replace("{groupId}", String(groupId)), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Leave multi-person chat @@ -1199,7 +1200,7 @@ export class MessagingApiClient { public async leaveRoom( roomId: string, ): Promise { - return (await this.leaveRoomWithHttpInfo(roomId))[1]; + return (await this.leaveRoomWithHttpInfo(roomId)).body; } /** @@ -1211,11 +1212,11 @@ export class MessagingApiClient { */ public async leaveRoomWithHttpInfo( roomId: string, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const res = await this.httpClient.post( "/v2/bot/room/{roomId}/leave".replace("{roomId}", String(roomId)), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Link rich menu to user. @@ -1228,7 +1229,8 @@ export class MessagingApiClient { userId: string, richMenuId: string, ): Promise { - return (await this.linkRichMenuIdToUserWithHttpInfo(userId, richMenuId))[1]; + return (await this.linkRichMenuIdToUserWithHttpInfo(userId, richMenuId)) + .body; } /** @@ -1242,7 +1244,7 @@ export class MessagingApiClient { public async linkRichMenuIdToUserWithHttpInfo( userId: string, richMenuId: string, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const res = await this.httpClient.post( "/v2/bot/user/{userId}/richmenu/{richMenuId}" @@ -1250,7 +1252,7 @@ export class MessagingApiClient { .replace("{richMenuId}", String(richMenuId)), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Link rich menu to multiple users @@ -1263,7 +1265,7 @@ export class MessagingApiClient { ): Promise { return ( await this.linkRichMenuIdToUsersWithHttpInfo(richMenuBulkLinkRequest) - )[1]; + ).body; } /** @@ -1275,14 +1277,14 @@ export class MessagingApiClient { */ public async linkRichMenuIdToUsersWithHttpInfo( richMenuBulkLinkRequest: RichMenuBulkLinkRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = richMenuBulkLinkRequest; const res = await this.httpClient.post( "/v2/bot/richmenu/bulk/link", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Mark messages from users as read @@ -1295,7 +1297,7 @@ export class MessagingApiClient { ): Promise { return ( await this.markMessagesAsReadWithHttpInfo(markMessagesAsReadRequest) - )[1]; + ).body; } /** @@ -1307,14 +1309,14 @@ export class MessagingApiClient { */ public async markMessagesAsReadWithHttpInfo( markMessagesAsReadRequest: MarkMessagesAsReadRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = markMessagesAsReadRequest; const res = await this.httpClient.post( "/v2/bot/message/markAsRead", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * An API that efficiently sends the same message to multiple user IDs. You can\'t send messages to group chats or multi-person chats. @@ -1327,9 +1329,8 @@ export class MessagingApiClient { multicastRequest: MulticastRequest, xLineRetryKey?: string, ): Promise { - return ( - await this.multicastWithHttpInfo(multicastRequest, xLineRetryKey) - )[1]; + return (await this.multicastWithHttpInfo(multicastRequest, xLineRetryKey)) + .body; } /** @@ -1343,7 +1344,7 @@ export class MessagingApiClient { public async multicastWithHttpInfo( multicastRequest: MulticastRequest, xLineRetryKey?: string, - ): Promise<[Response, object]> { + ): Promise> { const params = multicastRequest; const headerParams = { @@ -1356,7 +1357,7 @@ export class MessagingApiClient { { headers: headerParams }, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Send narrowcast message @@ -1369,9 +1370,8 @@ export class MessagingApiClient { narrowcastRequest: NarrowcastRequest, xLineRetryKey?: string, ): Promise { - return ( - await this.narrowcastWithHttpInfo(narrowcastRequest, xLineRetryKey) - )[1]; + return (await this.narrowcastWithHttpInfo(narrowcastRequest, xLineRetryKey)) + .body; } /** @@ -1385,7 +1385,7 @@ export class MessagingApiClient { public async narrowcastWithHttpInfo( narrowcastRequest: NarrowcastRequest, xLineRetryKey?: string, - ): Promise<[Response, object]> { + ): Promise> { const params = narrowcastRequest; const headerParams = { @@ -1398,7 +1398,7 @@ export class MessagingApiClient { { headers: headerParams }, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Sends a message to a user, group chat, or multi-person chat at any time. @@ -1413,7 +1413,7 @@ export class MessagingApiClient { ): Promise { return ( await this.pushMessageWithHttpInfo(pushMessageRequest, xLineRetryKey) - )[1]; + ).body; } /** @@ -1427,7 +1427,7 @@ export class MessagingApiClient { public async pushMessageWithHttpInfo( pushMessageRequest: PushMessageRequest, xLineRetryKey?: string, - ): Promise<[Response, PushMessageResponse]> { + ): Promise> { const params = pushMessageRequest; const headerParams = { @@ -1440,7 +1440,7 @@ export class MessagingApiClient { { headers: headerParams }, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Send LINE notification message @@ -1458,7 +1458,7 @@ export class MessagingApiClient { pnpMessagesRequest, xLineDeliveryTag, ) - )[1]; + ).body; } /** @@ -1472,7 +1472,7 @@ export class MessagingApiClient { public async pushMessagesByPhoneWithHttpInfo( pnpMessagesRequest: PnpMessagesRequest, xLineDeliveryTag?: string, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = pnpMessagesRequest; const headerParams = { @@ -1487,7 +1487,7 @@ export class MessagingApiClient { { headers: headerParams }, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Send reply message @@ -1498,7 +1498,7 @@ export class MessagingApiClient { public async replyMessage( replyMessageRequest: ReplyMessageRequest, ): Promise { - return (await this.replyMessageWithHttpInfo(replyMessageRequest))[1]; + return (await this.replyMessageWithHttpInfo(replyMessageRequest)).body; } /** @@ -1510,11 +1510,11 @@ export class MessagingApiClient { */ public async replyMessageWithHttpInfo( replyMessageRequest: ReplyMessageRequest, - ): Promise<[Response, ReplyMessageResponse]> { + ): Promise> { const params = replyMessageRequest; const res = await this.httpClient.post("/v2/bot/message/reply", params); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * You can use this endpoint to batch control the rich menu linked to the users using the endpoint such as Link rich menu to user. The following operations are available: 1. Replace a rich menu with another rich menu for all users linked to a specific rich menu 2. Unlink a rich menu for all users linked to a specific rich menu 3. Unlink a rich menu for all users linked the rich menu @@ -1525,7 +1525,7 @@ export class MessagingApiClient { public async richMenuBatch( richMenuBatchRequest: RichMenuBatchRequest, ): Promise { - return (await this.richMenuBatchWithHttpInfo(richMenuBatchRequest))[1]; + return (await this.richMenuBatchWithHttpInfo(richMenuBatchRequest)).body; } /** @@ -1537,11 +1537,11 @@ export class MessagingApiClient { */ public async richMenuBatchWithHttpInfo( richMenuBatchRequest: RichMenuBatchRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = richMenuBatchRequest; const res = await this.httpClient.post("/v2/bot/richmenu/batch", params); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Set default rich menu @@ -1552,7 +1552,7 @@ export class MessagingApiClient { public async setDefaultRichMenu( richMenuId: string, ): Promise { - return (await this.setDefaultRichMenuWithHttpInfo(richMenuId))[1]; + return (await this.setDefaultRichMenuWithHttpInfo(richMenuId)).body; } /** @@ -1564,14 +1564,14 @@ export class MessagingApiClient { */ public async setDefaultRichMenuWithHttpInfo( richMenuId: string, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const res = await this.httpClient.post( "/v2/bot/user/all/richmenu/{richMenuId}".replace( "{richMenuId}", String(richMenuId), ), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Set webhook endpoint URL @@ -1584,7 +1584,7 @@ export class MessagingApiClient { ): Promise { return ( await this.setWebhookEndpointWithHttpInfo(setWebhookEndpointRequest) - )[1]; + ).body; } /** @@ -1596,14 +1596,14 @@ export class MessagingApiClient { */ public async setWebhookEndpointWithHttpInfo( setWebhookEndpointRequest: SetWebhookEndpointRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = setWebhookEndpointRequest; const res = await this.httpClient.put( "/v2/bot/channel/webhook/endpoint", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Test webhook endpoint @@ -1616,7 +1616,7 @@ export class MessagingApiClient { ): Promise { return ( await this.testWebhookEndpointWithHttpInfo(testWebhookEndpointRequest) - )[1]; + ).body; } /** @@ -1628,14 +1628,14 @@ export class MessagingApiClient { */ public async testWebhookEndpointWithHttpInfo( testWebhookEndpointRequest?: TestWebhookEndpointRequest, - ): Promise<[Response, TestWebhookEndpointResponse]> { + ): Promise> { const params = testWebhookEndpointRequest; const res = await this.httpClient.post( "/v2/bot/channel/webhook/test", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Unlink rich menu from user @@ -1646,7 +1646,7 @@ export class MessagingApiClient { public async unlinkRichMenuIdFromUser( userId: string, ): Promise { - return (await this.unlinkRichMenuIdFromUserWithHttpInfo(userId))[1]; + return (await this.unlinkRichMenuIdFromUserWithHttpInfo(userId)).body; } /** @@ -1658,11 +1658,11 @@ export class MessagingApiClient { */ public async unlinkRichMenuIdFromUserWithHttpInfo( userId: string, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const res = await this.httpClient.delete( "/v2/bot/user/{userId}/richmenu".replace("{userId}", String(userId)), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Unlink rich menus from multiple users @@ -1677,7 +1677,7 @@ export class MessagingApiClient { await this.unlinkRichMenuIdFromUsersWithHttpInfo( richMenuBulkUnlinkRequest, ) - )[1]; + ).body; } /** @@ -1689,14 +1689,14 @@ export class MessagingApiClient { */ public async unlinkRichMenuIdFromUsersWithHttpInfo( richMenuBulkUnlinkRequest: RichMenuBulkUnlinkRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = richMenuBulkUnlinkRequest; const res = await this.httpClient.post( "/v2/bot/richmenu/bulk/unlink", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Update rich menu alias @@ -1714,7 +1714,7 @@ export class MessagingApiClient { richMenuAliasId, updateRichMenuAliasRequest, ) - )[1]; + ).body; } /** @@ -1728,7 +1728,7 @@ export class MessagingApiClient { public async updateRichMenuAliasWithHttpInfo( richMenuAliasId: string, updateRichMenuAliasRequest: UpdateRichMenuAliasRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = updateRichMenuAliasRequest; const res = await this.httpClient.post( @@ -1738,7 +1738,7 @@ export class MessagingApiClient { ), params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Validate message objects of a broadcast message @@ -1749,9 +1749,8 @@ export class MessagingApiClient { public async validateBroadcast( validateMessageRequest: ValidateMessageRequest, ): Promise { - return ( - await this.validateBroadcastWithHttpInfo(validateMessageRequest) - )[1]; + return (await this.validateBroadcastWithHttpInfo(validateMessageRequest)) + .body; } /** @@ -1763,14 +1762,14 @@ export class MessagingApiClient { */ public async validateBroadcastWithHttpInfo( validateMessageRequest: ValidateMessageRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = validateMessageRequest; const res = await this.httpClient.post( "/v2/bot/message/validate/broadcast", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Validate message objects of a multicast message @@ -1781,9 +1780,8 @@ export class MessagingApiClient { public async validateMulticast( validateMessageRequest: ValidateMessageRequest, ): Promise { - return ( - await this.validateMulticastWithHttpInfo(validateMessageRequest) - )[1]; + return (await this.validateMulticastWithHttpInfo(validateMessageRequest)) + .body; } /** @@ -1795,14 +1793,14 @@ export class MessagingApiClient { */ public async validateMulticastWithHttpInfo( validateMessageRequest: ValidateMessageRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = validateMessageRequest; const res = await this.httpClient.post( "/v2/bot/message/validate/multicast", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Validate message objects of a narrowcast message @@ -1813,9 +1811,8 @@ export class MessagingApiClient { public async validateNarrowcast( validateMessageRequest: ValidateMessageRequest, ): Promise { - return ( - await this.validateNarrowcastWithHttpInfo(validateMessageRequest) - )[1]; + return (await this.validateNarrowcastWithHttpInfo(validateMessageRequest)) + .body; } /** @@ -1827,14 +1824,14 @@ export class MessagingApiClient { */ public async validateNarrowcastWithHttpInfo( validateMessageRequest: ValidateMessageRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = validateMessageRequest; const res = await this.httpClient.post( "/v2/bot/message/validate/narrowcast", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Validate message objects of a push message @@ -1845,7 +1842,7 @@ export class MessagingApiClient { public async validatePush( validateMessageRequest: ValidateMessageRequest, ): Promise { - return (await this.validatePushWithHttpInfo(validateMessageRequest))[1]; + return (await this.validatePushWithHttpInfo(validateMessageRequest)).body; } /** @@ -1857,14 +1854,14 @@ export class MessagingApiClient { */ public async validatePushWithHttpInfo( validateMessageRequest: ValidateMessageRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = validateMessageRequest; const res = await this.httpClient.post( "/v2/bot/message/validate/push", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Validate message objects of a reply message @@ -1875,7 +1872,7 @@ export class MessagingApiClient { public async validateReply( validateMessageRequest: ValidateMessageRequest, ): Promise { - return (await this.validateReplyWithHttpInfo(validateMessageRequest))[1]; + return (await this.validateReplyWithHttpInfo(validateMessageRequest)).body; } /** @@ -1887,14 +1884,14 @@ export class MessagingApiClient { */ public async validateReplyWithHttpInfo( validateMessageRequest: ValidateMessageRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = validateMessageRequest; const res = await this.httpClient.post( "/v2/bot/message/validate/reply", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Validate a request body of the Replace or unlink the linked rich menus in batches endpoint. @@ -1907,7 +1904,7 @@ export class MessagingApiClient { ): Promise { return ( await this.validateRichMenuBatchRequestWithHttpInfo(richMenuBatchRequest) - )[1]; + ).body; } /** @@ -1919,14 +1916,14 @@ export class MessagingApiClient { */ public async validateRichMenuBatchRequestWithHttpInfo( richMenuBatchRequest: RichMenuBatchRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = richMenuBatchRequest; const res = await this.httpClient.post( "/v2/bot/richmenu/validate/batch", params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Validate rich menu object @@ -1937,7 +1934,8 @@ export class MessagingApiClient { public async validateRichMenuObject( richMenuRequest: RichMenuRequest, ): Promise { - return (await this.validateRichMenuObjectWithHttpInfo(richMenuRequest))[1]; + return (await this.validateRichMenuObjectWithHttpInfo(richMenuRequest)) + .body; } /** @@ -1949,10 +1947,10 @@ export class MessagingApiClient { */ public async validateRichMenuObjectWithHttpInfo( richMenuRequest: RichMenuRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = richMenuRequest; const res = await this.httpClient.post("/v2/bot/richmenu/validate", params); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } } diff --git a/lib/module-attach/api/lineModuleAttachClient.ts b/lib/module-attach/api/lineModuleAttachClient.ts index 9a3cb1094..36308cf70 100644 --- a/lib/module-attach/api/lineModuleAttachClient.ts +++ b/lib/module-attach/api/lineModuleAttachClient.ts @@ -97,7 +97,7 @@ export class LineModuleAttachClient { scope, brandType, ) - )[1]; + ).body; } /** @@ -127,7 +127,7 @@ export class LineModuleAttachClient { basicSearchId?: string, scope?: string, brandType?: string, - ): Promise<[Response, AttachModuleResponse]> { + ): Promise> { const formParams = { grant_type: grantType, code: code, @@ -150,6 +150,6 @@ export class LineModuleAttachClient { "/module/auth/v1/token", formParams, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } } diff --git a/lib/module/api/lineModuleClient.ts b/lib/module/api/lineModuleClient.ts index b87e8033a..7d5a14d34 100644 --- a/lib/module/api/lineModuleClient.ts +++ b/lib/module/api/lineModuleClient.ts @@ -75,7 +75,7 @@ export class LineModuleClient { chatId, acquireChatControlRequest, ) - )[1]; + ).body; } /** @@ -89,7 +89,7 @@ export class LineModuleClient { public async acquireChatControlWithHttpInfo( chatId: string, acquireChatControlRequest?: AcquireChatControlRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = acquireChatControlRequest; const res = await this.httpClient.post( @@ -99,7 +99,7 @@ export class LineModuleClient { ), params, ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * The module channel admin calls the Detach API to detach the module channel from a LINE Official Account. @@ -110,7 +110,7 @@ export class LineModuleClient { public async detachModule( detachModuleRequest?: DetachModuleRequest, ): Promise { - return (await this.detachModuleWithHttpInfo(detachModuleRequest))[1]; + return (await this.detachModuleWithHttpInfo(detachModuleRequest)).body; } /** @@ -122,11 +122,11 @@ export class LineModuleClient { */ public async detachModuleWithHttpInfo( detachModuleRequest?: DetachModuleRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = detachModuleRequest; const res = await this.httpClient.post("/v2/bot/channel/detach", params); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * Gets a list of basic information about the bots of multiple LINE Official Accounts that have attached module channels. @@ -139,7 +139,7 @@ export class LineModuleClient { start?: string, limit?: number, ): Promise { - return (await this.getModulesWithHttpInfo(start, limit))[1]; + return (await this.getModulesWithHttpInfo(start, limit)).body; } /** @@ -153,14 +153,14 @@ export class LineModuleClient { public async getModulesWithHttpInfo( start?: string, limit?: number, - ): Promise<[Response, GetModulesResponse]> { + ): Promise> { const queryParams = { start: start, limit: limit, }; const res = await this.httpClient.get("/v2/bot/list", queryParams); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } /** * To return the initiative (Chat Control) of Active Channel to Primary Channel, call the Release Control API. @@ -171,7 +171,7 @@ export class LineModuleClient { public async releaseChatControl( chatId: string, ): Promise { - return (await this.releaseChatControlWithHttpInfo(chatId))[1]; + return (await this.releaseChatControlWithHttpInfo(chatId)).body; } /** @@ -183,13 +183,13 @@ export class LineModuleClient { */ public async releaseChatControlWithHttpInfo( chatId: string, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const res = await this.httpClient.post( "/v2/bot/chat/{chatId}/control/release".replace( "{chatId}", String(chatId), ), ); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } } diff --git a/lib/shop/api/shopClient.ts b/lib/shop/api/shopClient.ts index 44af92367..ac9e47914 100644 --- a/lib/shop/api/shopClient.ts +++ b/lib/shop/api/shopClient.ts @@ -66,7 +66,8 @@ export class ShopClient { public async missionStickerV3( missionStickerRequest: MissionStickerRequest, ): Promise { - return (await this.missionStickerV3WithHttpInfo(missionStickerRequest))[1]; + return (await this.missionStickerV3WithHttpInfo(missionStickerRequest)) + .body; } /** @@ -78,10 +79,10 @@ export class ShopClient { */ public async missionStickerV3WithHttpInfo( missionStickerRequest: MissionStickerRequest, - ): Promise<[Response, Types.MessageAPIResponseBase]> { + ): Promise> { const params = missionStickerRequest; const res = await this.httpClient.post("/shop/v3/mission", params); - return [res, await res.json()]; + return { httpResponse: res, body: await res.json() }; } } diff --git a/lib/types.ts b/lib/types.ts index 90617be9d..e9b7ac071 100644 --- a/lib/types.ts +++ b/lib/types.ts @@ -2950,3 +2950,8 @@ export type TestWebhookEndpointResponse = { reason: string; detail: string; }; + +export interface ApiResponseType { + httpResponse: Response; + body: T; +}