Merge pull request #325 from /issues/324/main

Call afterMiddleware before throwing error
go-generalize · Jul 7, 2022 · bae2eef · bae2eef
2 parents 2a94af0 + ea64532
commit bae2eef
Show file tree

Hide file tree

Showing 5 changed files with 175 additions and 65 deletions.
diff --git a/e2e/multipart/clients/ts/api_client.ts b/e2e/multipart/clients/ts/api_client.ts
@@ -24,6 +24,7 @@ export interface MiddlewareContext {
 	endpoint: string;
 	request: unknown;
 	response?: unknown;
+	responseBody?: string;
 	baseURL: string;
 	headers: {[key: string]: string};
 	options: {[key: string]: any};
@@ -181,11 +182,14 @@ class ParamClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as ParamPostBResponse;
+		const res = JSON.parse(responseText) as ParamPostBResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;
@@ -393,11 +397,14 @@ export class APIClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as PostAResponse;
+		const res = JSON.parse(responseText) as PostAResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;

diff --git a/pkg/client/typescript/templates/api.ts.tmpl b/pkg/client/typescript/templates/api.ts.tmpl
@@ -22,6 +22,7 @@ export interface MiddlewareContext {
 	endpoint: string;
 	request: unknown;
 	response?: unknown;
+	responseBody?: string;
 	baseURL: string;
 	headers: {[key: string]: string};
 	options: {[key: string]: any};
@@ -220,12 +221,15 @@ class {{ $elem.Name }} {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
 {{- 	if eq .HasResFields true }}
-		const res = (await resp.json()) as {{ $method.ResponseType }};
+		const res = JSON.parse(responseText) as {{ $method.ResponseType }};
 {{- 	else }}
 		await resp.text();
 		const res = {} as {{ $method.ResponseType }};
@@ -465,13 +469,16 @@ export class APIClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
 
 {{- if eq .HasResFields true }}
-		const res = (await resp.json()) as {{ $method.ResponseType }};
+		const res = JSON.parse(responseText) as {{ $method.ResponseType }};
 {{- else }}
 		await resp.text();
 		const res = {} as {{ $method.ResponseType }};

diff --git a/pkg/client/typescript/testdata/api_client.ts b/pkg/client/typescript/testdata/api_client.ts
@@ -68,6 +68,7 @@ export interface MiddlewareContext {
 	endpoint: string;
 	request: unknown;
 	response?: unknown;
+	responseBody?: string;
 	baseURL: string;
 	headers: {[key: string]: string};
 	options: {[key: string]: any};
@@ -248,11 +249,14 @@ class ServiceClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as ServiceGetArticleResponse;
+		const res = JSON.parse(responseText) as ServiceGetArticleResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;
@@ -396,11 +400,14 @@ class ServiceGroupsClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as ServiceGroupsGetGroupsResponse;
+		const res = JSON.parse(responseText) as ServiceGroupsGetGroupsResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;
@@ -587,11 +594,14 @@ class ServiceStaticPageClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as ServiceStaticPageGetStaticPageResponse;
+		const res = JSON.parse(responseText) as ServiceStaticPageGetStaticPageResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;
@@ -788,8 +798,11 @@ class ServiceUser2Client {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
 		await resp.text();
@@ -869,11 +882,14 @@ class ServiceUser2Client {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as ServiceUser2GetUserResponse;
+		const res = JSON.parse(responseText) as ServiceUser2GetUserResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;
@@ -965,11 +981,14 @@ class ServiceUser2Client {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as ServiceUser2PostUpdateUserNameResponse;
+		const res = JSON.parse(responseText) as ServiceUser2PostUpdateUserNameResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;
@@ -1047,11 +1066,14 @@ class ServiceUser2Client {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as ServiceUser2PostUpdateUserPasswordResponse;
+		const res = JSON.parse(responseText) as ServiceUser2PostUpdateUserPasswordResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;
@@ -1192,11 +1214,14 @@ class ServiceUser2UserIDClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as ServiceUser2UserIDGetUserJobGetResponse;
+		const res = JSON.parse(responseText) as ServiceUser2UserIDGetUserJobGetResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;
@@ -1328,11 +1353,14 @@ class ServiceUser2UserIDJobIDClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as ServiceUser2UserIDJobIDPutJobResponse;
+		const res = JSON.parse(responseText) as ServiceUser2UserIDJobIDPutJobResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;
@@ -1465,8 +1493,11 @@ class ServiceUserClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
 		await resp.text();
@@ -1548,11 +1579,14 @@ class ServiceUserClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as ServiceUserPostUpdateUserNameResponse;
+		const res = JSON.parse(responseText) as ServiceUserPostUpdateUserNameResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;
@@ -1630,11 +1664,14 @@ class ServiceUserClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as ServiceUserPostUpdateUserPasswordResponse;
+		const res = JSON.parse(responseText) as ServiceUserPostUpdateUserPasswordResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;
@@ -1825,11 +1862,14 @@ export class APIClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as GetResponse;
+		const res = JSON.parse(responseText) as GetResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;
@@ -1927,11 +1967,14 @@ export class APIClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as PostCreateTableResponse;
+		const res = JSON.parse(responseText) as PostCreateTableResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;
@@ -2015,11 +2058,14 @@ export class APIClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
-		const res = (await resp.json()) as PostCreateUserResponse;
+		const res = JSON.parse(responseText) as PostCreateUserResponse;
 		context.response = res;
 		await this.callMiddleware(this.afterMiddleware, context);
 		return res;

diff --git a/samples/empty_root/clients/ts/api_client.ts b/samples/empty_root/clients/ts/api_client.ts
@@ -19,6 +19,7 @@ export interface MiddlewareContext {
 	endpoint: string;
 	request: unknown;
 	response?: unknown;
+	responseBody?: string;
 	baseURL: string;
 	headers: {[key: string]: string};
 	options: {[key: string]: any};
@@ -165,8 +166,11 @@ class FooBarClient {
 			}
 		);
 
+		const responseText = await resp.text();
+		context.responseBody = responseText;
+
 		if (Math.floor(resp.status / 100) !== 2) {
-			const responseText = await resp.text();
+			await this.callMiddleware(this.afterMiddleware, context);
 			throw new ApiError(resp, responseText);
 		}
 		await resp.text();