Skip to content

[typescript-angular] Support blob response types #11085

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
merged 8 commits into from
Dec 24, 2021
Merged

[typescript-angular] Support blob response types #11085

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cd18044
Fixed issue 11021 by changing the responseType to blob for accept hea…
oaklandcorp-jkaiser Dec 9, 2021
8a147e6
Updated samples.
oaklandcorp-jkaiser Dec 9, 2021
2bd4dae
Updated inline json pattern matching with an existing utility method.
oaklandcorp-jkaiser Dec 10, 2021
3da4b08
Updated samples.
oaklandcorp-jkaiser Dec 10, 2021
052544d
Fixed isJsonMime call.
oaklandcorp-jkaiser Dec 10, 2021
b4d44e0
Updated samples.
oaklandcorp-jkaiser Dec 10, 2021
32f80af
Fixed default response type of json when accept header is not given.
oaklandcorp-jkaiser Dec 10, 2021
10735cb
Updated samples.
oaklandcorp-jkaiser Dec 10, 2021
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
10 changes: 7 additions & 3 deletions modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,9 +349,13 @@ export class {{classname}} {

{{/hasFormParams}}
{{^isResponseFile}}
let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

{{/isResponseFile}}
Expand Down
80 changes: 56 additions & 24 deletions ...client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/pet.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,13 @@ export class PetService {
localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
}

let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.post<any>(`${this.configuration.basePath}/pet`,
Expand Down Expand Up @@ -205,9 +209,13 @@ export class PetService {



let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.delete<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`,
Expand Down Expand Up @@ -266,9 +274,13 @@ export class PetService {



let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.get<Array<Pet>>(`${this.configuration.basePath}/pet/findByStatus`,
Expand Down Expand Up @@ -329,9 +341,13 @@ export class PetService {



let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.get<Array<Pet>>(`${this.configuration.basePath}/pet/findByTags`,
Expand Down Expand Up @@ -385,9 +401,13 @@ export class PetService {



let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.get<Pet>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`,
Expand Down Expand Up @@ -447,9 +467,13 @@ export class PetService {
localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
}

let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.put<any>(`${this.configuration.basePath}/pet`,
Expand Down Expand Up @@ -524,9 +548,13 @@ export class PetService {
localVarFormParams = localVarFormParams.append('status', <any>status) as any || localVarFormParams;
}

let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`,
Expand Down Expand Up @@ -605,9 +633,13 @@ export class PetService {
localVarFormParams = localVarFormParams.append('file', <any>file) as any || localVarFormParams;
}

let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`,
Expand Down
40 changes: 28 additions & 12 deletions ...ient/petstore/typescript-angular-v10-provided-in-root/builds/default/api/store.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,13 @@ export class StoreService {



let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.delete<any>(`${this.configuration.basePath}/store/order/${encodeURIComponent(String(orderId))}`,
Expand Down Expand Up @@ -167,9 +171,13 @@ export class StoreService {



let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.get<{ [key: string]: number; }>(`${this.configuration.basePath}/store/inventory`,
Expand Down Expand Up @@ -215,9 +223,13 @@ export class StoreService {



let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.get<Order>(`${this.configuration.basePath}/store/order/${encodeURIComponent(String(orderId))}`,
Expand Down Expand Up @@ -270,9 +282,13 @@ export class StoreService {
localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
}

let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.post<Order>(`${this.configuration.basePath}/store/order`,
Expand Down
80 changes: 56 additions & 24 deletions ...lient/petstore/typescript-angular-v10-provided-in-root/builds/default/api/user.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,13 @@ export class UserService {
localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
}

let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.post<any>(`${this.configuration.basePath}/user`,
Expand Down Expand Up @@ -179,9 +183,13 @@ export class UserService {
localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
}

let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.post<any>(`${this.configuration.basePath}/user/createWithArray`,
Expand Down Expand Up @@ -233,9 +241,13 @@ export class UserService {
localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
}

let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.post<any>(`${this.configuration.basePath}/user/createWithList`,
Expand Down Expand Up @@ -280,9 +292,13 @@ export class UserService {



let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.delete<any>(`${this.configuration.basePath}/user/${encodeURIComponent(String(username))}`,
Expand Down Expand Up @@ -327,9 +343,13 @@ export class UserService {



let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.get<User>(`${this.configuration.basePath}/user/${encodeURIComponent(String(username))}`,
Expand Down Expand Up @@ -388,9 +408,13 @@ export class UserService {



let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.get<string>(`${this.configuration.basePath}/user/login`,
Expand Down Expand Up @@ -430,9 +454,13 @@ export class UserService {



let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.get<any>(`${this.configuration.basePath}/user/logout`,
Expand Down Expand Up @@ -488,9 +516,13 @@ export class UserService {
localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
}

let responseType_: 'text' | 'json' = 'json';
if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (!localVarHttpHeaderAcceptSelected.includes('json')) {
responseType_ = 'blob';
}
}

return this.httpClient.put<any>(`${this.configuration.basePath}/user/${encodeURIComponent(String(username))}`,
Expand Down
Loading