Skip to content

[TypeScript][Node] Resolve TS2532 error #6932

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

Merged
wing328 merged 3 commits into from
Nov 13, 2017
Merged

[TypeScript][Node] Resolve TS2532 error #6932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b78cb78
[TypeScript][Node] Resolve TS2532 error
S64 Nov 11, 2017
eafc8a6
Run `bin/typescript-node-petstore-all.sh`
S64 Nov 11, 2017
5c72777
Run `bin/security/typescript-node.sh`
S64 Nov 11, 2017
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
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/typescript-node/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ export class {{classname}} {
{{#returnType}}
body = ObjectSerializer.deserialize(body, "{{{returnType}}}");
{{/returnType}}
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down
42 changes: 21 additions & 21 deletions samples/client/petstore-security-test/typescript-node/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Do not edit the class manually.
*/

import request = require('request');
import localVarRequest = require('request');
import http = require('http');
import Promise = require('bluebird');

Expand Down Expand Up @@ -171,13 +171,13 @@ export interface Authentication {
/**
* Apply authentication settings to header and query params.
*/
applyToRequest(requestOptions: request.Options): void;
applyToRequest(requestOptions: localVarRequest.Options): void;
}

export class HttpBasicAuth implements Authentication {
public username: string;
public password: string;
applyToRequest(requestOptions: request.Options): void {
applyToRequest(requestOptions: localVarRequest.Options): void {
requestOptions.auth = {
username: this.username, password: this.password
}
Expand All @@ -190,7 +190,7 @@ export class ApiKeyAuth implements Authentication {
constructor(private location: string, private paramName: string) {
}

applyToRequest(requestOptions: request.Options): void {
applyToRequest(requestOptions: localVarRequest.Options): void {
if (this.location == "query") {
(<any>requestOptions.qs)[this.paramName] = this.apiKey;
} else if (this.location == "header" && requestOptions && requestOptions.headers) {
Expand All @@ -202,7 +202,7 @@ export class ApiKeyAuth implements Authentication {
export class OAuth implements Authentication {
public accessToken: string;

applyToRequest(requestOptions: request.Options): void {
applyToRequest(requestOptions: localVarRequest.Options): void {
if (requestOptions && requestOptions.headers) {
requestOptions.headers["Authorization"] = "Bearer " + this.accessToken;
}
Expand All @@ -212,7 +212,7 @@ export class OAuth implements Authentication {
export class VoidAuth implements Authentication {
public username: string;
public password: string;
applyToRequest(_: request.Options): void {
applyToRequest(_: localVarRequest.Options): void {
// Do nothing
}
}
Expand Down Expand Up @@ -275,41 +275,41 @@ export class FakeApi {
*/
public testCodeInjectEndRnNR (test code inject * &#39; &quot; &#x3D;end rn n r?: string) : Promise<{ response: http.ClientResponse; body?: any; }> {
const localVarPath = this.basePath + '/fake';
let queryParameters: any = {};
let headerParams: any = (<any>Object).assign({}, this.defaultHeaders);
let formParams: any = {};
let localVarQueryParameters: any = {};
let localVarHeaderParams: any = (<any>Object).assign({}, this.defaultHeaders);
let localVarFormParams: any = {};


let useFormData = false;
let localVarUseFormData = false;

if (test code inject * &#39; &quot; &#x3D;end rn n r !== undefined) {
formParams['test code inject */ &#39; &quot; &#x3D;end -- \r\n \n \r'] = ObjectSerializer.serialize(test code inject * &#39; &quot; &#x3D;end rn n r, "string");
localVarFormParams['test code inject */ &#39; &quot; &#x3D;end -- \r\n \n \r'] = ObjectSerializer.serialize(test code inject * &#39; &quot; &#x3D;end rn n r, "string");
}

let requestOptions: request.Options = {
let localVarRequestOptions: localVarRequest.Options = {
method: 'PUT',
qs: queryParameters,
headers: headerParams,
qs: localVarQueryParameters,
headers: localVarHeaderParams,
uri: localVarPath,
useQuerystring: this._useQuerystring,
json: true,
};

this.authentications.default.applyToRequest(requestOptions);
this.authentications.default.applyToRequest(localVarRequestOptions);

if (Object.keys(formParams).length) {
if (useFormData) {
(<any>requestOptions).formData = formParams;
if (Object.keys(localVarFormParams).length) {
if (localVarUseFormData) {
(<any>localVarRequestOptions).formData = localVarFormParams;
} else {
requestOptions.form = formParams;
localVarRequestOptions.form = localVarFormParams;
}
}
return new Promise<{ response: http.ClientResponse; body?: any; }>((resolve, reject) => {
request(requestOptions, (error, response, body) => {
localVarRequest(localVarRequestOptions, (error, response, body) => {
if (error) {
reject(error);
} else {
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down
40 changes: 20 additions & 20 deletions samples/client/petstore/typescript-node/default/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ export class PetApi {
if (error) {
reject(error);
} else {
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -622,7 +622,7 @@ export class PetApi {
if (error) {
reject(error);
} else {
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -680,7 +680,7 @@ export class PetApi {
reject(error);
} else {
body = ObjectSerializer.deserialize(body, "Array<Pet>");
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -738,7 +738,7 @@ export class PetApi {
reject(error);
} else {
body = ObjectSerializer.deserialize(body, "Array<Pet>");
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -793,7 +793,7 @@ export class PetApi {
reject(error);
} else {
body = ObjectSerializer.deserialize(body, "Pet");
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -847,7 +847,7 @@ export class PetApi {
if (error) {
reject(error);
} else {
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -911,7 +911,7 @@ export class PetApi {
if (error) {
reject(error);
} else {
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -977,7 +977,7 @@ export class PetApi {
reject(error);
} else {
body = ObjectSerializer.deserialize(body, "ApiResponse");
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -1081,7 +1081,7 @@ export class StoreApi {
if (error) {
reject(error);
} else {
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -1129,7 +1129,7 @@ export class StoreApi {
reject(error);
} else {
body = ObjectSerializer.deserialize(body, "{ [key: string]: number; }");
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -1182,7 +1182,7 @@ export class StoreApi {
reject(error);
} else {
body = ObjectSerializer.deserialize(body, "Order");
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -1235,7 +1235,7 @@ export class StoreApi {
reject(error);
} else {
body = ObjectSerializer.deserialize(body, "Order");
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -1339,7 +1339,7 @@ export class UserApi {
if (error) {
reject(error);
} else {
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -1391,7 +1391,7 @@ export class UserApi {
if (error) {
reject(error);
} else {
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -1443,7 +1443,7 @@ export class UserApi {
if (error) {
reject(error);
} else {
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -1495,7 +1495,7 @@ export class UserApi {
if (error) {
reject(error);
} else {
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -1548,7 +1548,7 @@ export class UserApi {
reject(error);
} else {
body = ObjectSerializer.deserialize(body, "User");
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -1614,7 +1614,7 @@ export class UserApi {
reject(error);
} else {
body = ObjectSerializer.deserialize(body, "string");
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -1659,7 +1659,7 @@ export class UserApi {
if (error) {
reject(error);
} else {
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down Expand Up @@ -1718,7 +1718,7 @@ export class UserApi {
if (error) {
reject(error);
} else {
if (response.statusCode >= 200 && response.statusCode <= 299) {
if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
resolve({ response: response, body: body });
} else {
reject({ response: response, body: body });
Expand Down
Loading