Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

typescript-node: Use HttpError class when rejecting promises #3876

Merged
merged 3 commits into from Sep 12, 2019
Merged

typescript-node: Use HttpError class when rejecting promises #3876

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bb71d2
Use HttpError class when rejecting promises
simhnna Sep 11, 2019
d28a320
Update samples
simhnna Sep 12, 2019
4c20449
Test the new code in client.ts
simhnna Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions modules/openapi-generator/src/main/resources/typescript-node/api-all.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,12 @@ import { {{ classname }} } from './{{ classFilename }}';
export * from './{{ classFilename }}Interface'
{{/withInterfaces}}
{{/apis}}
import http = require('http');
export class HttpError extends Error {
constructor (public response: http.{{#supportsES6}}IncomingMessage{{/supportsES6}}{{^supportsES6}}ClientResponse{{/supportsES6}}, public body: any, public statusCode?: number) {
super('HTTP request failed');
this.name = 'HttpError';
}
}
export const APIS = [{{#apis}}{{#operations}}{{ classname }}{{/operations}}{{^-last}}, {{/-last}}{{/apis}}];
{{/apiInfo}}
4 changes: 3 additions & 1 deletion modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import { OAuth } from '../model/models';
{{/authMethods}}
{{/hasAuthMethods}}

import { HttpError } from './apis';

let defaultBasePath = '{{{basePath}}}';

// ===============================================
Expand Down Expand Up @@ -222,7 +224,7 @@ export class {{classname}} {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down
7 changes: 7 additions & 0 deletions samples/client/petstore/typescript-node/default/api/apis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,11 @@ export * from './storeApi';
import { StoreApi } from './storeApi';
export * from './userApi';
import { UserApi } from './userApi';
import http = require('http');
export class HttpError extends Error {
constructor (public response: http.ClientResponse, public body: any, public statusCode?: number) {
super('HTTP request failed');
this.name = 'HttpError';
}
}
export const APIS = [PetApi, StoreApi, UserApi];
18 changes: 10 additions & 8 deletions samples/client/petstore/typescript-node/default/api/petApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import { ObjectSerializer, Authentication, VoidAuth } from '../model/models';
import { OAuth } from '../model/models';
import { ApiKeyAuth } from '../model/models';

import { HttpError } from './apis';

let defaultBasePath = 'http://petstore.swagger.io/v2';

// ===============================================
Expand Down Expand Up @@ -129,7 +131,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -188,7 +190,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -249,7 +251,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -310,7 +312,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -368,7 +370,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -425,7 +427,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -492,7 +494,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -561,7 +563,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down
10 changes: 6 additions & 4 deletions samples/client/petstore/typescript-node/default/api/storeApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import { Order } from '../model/order';
import { ObjectSerializer, Authentication, VoidAuth } from '../model/models';
import { ApiKeyAuth } from '../model/models';

import { HttpError } from './apis';

let defaultBasePath = 'http://petstore.swagger.io/v2';

// ===============================================
Expand Down Expand Up @@ -120,7 +122,7 @@ export class StoreApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -171,7 +173,7 @@ export class StoreApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -227,7 +229,7 @@ export class StoreApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -283,7 +285,7 @@ export class StoreApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down
18 changes: 10 additions & 8 deletions samples/client/petstore/typescript-node/default/api/userApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import { User } from '../model/user';

import { ObjectSerializer, Authentication, VoidAuth } from '../model/models';

import { HttpError } from './apis';

let defaultBasePath = 'http://petstore.swagger.io/v2';

// ===============================================
Expand Down Expand Up @@ -117,7 +119,7 @@ export class UserApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -172,7 +174,7 @@ export class UserApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -227,7 +229,7 @@ export class UserApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -282,7 +284,7 @@ export class UserApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -338,7 +340,7 @@ export class UserApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -407,7 +409,7 @@ export class UserApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -455,7 +457,7 @@ export class UserApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -517,7 +519,7 @@ export class UserApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down
7 changes: 7 additions & 0 deletions samples/client/petstore/typescript-node/npm/api/apis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,11 @@ export * from './storeApi';
import { StoreApi } from './storeApi';
export * from './userApi';
import { UserApi } from './userApi';
import http = require('http');
export class HttpError extends Error {
constructor (public response: http.ClientResponse, public body: any, public statusCode?: number) {
super('HTTP request failed');
this.name = 'HttpError';
}
}
export const APIS = [PetApi, StoreApi, UserApi];
18 changes: 10 additions & 8 deletions samples/client/petstore/typescript-node/npm/api/petApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import { ObjectSerializer, Authentication, VoidAuth } from '../model/models';
import { OAuth } from '../model/models';
import { ApiKeyAuth } from '../model/models';

import { HttpError } from './apis';

let defaultBasePath = 'http://petstore.swagger.io/v2';

// ===============================================
Expand Down Expand Up @@ -129,7 +131,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -188,7 +190,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -249,7 +251,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -310,7 +312,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -368,7 +370,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -425,7 +427,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -492,7 +494,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -561,7 +563,7 @@ export class PetApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down
10 changes: 6 additions & 4 deletions samples/client/petstore/typescript-node/npm/api/storeApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import { Order } from '../model/order';
import { ObjectSerializer, Authentication, VoidAuth } from '../model/models';
import { ApiKeyAuth } from '../model/models';

import { HttpError } from './apis';

let defaultBasePath = 'http://petstore.swagger.io/v2';

// ===============================================
Expand Down Expand Up @@ -120,7 +122,7 @@ export class StoreApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -171,7 +173,7 @@ export class StoreApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -227,7 +229,7 @@ export class StoreApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down Expand Up @@ -283,7 +285,7 @@ export class StoreApi {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
reject(new HttpError(response, body, response.statusCode));
}
}
});
Expand Down
Loading