diff --git a/e2e/multipart/clients/ts/api_client.ts b/e2e/multipart/clients/ts/api_client.ts index 89699736..ec673f39 100644 --- a/e2e/multipart/clients/ts/api_client.ts +++ b/e2e/multipart/clients/ts/api_client.ts @@ -26,6 +26,7 @@ export interface MiddlewareContext { response?: unknown; responseBody?: string; responseHeaders?: Headers; + statusCode?: number; baseURL: string; headers: {[key: string]: string}; options: {[key: string]: any}; @@ -186,6 +187,7 @@ class ParamClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -402,6 +404,7 @@ export class APIClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); diff --git a/pkg/client/typescript/templates/api.ts.tmpl b/pkg/client/typescript/templates/api.ts.tmpl index 92be03c8..ec677da1 100644 --- a/pkg/client/typescript/templates/api.ts.tmpl +++ b/pkg/client/typescript/templates/api.ts.tmpl @@ -24,6 +24,7 @@ export interface MiddlewareContext { response?: unknown; responseBody?: string; responseHeaders?: Headers; + statusCode?: number; baseURL: string; headers: {[key: string]: string}; options: {[key: string]: any}; @@ -225,6 +226,7 @@ class {{ $elem.Name }} { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -473,6 +475,7 @@ export class APIClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); diff --git a/pkg/client/typescript/testdata/api_client.ts b/pkg/client/typescript/testdata/api_client.ts index bfbda62d..465e18e4 100755 --- a/pkg/client/typescript/testdata/api_client.ts +++ b/pkg/client/typescript/testdata/api_client.ts @@ -70,6 +70,7 @@ export interface MiddlewareContext { response?: unknown; responseBody?: string; responseHeaders?: Headers; + statusCode?: number; baseURL: string; headers: {[key: string]: string}; options: {[key: string]: any}; @@ -253,6 +254,7 @@ class ServiceClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -405,6 +407,7 @@ class ServiceGroupsClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -600,6 +603,7 @@ class ServiceStaticPageClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -805,6 +809,7 @@ class ServiceUser2Client { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -889,6 +894,7 @@ class ServiceUser2Client { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -989,6 +995,7 @@ class ServiceUser2Client { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1075,6 +1082,7 @@ class ServiceUser2Client { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1224,6 +1232,7 @@ class ServiceUser2UserIDClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1364,6 +1373,7 @@ class ServiceUser2UserIDJobIDClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1505,6 +1515,7 @@ class ServiceUserClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1591,6 +1602,7 @@ class ServiceUserClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1677,6 +1689,7 @@ class ServiceUserClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1876,6 +1889,7 @@ export class APIClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1982,6 +1996,7 @@ export class APIClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -2074,6 +2089,7 @@ export class APIClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); diff --git a/samples/empty_root/clients/ts/api_client.ts b/samples/empty_root/clients/ts/api_client.ts index bcafb9e8..427621e3 100644 --- a/samples/empty_root/clients/ts/api_client.ts +++ b/samples/empty_root/clients/ts/api_client.ts @@ -21,6 +21,7 @@ export interface MiddlewareContext { response?: unknown; responseBody?: string; responseHeaders?: Headers; + statusCode?: number; baseURL: string; headers: {[key: string]: string}; options: {[key: string]: any}; @@ -170,6 +171,7 @@ class FooBarClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); diff --git a/samples/standard/clients/ts/api_client.ts b/samples/standard/clients/ts/api_client.ts index 514b5f4f..dffc2b99 100644 --- a/samples/standard/clients/ts/api_client.ts +++ b/samples/standard/clients/ts/api_client.ts @@ -70,6 +70,7 @@ export interface MiddlewareContext { response?: unknown; responseBody?: string; responseHeaders?: Headers; + statusCode?: number; baseURL: string; headers: {[key: string]: string}; options: {[key: string]: any}; @@ -253,6 +254,7 @@ class ServiceClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -405,6 +407,7 @@ class ServiceGroupsClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -600,6 +603,7 @@ class ServiceStaticPageClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -805,6 +809,7 @@ class ServiceUser2Client { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -889,6 +894,7 @@ class ServiceUser2Client { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -989,6 +995,7 @@ class ServiceUser2Client { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1075,6 +1082,7 @@ class ServiceUser2Client { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1224,6 +1232,7 @@ class ServiceUser2UserIDClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1364,6 +1373,7 @@ class ServiceUser2UserIDJobIDClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1505,6 +1515,7 @@ class ServiceUserClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1591,6 +1602,7 @@ class ServiceUserClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1677,6 +1689,7 @@ class ServiceUserClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1876,6 +1889,7 @@ export class APIClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -1982,6 +1996,7 @@ export class APIClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context); @@ -2074,6 +2089,7 @@ export class APIClient { const responseText = await resp.text(); context.responseBody = responseText; context.responseHeaders = resp.headers; + context.statusCode = resp.status; if (Math.floor(resp.status / 100) !== 2) { await this.callMiddleware(this.afterMiddleware, context);