Skip to content

Commit

Permalink
Merge pull request #1657 from DSD-DBS/openapi-update
Browse files Browse the repository at this point in the history
build: Update generated frontend API client
  • Loading branch information
MoritzWeber0 authored Jul 18, 2024
2 parents 5cc4a88 + 72f83c0 commit bcb0b74
Show file tree
Hide file tree
Showing 33 changed files with 77 additions and 55 deletions.
2 changes: 1 addition & 1 deletion frontend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ openapi:
-v $$(pwd)/openapi_templates:/tmp/openapi_templates \
-v /tmp/openapi:/tmp/output \
-u $$(id -u $${USER}):$$(id -g $${USER}) \
openapitools/openapi-generator-cli:v7.5.0 generate \
openapitools/openapi-generator-cli:v7.7.0 generate \
-i /tmp/openapi.json \
-t /tmp/openapi_templates \
--global-property models,apis,supportingFiles="index.ts:api.ts:models.ts:variables.ts:configuration.ts:api.module.ts:param.ts:encoder.ts" \
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/openapi/.openapi-generator/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.5.0
7.7.0
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/default.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ export class DefaultService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/events.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ export class EventsService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/health.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ export class HealthService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/metadata.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ export class MetadataService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/notices.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ export class NoticesService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/oauth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ export class OauthService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/projects-events.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ export class ProjectsEventsService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ export class ProjectsModelsBackupsService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ export class ProjectsModelsDiagramsService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/projects-models-git.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ export class ProjectsModelsGitService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ export class ProjectsModelsModelComplexityBadgeService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ export class ProjectsModelsRestrictionsService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/projects-models-t4-c.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ export class ProjectsModelsT4CService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/projects-models.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ export class ProjectsModelsService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/projects.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ export class ProjectsService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/sessions.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ export class SessionsService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ export class SettingsModelsourcesGitService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ export class SettingsModelsourcesT4CService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/tools.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ export class ToolsService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/users-sessions.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ export class UsersSessionsService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/users-token.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ export class UsersTokenService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/app/openapi/api/users.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ export class UsersService {
this.configuration = configuration;
}
if (typeof this.configuration.basePath !== 'string') {
if (Array.isArray(basePath) && basePath.length > 0) {
basePath = basePath[0];
const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined;
if (firstBasePath != undefined) {
basePath = firstBasePath;
}

if (typeof basePath !== 'string') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export interface GuacamoleConnectionMethodInput {
/**
* Connection method specific environment variables. Check the global environment field for more information.
*/
environment?: object;
environment?: { [key: string]: Environment; };
sharing?: ToolSessionSharingConfigurationInput;
}
export namespace GuacamoleConnectionMethodInput {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export interface GuacamoleConnectionMethodOutput {
/**
* Connection method specific environment variables. Check the global environment field for more information.
*/
environment: object;
environment: { [key: string]: Environment1; };
sharing: ToolSessionSharingConfigurationOutput;
}
export namespace GuacamoleConnectionMethodOutput {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export interface HTTPConnectionMethodInput {
/**
* Connection method specific environment variables. Check the global environment field for more information.
*/
environment?: object;
environment?: { [key: string]: Environment; };
sharing?: ToolSessionSharingConfigurationInput;
redirect_url?: string;
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export interface HTTPConnectionMethodOutput {
/**
* Connection method specific environment variables. Check the global environment field for more information.
*/
environment: object;
environment: { [key: string]: Environment1; };
sharing: ToolSessionSharingConfigurationOutput;
redirect_url: string;
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export interface ToolSessionConfigurationInput {
/**
* Environment variables, which are mounted into session containers. You can use f-strings to reference other environment variables in the value.
*/
environment?: object;
environment?: { [key: string]: Environment; };
connection?: ToolSessionConnectionInput;
monitoring?: SessionMonitoringInput;
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export interface ToolSessionConfigurationOutput {
/**
* Environment variables, which are mounted into session containers. You can use f-strings to reference other environment variables in the value.
*/
environment: object;
environment: { [key: string]: Environment1; };
connection: ToolSessionConnectionOutput;
monitoring: SessionMonitoringOutput;
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export interface ToolSessionConnectionInputMethodsInner {
/**
* Cookies, which are required to connect to the session.
*/
cookies?: { [key: string]: any; };
cookies?: { [key: string]: string; };
}
export namespace ToolSessionConnectionInputMethodsInner {
export type TypeEnum = 'guacamole' | 'http';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export interface ToolSessionConnectionMethod {
/**
* Connection method specific environment variables. Check the global environment field for more information.
*/
environment: object;
environment: { [key: string]: Environment1; };
sharing: ToolSessionSharingConfigurationOutput;
}

Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export interface ToolSessionConnectionOutputMethodsInner {
/**
* Cookies, which are required to connect to the session.
*/
cookies: { [key: string]: any; };
cookies: { [key: string]: string; };
}
export namespace ToolSessionConnectionOutputMethodsInner {
export type TypeEnum = 'guacamole' | 'http';
Expand Down

0 comments on commit bcb0b74

Please sign in to comment.