Reverted: http library.send returns string again

This commit is contained in:
Tino Fuhrmann 2018-10-17 17:36:41 +02:00
parent 0da5238e24
commit dd7d8c0271
20 changed files with 258 additions and 654 deletions

View File

@ -118,9 +118,10 @@ export class {{classname}}ResponseProcessor {
* @throws {{{returnType}}} if the httpStatusCode is not in [200, 299]
*/
public {{nickname}}(response: ResponseContext): {{#returnType}} {{{returnType}}}{{/returnType}} {{^returnType}} void {{/returnType}} {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
{{#returnType}}
const body: {{{returnType}}} = ObjectSerializer.deserialize(response.body, "{{{returnType}}}") as {{{returnType}}};
const body: {{{returnType}}} = ObjectSerializer.deserialize(jsonBody, "{{{returnType}}}") as {{{returnType}}};
if (responseOK) {
return body;
} else {

View File

@ -1,4 +1,5 @@
export * from './http/http';
export { IsomorphicFetchHttpLibrary } from './http/isomorphic-fetch';
export * from './auth/auth';
export * from './middleware';
export * from './models/all';

View File

@ -21,7 +21,7 @@ export class IsomorphicFetchHttpLibrary implements HttpLibrary {
headers[key] = (headers[key] as Array<string>).join("; ");
}
return resp.json().then((body) => {
return resp.text().then((body: string) => {
return new ResponseContext(resp.status, headers, body)
});
});

View File

@ -27,12 +27,7 @@
"url-parse": "^1.4.3"
},
"devDependencies": {
"ts-node": "^7.0.0",
"typescript": "^2.9.2",
"@types/chai": "^4.1.4",
"@types/mocha": "^5.2.5",
"chai": "^4.1.2",
"mocha": "^5.2.0"
"typescript": "^2.9.2"
}{{#npmRepository}},{{/npmRepository}}
{{#npmRepository}}
"publishConfig":{

View File

@ -321,6 +321,7 @@ export class PetApiResponseProcessor {
* @throws if the httpStatusCode is not in [200, 299]
*/
public addPet(response: ResponseContext): void {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
// TODO: make this based on status code!
if (!responseOK) {
@ -333,6 +334,7 @@ export class PetApiResponseProcessor {
* @throws if the httpStatusCode is not in [200, 299]
*/
public deletePet(response: ResponseContext): void {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
// TODO: make this based on status code!
if (!responseOK) {
@ -345,8 +347,9 @@ export class PetApiResponseProcessor {
* @throws Array<Pet> if the httpStatusCode is not in [200, 299]
*/
public findPetsByStatus(response: ResponseContext): Array<Pet> {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
const body: Array<Pet> = ObjectSerializer.deserialize(response.body, "Array<Pet>") as Array<Pet>;
const body: Array<Pet> = ObjectSerializer.deserialize(jsonBody, "Array<Pet>") as Array<Pet>;
if (responseOK) {
return body;
} else {
@ -360,8 +363,9 @@ export class PetApiResponseProcessor {
* @throws Array<Pet> if the httpStatusCode is not in [200, 299]
*/
public findPetsByTags(response: ResponseContext): Array<Pet> {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
const body: Array<Pet> = ObjectSerializer.deserialize(response.body, "Array<Pet>") as Array<Pet>;
const body: Array<Pet> = ObjectSerializer.deserialize(jsonBody, "Array<Pet>") as Array<Pet>;
if (responseOK) {
return body;
} else {
@ -375,8 +379,9 @@ export class PetApiResponseProcessor {
* @throws Pet if the httpStatusCode is not in [200, 299]
*/
public getPetById(response: ResponseContext): Pet {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
const body: Pet = ObjectSerializer.deserialize(response.body, "Pet") as Pet;
const body: Pet = ObjectSerializer.deserialize(jsonBody, "Pet") as Pet;
if (responseOK) {
return body;
} else {
@ -390,6 +395,7 @@ export class PetApiResponseProcessor {
* @throws if the httpStatusCode is not in [200, 299]
*/
public updatePet(response: ResponseContext): void {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
// TODO: make this based on status code!
if (!responseOK) {
@ -402,6 +408,7 @@ export class PetApiResponseProcessor {
* @throws if the httpStatusCode is not in [200, 299]
*/
public updatePetWithForm(response: ResponseContext): void {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
// TODO: make this based on status code!
if (!responseOK) {
@ -414,8 +421,9 @@ export class PetApiResponseProcessor {
* @throws ApiResponse if the httpStatusCode is not in [200, 299]
*/
public uploadFile(response: ResponseContext): ApiResponse {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
const body: ApiResponse = ObjectSerializer.deserialize(response.body, "ApiResponse") as ApiResponse;
const body: ApiResponse = ObjectSerializer.deserialize(jsonBody, "ApiResponse") as ApiResponse;
if (responseOK) {
return body;
} else {

View File

@ -137,6 +137,7 @@ export class StoreApiResponseProcessor {
* @throws if the httpStatusCode is not in [200, 299]
*/
public deleteOrder(response: ResponseContext): void {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
// TODO: make this based on status code!
if (!responseOK) {
@ -149,8 +150,9 @@ export class StoreApiResponseProcessor {
* @throws { [key: string]: number; } if the httpStatusCode is not in [200, 299]
*/
public getInventory(response: ResponseContext): { [key: string]: number; } {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
const body: { [key: string]: number; } = ObjectSerializer.deserialize(response.body, "{ [key: string]: number; }") as { [key: string]: number; };
const body: { [key: string]: number; } = ObjectSerializer.deserialize(jsonBody, "{ [key: string]: number; }") as { [key: string]: number; };
if (responseOK) {
return body;
} else {
@ -164,8 +166,9 @@ export class StoreApiResponseProcessor {
* @throws Order if the httpStatusCode is not in [200, 299]
*/
public getOrderById(response: ResponseContext): Order {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
const body: Order = ObjectSerializer.deserialize(response.body, "Order") as Order;
const body: Order = ObjectSerializer.deserialize(jsonBody, "Order") as Order;
if (responseOK) {
return body;
} else {
@ -179,8 +182,9 @@ export class StoreApiResponseProcessor {
* @throws Order if the httpStatusCode is not in [200, 299]
*/
public placeOrder(response: ResponseContext): Order {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
const body: Order = ObjectSerializer.deserialize(response.body, "Order") as Order;
const body: Order = ObjectSerializer.deserialize(jsonBody, "Order") as Order;
if (responseOK) {
return body;
} else {

View File

@ -275,6 +275,7 @@ export class UserApiResponseProcessor {
* @throws if the httpStatusCode is not in [200, 299]
*/
public createUser(response: ResponseContext): void {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
// TODO: make this based on status code!
if (!responseOK) {
@ -287,6 +288,7 @@ export class UserApiResponseProcessor {
* @throws if the httpStatusCode is not in [200, 299]
*/
public createUsersWithArrayInput(response: ResponseContext): void {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
// TODO: make this based on status code!
if (!responseOK) {
@ -299,6 +301,7 @@ export class UserApiResponseProcessor {
* @throws if the httpStatusCode is not in [200, 299]
*/
public createUsersWithListInput(response: ResponseContext): void {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
// TODO: make this based on status code!
if (!responseOK) {
@ -311,6 +314,7 @@ export class UserApiResponseProcessor {
* @throws if the httpStatusCode is not in [200, 299]
*/
public deleteUser(response: ResponseContext): void {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
// TODO: make this based on status code!
if (!responseOK) {
@ -323,8 +327,9 @@ export class UserApiResponseProcessor {
* @throws User if the httpStatusCode is not in [200, 299]
*/
public getUserByName(response: ResponseContext): User {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
const body: User = ObjectSerializer.deserialize(response.body, "User") as User;
const body: User = ObjectSerializer.deserialize(jsonBody, "User") as User;
if (responseOK) {
return body;
} else {
@ -338,8 +343,9 @@ export class UserApiResponseProcessor {
* @throws string if the httpStatusCode is not in [200, 299]
*/
public loginUser(response: ResponseContext): string {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
const body: string = ObjectSerializer.deserialize(response.body, "string") as string;
const body: string = ObjectSerializer.deserialize(jsonBody, "string") as string;
if (responseOK) {
return body;
} else {
@ -353,6 +359,7 @@ export class UserApiResponseProcessor {
* @throws if the httpStatusCode is not in [200, 299]
*/
public logoutUser(response: ResponseContext): void {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
// TODO: make this based on status code!
if (!responseOK) {
@ -365,6 +372,7 @@ export class UserApiResponseProcessor {
* @throws if the httpStatusCode is not in [200, 299]
*/
public updateUser(response: ResponseContext): void {
const jsonBody = JSON.parse(response.body);
const responseOK = response.httpStatusCode && response.httpStatusCode >= 200 && response.httpStatusCode <= 299;
// TODO: make this based on status code!
if (!responseOK) {

View File

@ -21,7 +21,7 @@ export class IsomorphicFetchHttpLibrary implements HttpLibrary {
headers[key] = (headers[key] as Array<string>).join("; ");
}
return resp.json().then((body) => {
return resp.text().then((body: string) => {
return new ResponseContext(resp.status, headers, body)
});
});

View File

@ -1,4 +1,5 @@
export * from './http/http';
export { IsomorphicFetchHttpLibrary } from './http/isomorphic-fetch';
export * from './auth/auth';
export * from './middleware';
export * from './models/all';

View File

@ -4,12 +4,6 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"@types/chai": {
"version": "4.1.6",
"resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.6.tgz",
"integrity": "sha512-CBk7KTZt3FhPsEkYioG6kuCIpWISw+YI8o+3op4+NXwTpvAPxE1ES8+PY8zfaK2L98b1z5oq03UHa4VYpeUxnw==",
"dev": true
},
"@types/form-data": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz",
@ -23,87 +17,21 @@
"resolved": "https://registry.npmjs.org/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.34.tgz",
"integrity": "sha1-PDSD5gbAQTeEOOlRRk8A5OYHBtY="
},
"@types/mocha": {
"version": "5.2.5",
"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.5.tgz",
"integrity": "sha512-lAVp+Kj54ui/vLUFxsJTMtWvZraZxum3w3Nwkble2dNuV5VnPA+Mi2oGX9XYJAaIvZi3tn3cbjS/qcJXRb6Bww==",
"dev": true
},
"@types/node": {
"version": "10.12.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.0.tgz",
"integrity": "sha512-3TUHC3jsBAB7qVRGxT6lWyYo2v96BMmD2PTcl47H25Lu7UXtFH/2qqmKiVrnel6Ne//0TFYf6uvNX+HW2FRkLQ=="
},
"arrify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
"dev": true
},
"assertion-error": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
"integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
"dev": true
},
"asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
},
"balanced-match": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
"dev": true
},
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
"browser-stdout": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
"dev": true
},
"btoa": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
"integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
},
"buffer-from": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
"dev": true
},
"chai": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
"integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
"dev": true,
"requires": {
"assertion-error": "^1.1.0",
"check-error": "^1.0.2",
"deep-eql": "^3.0.1",
"get-func-name": "^2.0.0",
"pathval": "^1.1.0",
"type-detect": "^4.0.5"
}
},
"check-error": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
"integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
"dev": true
},
"combined-stream": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
@ -112,47 +40,11 @@
"delayed-stream": "~1.0.0"
}
},
"commander": {
"version": "2.15.1",
"resolved": "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
"dev": true
},
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true
},
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"dev": true,
"requires": {
"ms": "2.0.0"
}
},
"deep-eql": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
"integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
"dev": true,
"requires": {
"type-detect": "^4.0.0"
}
},
"delayed-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
},
"diff": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
"integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
"dev": true
},
"encoding": {
"version": "0.1.12",
"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
@ -166,12 +58,6 @@
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
"integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg=="
},
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
"dev": true
},
"form-data": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
@ -182,50 +68,6 @@
"mime-types": "^2.1.12"
}
},
"fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true
},
"get-func-name": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
"integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
"dev": true
},
"glob": {
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
"dev": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
"minimatch": "^3.0.4",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
},
"growl": {
"version": "1.10.5",
"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
"integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
"dev": true
},
"has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
"dev": true
},
"he": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
"dev": true
},
"iconv-lite": {
"version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@ -234,22 +76,6 @@
"safer-buffer": ">= 2.1.2 < 3"
}
},
"inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"dev": true,
"requires": {
"once": "^1.3.0",
"wrappy": "1"
}
},
"inherits": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
"dev": true
},
"is-stream": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
@ -264,12 +90,6 @@
"whatwg-fetch": ">=0.10.0"
}
},
"make-error": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
"integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
"dev": true
},
"mime-db": {
"version": "1.36.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
@ -283,55 +103,6 @@
"mime-db": "~1.36.0"
}
},
"minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
"version": "0.0.8",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"dev": true
},
"mkdirp": {
"version": "0.5.1",
"resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
"requires": {
"minimist": "0.0.8"
}
},
"mocha": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
"integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
"dev": true,
"requires": {
"browser-stdout": "1.3.1",
"commander": "2.15.1",
"debug": "3.1.0",
"diff": "3.5.0",
"escape-string-regexp": "1.0.5",
"glob": "7.1.2",
"growl": "1.10.5",
"he": "1.1.1",
"minimatch": "3.0.4",
"mkdirp": "0.5.1",
"supports-color": "5.4.0"
}
},
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
"dev": true
},
"node-fetch": {
"version": "1.7.3",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
@ -341,27 +112,6 @@
"is-stream": "^1.0.1"
}
},
"once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true,
"requires": {
"wrappy": "1"
}
},
"path-is-absolute": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true
},
"pathval": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
"integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
"dev": true
},
"querystringify": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
@ -377,61 +127,6 @@
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
},
"source-map-support": {
"version": "0.5.9",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
"integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
"dev": true,
"requires": {
"buffer-from": "^1.0.0",
"source-map": "^0.6.0"
}
},
"supports-color": {
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"dev": true,
"requires": {
"has-flag": "^3.0.0"
}
},
"ts-node": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz",
"integrity": "sha512-BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==",
"dev": true,
"requires": {
"arrify": "^1.0.0",
"buffer-from": "^1.1.0",
"diff": "^3.1.0",
"make-error": "^1.1.1",
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",
"source-map-support": "^0.5.6",
"yn": "^2.0.0"
},
"dependencies": {
"minimist": {
"version": "1.2.0",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true
}
}
},
"type-detect": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
"dev": true
},
"typescript": {
"version": "2.9.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
@ -451,18 +146,6 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
"integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
},
"wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true
},
"yn": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
"integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=",
"dev": true
}
}
}

View File

@ -27,11 +27,6 @@
"url-parse": "^1.4.3"
},
"devDependencies": {
"ts-node": "^7.0.0",
"typescript": "^2.9.2",
"@types/chai": "^4.1.4",
"@types/mocha": "^5.2.5",
"chai": "^4.1.2",
"mocha": "^5.2.0"
"typescript": "^2.9.2"
}
}

View File

@ -18,7 +18,7 @@ describe("Security Authentication", function () {
// TODO: make all params const variables
it("Header API Key", function () {
var ctx = new ts_petstore_client_2.RequestContext("http://google.com", ts_petstore_client_2.HttpMethod.GET);
var auth = new ts_petstore_client_1.APIKeyAuthentication("my_name", "paramName", "apiKey", "header");
var auth = new ts_petstore_client_1.APIKeyAuthentication("my_name", "paramName", "header", "apiKey");
auth.applySecurityAuthentication(ctx);
chai_1.expect(ctx.getUrl()).to.equal("http://google.com");
chai_1.expect(ctx.getHeaders()).to.have.property("paramName");
@ -27,7 +27,7 @@ describe("Security Authentication", function () {
});
it("Query API Key", function () {
var ctx = new ts_petstore_client_2.RequestContext("http://google.com?a=b", ts_petstore_client_2.HttpMethod.GET);
var auth = new ts_petstore_client_1.APIKeyAuthentication("my_name", "paramName", "apiKey", "query");
var auth = new ts_petstore_client_1.APIKeyAuthentication("my_name", "paramName", "query", "apiKey");
auth.applySecurityAuthentication(ctx);
chai_1.expect(ctx.getUrl()).to.contain("paramName=apiKey");
chai_1.expect(ctx.getHeaders()).to.deep.equal({});
@ -35,7 +35,7 @@ describe("Security Authentication", function () {
});
it("Cookie API Key", function () {
var ctx = new ts_petstore_client_2.RequestContext("http://google.com", ts_petstore_client_2.HttpMethod.GET);
var auth = new ts_petstore_client_1.APIKeyAuthentication("my_name", "paramName", "apiKey", "cookie");
var auth = new ts_petstore_client_1.APIKeyAuthentication("my_name", "paramName", "cookie", "apiKey");
auth.applySecurityAuthentication(ctx);
chai_1.expect(ctx.getUrl()).to.equal("http://google.com");
chai_1.expect(ctx.getHeaders()).to.have.property("Cookie");

View File

@ -1,11 +1,10 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var ts_petstore_client_1 = require("ts-petstore-client");
var ts_petstore_client_2 = require("ts-petstore-client");
var chai_1 = require("chai");
var FormData = require("form-data");
var libs = {
"isomorphic-fetch": new ts_petstore_client_2.IsomorphicFetchHttpLibrary()
"isomorphic-fetch": new ts_petstore_client_1.IsomorphicFetchHttpLibrary()
};
var _loop_1 = function (libName) {
var lib = libs[libName];

View File

@ -0,0 +1,27 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var ts_petstore_client_1 = require("ts-petstore-client");
var MiddlewareA = /** @class */ (function () {
function MiddlewareA() {
}
MiddlewareA.prototype.pre = function (request) {
console.log(request);
return Promise.resolve(request);
};
MiddlewareA.prototype.post = function (response) {
console.log(response);
return Promise.resolve(response);
};
return MiddlewareA;
}());
var config = new ts_petstore_client_1.Configuration({
middleware: [
new MiddlewareA()
]
});
var api = new ts_petstore_client_1.PetApi(config);
api.getPetById(3).then(function (pet) {
console.log(pet);
}).catch(function (err) {
console.log(err);
});

View File

@ -0,0 +1,46 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var ts_petstore_client_1 = require("ts-petstore-client");
var ts_petstore_client_2 = require("ts-petstore-client");
var chai_1 = require("chai");
describe("Security Authentication", function () {
describe("No Authentication", function () {
it("No Authentication", function () {
var ctx = new ts_petstore_client_2.RequestContext("http://google.com", ts_petstore_client_2.HttpMethod.GET);
var noAuth = new ts_petstore_client_1.NoAuthentication();
noAuth.applySecurityAuthentication(ctx);
chai_1.expect(ctx.getUrl()).to.equal("http://google.com");
chai_1.expect(ctx.getHeaders()).to.deep.equal({});
chai_1.expect(ctx.getBody()).to.equal("");
});
});
describe("API Key Authentication", function () {
// TODO: make all params const variables
it("Header API Key", function () {
var ctx = new ts_petstore_client_2.RequestContext("http://google.com", ts_petstore_client_2.HttpMethod.GET);
var auth = new ts_petstore_client_1.APIKeyAuthentication("my_name", "paramName", "header", "apiKey");
auth.applySecurityAuthentication(ctx);
chai_1.expect(ctx.getUrl()).to.equal("http://google.com");
chai_1.expect(ctx.getHeaders()).to.have.property("paramName");
chai_1.expect(ctx.getHeaders()["paramName"]).to.equal("apiKey");
chai_1.expect(ctx.getBody()).to.equal("");
});
it("Query API Key", function () {
var ctx = new ts_petstore_client_2.RequestContext("http://google.com?a=b", ts_petstore_client_2.HttpMethod.GET);
var auth = new ts_petstore_client_1.APIKeyAuthentication("my_name", "paramName", "query", "apiKey");
auth.applySecurityAuthentication(ctx);
chai_1.expect(ctx.getUrl()).to.contain("paramName=apiKey");
chai_1.expect(ctx.getHeaders()).to.deep.equal({});
chai_1.expect(ctx.getBody()).to.equal("");
});
it("Cookie API Key", function () {
var ctx = new ts_petstore_client_2.RequestContext("http://google.com", ts_petstore_client_2.HttpMethod.GET);
var auth = new ts_petstore_client_1.APIKeyAuthentication("my_name", "paramName", "cookie", "apiKey");
auth.applySecurityAuthentication(ctx);
chai_1.expect(ctx.getUrl()).to.equal("http://google.com");
chai_1.expect(ctx.getHeaders()).to.have.property("Cookie");
chai_1.expect(ctx.getHeaders()["Cookie"]).to.contain("paramName=apiKey; ");
chai_1.expect(ctx.getBody()).to.equal("");
});
});
});

View File

@ -0,0 +1,64 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var ts_petstore_client_1 = require("ts-petstore-client");
var chai_1 = require("chai");
var FormData = require("form-data");
var libs = {
"isomorphic-fetch": new ts_petstore_client_1.IsomorphicFetchHttpLibrary()
};
var _loop_1 = function (libName) {
var lib = libs[libName];
describe("Isomorphic Fetch", function () {
it("GET-Request", function (done) {
var requestContext = new ts_petstore_client_1.RequestContext("http://httpbin.org/get", ts_petstore_client_1.HttpMethod.GET);
requestContext.setHeaderParam("X-Test-Token", "Test-Token");
requestContext.addCookie("test-cookie", "cookie-value");
lib.send(requestContext).then(function (resp) {
chai_1.expect(resp.httpStatusCode, "Expected status code to be 200").to.eq(200);
var body = JSON.parse(resp.body);
chai_1.expect(body["headers"]).to.exist;
chai_1.expect(body["headers"]["X-Test-Token"]).to.equal("Test-Token");
chai_1.expect(body["headers"]["Cookie"]).to.equal("test-cookie=cookie-value;");
done();
}).catch(function (e) {
done(e);
});
});
it("POST-Request", function (done) {
var requestContext = new ts_petstore_client_1.RequestContext("http://httpbin.org/post", ts_petstore_client_1.HttpMethod.POST);
requestContext.setHeaderParam("X-Test-Token", "Test-Token");
requestContext.addCookie("test-cookie", "cookie-value");
var formData = new FormData();
formData.append("test", "test2");
formData.append("testFile", Buffer.from("abc"), "fileName.json");
requestContext.setBody(formData);
lib.send(requestContext).then(function (resp) {
chai_1.expect(resp.httpStatusCode, "Expected status code to be 200").to.eq(200);
var body = JSON.parse(resp.body);
chai_1.expect(body["headers"]).to.exist;
chai_1.expect(body["headers"]["X-Test-Token"]).to.equal("Test-Token");
chai_1.expect(body["headers"]["Cookie"]).to.equal("test-cookie=cookie-value;");
chai_1.expect(body["files"]["testFile"]).to.equal("abc");
chai_1.expect(body["form"]["test"]).to.equal("test2");
done();
}).catch(function (e) {
done(e);
});
});
it("Cookies-Request", function (done) {
var requestContext = new ts_petstore_client_1.RequestContext("http://httpbin.org/cookies", ts_petstore_client_1.HttpMethod.GET);
requestContext.addCookie("test-cookie", "cookie-value");
lib.send(requestContext).then(function (resp) {
chai_1.expect(resp.httpStatusCode, "Expected status code to be 200").to.eq(200);
var body = JSON.parse(resp.body);
chai_1.expect(body["cookies"]["test-cookie"]).to.equal("cookie-value");
done();
}).catch(function (e) {
done(e);
});
});
});
};
for (var libName in libs) {
_loop_1(libName);
}

View File

@ -5,9 +5,9 @@
"requires": true,
"dependencies": {
"@types/chai": {
"version": "4.1.4",
"resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.4.tgz",
"integrity": "sha512-h6+VEw2Vr3ORiFCyyJmcho2zALnUq9cvdB/IO8Xs9itrJVCenC7o26A6+m7D0ihTTr65eS259H5/Ghl/VjYs6g==",
"version": "4.1.6",
"resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.6.tgz",
"integrity": "sha512-CBk7KTZt3FhPsEkYioG6kuCIpWISw+YI8o+3op4+NXwTpvAPxE1ES8+PY8zfaK2L98b1z5oq03UHa4VYpeUxnw==",
"dev": true
},
"@types/form-data": {
@ -19,9 +19,9 @@
},
"dependencies": {
"@types/node": {
"version": "10.5.8",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.8.tgz",
"integrity": "sha512-sWSjw+bYW/2W+1V3m8tVsm9PKJcxk3NHN7oRqNUfEdofKg0Imbdu1dQbFvLKjZQXEDXRN6IfSMACjJ7Wv4NGCQ=="
"version": "10.12.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.0.tgz",
"integrity": "sha512-3TUHC3jsBAB7qVRGxT6lWyYo2v96BMmD2PTcl47H25Lu7UXtFH/2qqmKiVrnel6Ne//0TFYf6uvNX+HW2FRkLQ=="
}
}
},
@ -38,9 +38,9 @@
"dev": true
},
"@types/node": {
"version": "8.10.25",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.25.tgz",
"integrity": "sha512-WXvAXaknB0c2cJ7N44e1kUrVu5K90mSfPPaT5XxfuSMxEWva86EYIwxUZM3jNZ2P1CIC9e2z4WJqpAF69PQxeA==",
"version": "8.10.36",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.36.tgz",
"integrity": "sha512-SL6KhfM7PTqiFmbCW3eVNwVBZ+88Mrzbuvn9olPsfv43mbiWaFY+nRcz/TGGku0/lc2FepdMbImdMY1JrQ+zbw==",
"dev": true
},
"ansi-styles": {
@ -96,17 +96,17 @@
"dev": true
},
"chai": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz",
"integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=",
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
"integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
"dev": true,
"requires": {
"assertion-error": "^1.0.1",
"check-error": "^1.0.1",
"deep-eql": "^3.0.0",
"assertion-error": "^1.1.0",
"check-error": "^1.0.2",
"deep-eql": "^3.0.1",
"get-func-name": "^2.0.0",
"pathval": "^1.0.0",
"type-detect": "^4.0.0"
"pathval": "^1.1.0",
"type-detect": "^4.0.5"
}
},
"chalk": {
@ -126,29 +126,29 @@
"dev": true
},
"color-convert": {
"version": "1.9.2",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
"integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
"version": "1.9.3",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
"requires": {
"color-name": "1.1.1"
"color-name": "1.1.3"
}
},
"color-name": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
"integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok="
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
},
"combined-stream": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
"integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
"integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
"requires": {
"delayed-stream": "~1.0.0"
}
},
"commander": {
"version": "2.15.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
"resolved": "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
"dev": true
},
@ -225,12 +225,12 @@
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
},
"form-data": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
"integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
"requires": {
"asynckit": "^0.4.0",
"combined-stream": "1.0.6",
"combined-stream": "^1.0.6",
"mime-types": "^2.1.12"
}
},
@ -315,7 +315,7 @@
},
"json5": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
"resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
"dev": true
},
@ -331,9 +331,9 @@
}
},
"make-error": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz",
"integrity": "sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g=="
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
"integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g=="
},
"memory-fs": {
"version": "0.4.1",
@ -346,16 +346,16 @@
}
},
"mime-db": {
"version": "1.35.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz",
"integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="
"version": "1.36.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
"integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw=="
},
"mime-types": {
"version": "2.1.19",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
"integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
"version": "2.1.20",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz",
"integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
"requires": {
"mime-db": "~1.35.0"
"mime-db": "~1.36.0"
}
},
"minimatch": {
@ -369,12 +369,12 @@
},
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
},
"mkdirp": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"requires": {
"minimist": "0.0.8"
@ -382,7 +382,7 @@
"dependencies": {
"minimist": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
}
}
@ -404,6 +404,17 @@
"minimatch": "3.0.4",
"mkdirp": "0.5.1",
"supports-color": "5.4.0"
},
"dependencies": {
"supports-color": {
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"dev": true,
"requires": {
"has-flag": "^3.0.0"
}
}
}
},
"ms": {
@ -458,7 +469,7 @@
},
"readable-stream": {
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true,
"requires": {
@ -478,9 +489,9 @@
"dev": true
},
"semver": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
"integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
"version": "5.6.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
"dev": true
},
"source-map": {
@ -516,9 +527,9 @@
"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
},
"supports-color": {
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
"requires": {
"has-flag": "^3.0.0"
}
@ -570,10 +581,6 @@
"url-parse": "^1.4.3"
},
"dependencies": {
"@types/chai": {
"version": "4.1.4",
"bundled": true
},
"@types/form-data": {
"version": "2.2.1",
"bundled": true,
@ -585,103 +592,29 @@
"version": "0.0.34",
"bundled": true
},
"@types/mocha": {
"version": "5.2.5",
"bundled": true
},
"@types/node": {
"version": "10.5.8",
"bundled": true
},
"arrify": {
"version": "1.0.1",
"bundled": true
},
"assertion-error": {
"version": "1.1.0",
"version": "10.12.0",
"bundled": true
},
"asynckit": {
"version": "0.4.0",
"bundled": true
},
"balanced-match": {
"version": "1.0.0",
"bundled": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
"browser-stdout": {
"version": "1.3.1",
"bundled": true
},
"btoa": {
"version": "1.2.1",
"bundled": true
},
"buffer-from": {
"version": "1.1.1",
"bundled": true
},
"chai": {
"version": "4.1.2",
"bundled": true,
"requires": {
"assertion-error": "^1.0.1",
"check-error": "^1.0.1",
"deep-eql": "^3.0.0",
"get-func-name": "^2.0.0",
"pathval": "^1.0.0",
"type-detect": "^4.0.0"
}
},
"check-error": {
"version": "1.0.2",
"bundled": true
},
"combined-stream": {
"version": "1.0.6",
"version": "1.0.7",
"bundled": true,
"requires": {
"delayed-stream": "~1.0.0"
}
},
"commander": {
"version": "2.15.1",
"bundled": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true
},
"debug": {
"version": "3.1.0",
"bundled": true,
"requires": {
"ms": "2.0.0"
}
},
"deep-eql": {
"version": "3.0.1",
"bundled": true,
"requires": {
"type-detect": "^4.0.0"
}
},
"delayed-stream": {
"version": "1.0.0",
"bundled": true
},
"diff": {
"version": "3.5.0",
"bundled": true
},
"encoding": {
"version": "0.1.12",
"bundled": true,
@ -690,73 +623,25 @@
}
},
"es6-promise": {
"version": "4.2.4",
"bundled": true
},
"escape-string-regexp": {
"version": "1.0.5",
"version": "4.2.5",
"bundled": true
},
"form-data": {
"version": "2.3.2",
"version": "2.3.3",
"bundled": true,
"requires": {
"asynckit": "^0.4.0",
"combined-stream": "1.0.6",
"combined-stream": "^1.0.6",
"mime-types": "^2.1.12"
}
},
"fs.realpath": {
"version": "1.0.0",
"bundled": true
},
"get-func-name": {
"version": "2.0.0",
"bundled": true
},
"glob": {
"version": "7.1.2",
"bundled": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
"minimatch": "^3.0.4",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
},
"growl": {
"version": "1.10.5",
"bundled": true
},
"has-flag": {
"version": "3.0.0",
"bundled": true
},
"he": {
"version": "1.1.1",
"bundled": true
},
"iconv-lite": {
"version": "0.4.23",
"version": "0.4.24",
"bundled": true,
"requires": {
"safer-buffer": ">= 2.1.2 < 3"
}
},
"inflight": {
"version": "1.0.6",
"bundled": true,
"requires": {
"once": "^1.3.0",
"wrappy": "1"
}
},
"inherits": {
"version": "2.0.3",
"bundled": true
},
"is-stream": {
"version": "1.1.0",
"bundled": true
@ -769,60 +654,17 @@
"whatwg-fetch": ">=0.10.0"
}
},
"make-error": {
"version": "1.3.4",
"bundled": true
},
"mime-db": {
"version": "1.35.0",
"version": "1.36.0",
"bundled": true
},
"mime-types": {
"version": "2.1.19",
"version": "2.1.20",
"bundled": true,
"requires": {
"mime-db": "~1.35.0"
"mime-db": "~1.36.0"
}
},
"minimatch": {
"version": "3.0.4",
"bundled": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
"version": "0.0.8",
"bundled": true
},
"mkdirp": {
"version": "0.5.1",
"bundled": true,
"requires": {
"minimist": "0.0.8"
}
},
"mocha": {
"version": "5.2.0",
"bundled": true,
"requires": {
"browser-stdout": "1.3.1",
"commander": "2.15.1",
"debug": "3.1.0",
"diff": "3.5.0",
"escape-string-regexp": "1.0.5",
"glob": "7.1.2",
"growl": "1.10.5",
"he": "1.1.1",
"minimatch": "3.0.4",
"mkdirp": "0.5.1",
"supports-color": "5.4.0"
}
},
"ms": {
"version": "2.0.0",
"bundled": true
},
"node-fetch": {
"version": "1.7.3",
"bundled": true,
@ -831,23 +673,8 @@
"is-stream": "^1.0.1"
}
},
"once": {
"version": "1.4.0",
"bundled": true,
"requires": {
"wrappy": "1"
}
},
"path-is-absolute": {
"version": "1.0.1",
"bundled": true
},
"pathval": {
"version": "1.1.0",
"bundled": true
},
"querystringify": {
"version": "2.0.0",
"version": "2.1.0",
"bundled": true
},
"requires-port": {
@ -858,49 +685,6 @@
"version": "2.1.2",
"bundled": true
},
"source-map": {
"version": "0.6.1",
"bundled": true
},
"source-map-support": {
"version": "0.5.8",
"bundled": true,
"requires": {
"buffer-from": "^1.0.0",
"source-map": "^0.6.0"
}
},
"supports-color": {
"version": "5.4.0",
"bundled": true,
"requires": {
"has-flag": "^3.0.0"
}
},
"ts-node": {
"version": "7.0.1",
"bundled": true,
"requires": {
"arrify": "^1.0.0",
"buffer-from": "^1.1.0",
"diff": "^3.1.0",
"make-error": "^1.1.1",
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",
"source-map-support": "^0.5.6",
"yn": "^2.0.0"
},
"dependencies": {
"minimist": {
"version": "1.2.0",
"bundled": true
}
}
},
"type-detect": {
"version": "4.0.8",
"bundled": true
},
"typescript": {
"version": "2.9.2",
"bundled": true
@ -914,15 +698,7 @@
}
},
"whatwg-fetch": {
"version": "2.0.4",
"bundled": true
},
"wrappy": {
"version": "1.0.2",
"bundled": true
},
"yn": {
"version": "2.0.0",
"version": "3.0.0",
"bundled": true
}
}

View File

@ -1,7 +1,4 @@
import {PetApi} from './index';
import {Configuration } from './configuration';
import { Middleware } from './middleware';
import { RequestContext, ResponseContext } from './http/http';
import {PetApi, Configuration, Middleware, RequestContext, ResponseContext} from 'ts-petstore-client';
class MiddlewareA implements Middleware {

View File

@ -21,7 +21,7 @@ describe("Security Authentication", () => {
// TODO: make all params const variables
it("Header API Key", () => {
let ctx = new RequestContext("http://google.com", HttpMethod.GET);
let auth = new APIKeyAuthentication("my_name", "paramName", "apiKey", "header");
let auth = new APIKeyAuthentication("my_name", "paramName", "header", "apiKey");
auth.applySecurityAuthentication(ctx);
expect(ctx.getUrl()).to.equal("http://google.com");
@ -32,7 +32,7 @@ describe("Security Authentication", () => {
it("Query API Key", () => {
let ctx = new RequestContext("http://google.com?a=b", HttpMethod.GET);
let auth = new APIKeyAuthentication("my_name", "paramName", "apiKey", "query");
let auth = new APIKeyAuthentication("my_name", "paramName", "query", "apiKey",);
auth.applySecurityAuthentication(ctx);
expect(ctx.getUrl()).to.contain("paramName=apiKey");
@ -42,7 +42,7 @@ describe("Security Authentication", () => {
it("Cookie API Key", () => {
let ctx = new RequestContext("http://google.com", HttpMethod.GET);
let auth = new APIKeyAuthentication("my_name", "paramName", "apiKey", "cookie");
let auth = new APIKeyAuthentication("my_name", "paramName", "cookie", "apiKey",);
auth.applySecurityAuthentication(ctx);
expect(ctx.getUrl()).to.equal("http://google.com");

View File

@ -1,5 +1,4 @@
import {RequestContext, HttpMethod, ResponseContext, HttpLibrary} from "ts-petstore-client";
import {IsomorphicFetchHttpLibrary} from 'ts-petstore-client';
import {RequestContext, HttpMethod, ResponseContext, HttpLibrary, IsomorphicFetchHttpLibrary } from "ts-petstore-client";
import { expect} from "chai";
import * as FormData from "form-data";