diff --git a/src/component/api/.openapi-generator/FILES b/src/component/api/.openapi-generator/FILES index e6e7d64..7f6d9af 100644 --- a/src/component/api/.openapi-generator/FILES +++ b/src/component/api/.openapi-generator/FILES @@ -5,7 +5,7 @@ api.ts api/default-api.ts api/members-api.ts api/room-api.ts -api/session-api.ts +api/sessions-api.ts base.ts common.ts configuration.ts diff --git a/src/component/api/.openapi-generator/VERSION b/src/component/api/.openapi-generator/VERSION index c9e125b..ecb2186 100644 --- a/src/component/api/.openapi-generator/VERSION +++ b/src/component/api/.openapi-generator/VERSION @@ -1 +1 @@ -7.4.0-SNAPSHOT +7.6.0-SNAPSHOT diff --git a/src/component/api/api.ts b/src/component/api/api.ts index ba9561d..354e8c6 100644 --- a/src/component/api/api.ts +++ b/src/component/api/api.ts @@ -17,5 +17,5 @@ export * from './api/default-api'; export * from './api/members-api'; export * from './api/room-api'; -export * from './api/session-api'; +export * from './api/sessions-api'; diff --git a/src/component/api/api/default-api.ts b/src/component/api/api/default-api.ts index 3746ea3..b3ff7b9 100644 --- a/src/component/api/api/default-api.ts +++ b/src/component/api/api/default-api.ts @@ -17,11 +17,20 @@ import type { Configuration } from '../configuration'; import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios'; import globalAxios from 'axios'; // Some imports not used depending on template conditions +// @ts-ignore import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../common'; -import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError, operationServerMap } from '../base'; -import type { RequestArgs } from '../base'; +// @ts-ignore +import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../base'; +// @ts-ignore import type { BatchRequest } from '../models'; +// @ts-ignore import type { BatchResponse } from '../models'; +// @ts-ignore +import type { ErrorMessage } from '../models'; +// @ts-ignore +import type { SessionData } from '../models'; +// @ts-ignore +import type { SessionLogin } from '../models'; /** * DefaultApi - axios parameter creator * @export @@ -94,6 +103,81 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @summary login + * @param {SessionLogin} sessionLogin + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + login: async (sessionLogin: SessionLogin, options: RawAxiosRequestConfig = {}): Promise => { + // verify required parameter 'sessionLogin' is not null or undefined + assertParamExists('login', 'sessionLogin', sessionLogin) + const localVarPath = `/api/login`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + + + localVarHeaderParameter['Content-Type'] = 'application/json'; + + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + localVarRequestOptions.data = serializeDataIfNeeded(sessionLogin, localVarRequestOptions, configuration) + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @summary logout + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + logout: async (options: RawAxiosRequestConfig = {}): Promise => { + const localVarPath = `/api/logout`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + // authentication CookieAuth required + + // authentication TokenAuth required + await setApiKeyToObject(localVarQueryParameter, "token", configuration) + + // authentication BearerAuth required + // http bearer authentication required + await setBearerAuthToObject(localVarHeaderParameter, configuration) + + + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -124,6 +208,45 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @summary whoami + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + whoami: async (options: RawAxiosRequestConfig = {}): Promise => { + const localVarPath = `/api/whoami`; + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + // authentication CookieAuth required + + // authentication TokenAuth required + await setApiKeyToObject(localVarQueryParameter, "token", configuration) + + // authentication BearerAuth required + // http bearer authentication required + await setBearerAuthToObject(localVarHeaderParameter, configuration) + + + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -168,6 +291,31 @@ export const DefaultApiFp = function(configuration?: Configuration) { const localVarOperationServerBasePath = operationServerMap['DefaultApi.healthcheck']?.[localVarOperationServerIndex]?.url; return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath); }, + /** + * + * @summary login + * @param {SessionLogin} sessionLogin + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async login(sessionLogin: SessionLogin, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.login(sessionLogin, options); + const localVarOperationServerIndex = configuration?.serverIndex ?? 0; + const localVarOperationServerBasePath = operationServerMap['DefaultApi.login']?.[localVarOperationServerIndex]?.url; + return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath); + }, + /** + * + * @summary logout + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async logout(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.logout(options); + const localVarOperationServerIndex = configuration?.serverIndex ?? 0; + const localVarOperationServerBasePath = operationServerMap['DefaultApi.logout']?.[localVarOperationServerIndex]?.url; + return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath); + }, /** * * @summary metrics @@ -180,6 +328,18 @@ export const DefaultApiFp = function(configuration?: Configuration) { const localVarOperationServerBasePath = operationServerMap['DefaultApi.metrics']?.[localVarOperationServerIndex]?.url; return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath); }, + /** + * + * @summary whoami + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async whoami(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.whoami(options); + const localVarOperationServerIndex = configuration?.serverIndex ?? 0; + const localVarOperationServerBasePath = operationServerMap['DefaultApi.whoami']?.[localVarOperationServerIndex]?.url; + return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath); + }, } }; @@ -209,6 +369,25 @@ export const DefaultApiFactory = function (configuration?: Configuration, basePa healthcheck(options?: any): AxiosPromise { return localVarFp.healthcheck(options).then((request) => request(axios, basePath)); }, + /** + * + * @summary login + * @param {SessionLogin} sessionLogin + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + login(sessionLogin: SessionLogin, options?: any): AxiosPromise { + return localVarFp.login(sessionLogin, options).then((request) => request(axios, basePath)); + }, + /** + * + * @summary logout + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + logout(options?: any): AxiosPromise { + return localVarFp.logout(options).then((request) => request(axios, basePath)); + }, /** * * @summary metrics @@ -218,6 +397,15 @@ export const DefaultApiFactory = function (configuration?: Configuration, basePa metrics(options?: any): AxiosPromise { return localVarFp.metrics(options).then((request) => request(axios, basePath)); }, + /** + * + * @summary whoami + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + whoami(options?: any): AxiosPromise { + return localVarFp.whoami(options).then((request) => request(axios, basePath)); + }, }; }; @@ -251,6 +439,29 @@ export class DefaultApi extends BaseAPI { return DefaultApiFp(this.configuration).healthcheck(options).then((request) => request(this.axios, this.basePath)); } + /** + * + * @summary login + * @param {SessionLogin} sessionLogin + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof DefaultApi + */ + public login(sessionLogin: SessionLogin, options?: RawAxiosRequestConfig) { + return DefaultApiFp(this.configuration).login(sessionLogin, options).then((request) => request(this.axios, this.basePath)); + } + + /** + * + * @summary logout + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof DefaultApi + */ + public logout(options?: RawAxiosRequestConfig) { + return DefaultApiFp(this.configuration).logout(options).then((request) => request(this.axios, this.basePath)); + } + /** * * @summary metrics @@ -261,5 +472,16 @@ export class DefaultApi extends BaseAPI { public metrics(options?: RawAxiosRequestConfig) { return DefaultApiFp(this.configuration).metrics(options).then((request) => request(this.axios, this.basePath)); } + + /** + * + * @summary whoami + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof DefaultApi + */ + public whoami(options?: RawAxiosRequestConfig) { + return DefaultApiFp(this.configuration).whoami(options).then((request) => request(this.axios, this.basePath)); + } } diff --git a/src/component/api/api/members-api.ts b/src/component/api/api/members-api.ts index 8a49033..545022c 100644 --- a/src/component/api/api/members-api.ts +++ b/src/component/api/api/members-api.ts @@ -17,15 +17,23 @@ import type { Configuration } from '../configuration'; import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios'; import globalAxios from 'axios'; // Some imports not used depending on template conditions +// @ts-ignore import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../common'; -import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError, operationServerMap } from '../base'; -import type { RequestArgs } from '../base'; +// @ts-ignore +import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../base'; +// @ts-ignore import type { ErrorMessage } from '../models'; +// @ts-ignore import type { MemberBulkDelete } from '../models'; +// @ts-ignore import type { MemberBulkUpdate } from '../models'; +// @ts-ignore import type { MemberCreate } from '../models'; +// @ts-ignore import type { MemberData } from '../models'; +// @ts-ignore import type { MemberPassword } from '../models'; +// @ts-ignore import type { MemberProfile } from '../models'; /** * MembersApi - axios parameter creator diff --git a/src/component/api/api/room-api.ts b/src/component/api/api/room-api.ts index fec1e89..eeae36a 100644 --- a/src/component/api/api/room-api.ts +++ b/src/component/api/api/room-api.ts @@ -17,16 +17,25 @@ import type { Configuration } from '../configuration'; import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios'; import globalAxios from 'axios'; // Some imports not used depending on template conditions +// @ts-ignore import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../common'; -import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError, operationServerMap } from '../base'; -import type { RequestArgs } from '../base'; +// @ts-ignore +import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../base'; +// @ts-ignore import type { BroadcastStatus } from '../models'; +// @ts-ignore import type { ClipboardText } from '../models'; +// @ts-ignore import type { ControlStatus } from '../models'; +// @ts-ignore import type { ErrorMessage } from '../models'; +// @ts-ignore import type { KeyboardMap } from '../models'; +// @ts-ignore import type { KeyboardModifiers } from '../models'; +// @ts-ignore import type { ScreenConfiguration } from '../models'; +// @ts-ignore import type { Settings } from '../models'; /** * RoomApi - axios parameter creator @@ -1003,7 +1012,7 @@ export const RoomApiAxiosParamCreator = function (configuration?: Configuration) if (files) { files.forEach((element) => { - localVarFormParams.append('files', element as any); + localVarFormParams.append('files', element as any); }) } @@ -1102,7 +1111,7 @@ export const RoomApiAxiosParamCreator = function (configuration?: Configuration) } if (files) { files.forEach((element) => { - localVarFormParams.append('files', element as any); + localVarFormParams.append('files', element as any); }) } diff --git a/src/component/api/api/session-api.ts b/src/component/api/api/sessions-api.ts similarity index 63% rename from src/component/api/api/session-api.ts rename to src/component/api/api/sessions-api.ts index 8908909..92289fa 100644 --- a/src/component/api/api/session-api.ts +++ b/src/component/api/api/sessions-api.ts @@ -17,29 +17,32 @@ import type { Configuration } from '../configuration'; import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios'; import globalAxios from 'axios'; // Some imports not used depending on template conditions +// @ts-ignore import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from '../common'; -import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError, operationServerMap } from '../base'; -import type { RequestArgs } from '../base'; +// @ts-ignore +import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../base'; +// @ts-ignore import type { ErrorMessage } from '../models'; +// @ts-ignore import type { SessionData } from '../models'; -import type { SessionLogin } from '../models'; /** - * SessionApi - axios parameter creator + * SessionsApi - axios parameter creator * @export */ -export const SessionApiAxiosParamCreator = function (configuration?: Configuration) { +export const SessionsApiAxiosParamCreator = function (configuration?: Configuration) { return { /** * - * @summary login - * @param {SessionLogin} sessionLogin + * @summary disconnect session + * @param {string} sessionId session identifier * @param {*} [options] Override http request option. * @throws {RequiredError} */ - login: async (sessionLogin: SessionLogin, options: RawAxiosRequestConfig = {}): Promise => { - // verify required parameter 'sessionLogin' is not null or undefined - assertParamExists('login', 'sessionLogin', sessionLogin) - const localVarPath = `/api/login`; + sessionDisconnect: async (sessionId: string, options: RawAxiosRequestConfig = {}): Promise => { + // verify required parameter 'sessionId' is not null or undefined + assertParamExists('sessionDisconnect', 'sessionId', sessionId) + const localVarPath = `/api/sessions/{sessionId}/disconnect` + .replace(`{${"sessionId"}}`, encodeURIComponent(String(sessionId))); // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); let baseOptions; @@ -51,14 +54,20 @@ export const SessionApiAxiosParamCreator = function (configuration?: Configurati const localVarHeaderParameter = {} as any; const localVarQueryParameter = {} as any; + // authentication CookieAuth required + + // authentication TokenAuth required + await setApiKeyToObject(localVarQueryParameter, "token", configuration) + + // authentication BearerAuth required + // http bearer authentication required + await setBearerAuthToObject(localVarHeaderParameter, configuration) - - localVarHeaderParameter['Content-Type'] = 'application/json'; + setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - localVarRequestOptions.data = serializeDataIfNeeded(sessionLogin, localVarRequestOptions, configuration) return { url: toPathString(localVarUrlObj), @@ -67,12 +76,16 @@ export const SessionApiAxiosParamCreator = function (configuration?: Configurati }, /** * - * @summary logout + * @summary get session + * @param {string} sessionId session identifier * @param {*} [options] Override http request option. * @throws {RequiredError} */ - logout: async (options: RawAxiosRequestConfig = {}): Promise => { - const localVarPath = `/api/logout`; + sessionGet: async (sessionId: string, options: RawAxiosRequestConfig = {}): Promise => { + // verify required parameter 'sessionId' is not null or undefined + assertParamExists('sessionGet', 'sessionId', sessionId) + const localVarPath = `/api/sessions/{sessionId}` + .replace(`{${"sessionId"}}`, encodeURIComponent(String(sessionId))); // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); let baseOptions; @@ -80,7 +93,7 @@ export const SessionApiAxiosParamCreator = function (configuration?: Configurati baseOptions = configuration.baseOptions; } - const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; + const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; const localVarHeaderParameter = {} as any; const localVarQueryParameter = {} as any; @@ -106,12 +119,16 @@ export const SessionApiAxiosParamCreator = function (configuration?: Configurati }, /** * - * @summary get sessions + * @summary remove session + * @param {string} sessionId session identifier * @param {*} [options] Override http request option. * @throws {RequiredError} */ - sessionsGet: async (options: RawAxiosRequestConfig = {}): Promise => { - const localVarPath = `/api/sessions`; + sessionRemove: async (sessionId: string, options: RawAxiosRequestConfig = {}): Promise => { + // verify required parameter 'sessionId' is not null or undefined + assertParamExists('sessionRemove', 'sessionId', sessionId) + const localVarPath = `/api/sessions/{sessionId}` + .replace(`{${"sessionId"}}`, encodeURIComponent(String(sessionId))); // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); let baseOptions; @@ -119,7 +136,7 @@ export const SessionApiAxiosParamCreator = function (configuration?: Configurati baseOptions = configuration.baseOptions; } - const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; + const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options}; const localVarHeaderParameter = {} as any; const localVarQueryParameter = {} as any; @@ -145,12 +162,12 @@ export const SessionApiAxiosParamCreator = function (configuration?: Configurati }, /** * - * @summary whoami + * @summary get sessions * @param {*} [options] Override http request option. * @throws {RequiredError} */ - whoami: async (options: RawAxiosRequestConfig = {}): Promise => { - const localVarPath = `/api/whoami`; + sessionsGet: async (options: RawAxiosRequestConfig = {}): Promise => { + const localVarPath = `/api/sessions`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); let baseOptions; @@ -186,161 +203,167 @@ export const SessionApiAxiosParamCreator = function (configuration?: Configurati }; /** - * SessionApi - functional programming interface + * SessionsApi - functional programming interface * @export */ -export const SessionApiFp = function(configuration?: Configuration) { - const localVarAxiosParamCreator = SessionApiAxiosParamCreator(configuration) +export const SessionsApiFp = function(configuration?: Configuration) { + const localVarAxiosParamCreator = SessionsApiAxiosParamCreator(configuration) return { /** * - * @summary login - * @param {SessionLogin} sessionLogin + * @summary disconnect session + * @param {string} sessionId session identifier * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async login(sessionLogin: SessionLogin, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.login(sessionLogin, options); + async sessionDisconnect(sessionId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.sessionDisconnect(sessionId, options); const localVarOperationServerIndex = configuration?.serverIndex ?? 0; - const localVarOperationServerBasePath = operationServerMap['SessionApi.login']?.[localVarOperationServerIndex]?.url; + const localVarOperationServerBasePath = operationServerMap['SessionsApi.sessionDisconnect']?.[localVarOperationServerIndex]?.url; return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath); }, /** * - * @summary logout + * @summary get session + * @param {string} sessionId session identifier * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async logout(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.logout(options); + async sessionGet(sessionId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.sessionGet(sessionId, options); const localVarOperationServerIndex = configuration?.serverIndex ?? 0; - const localVarOperationServerBasePath = operationServerMap['SessionApi.logout']?.[localVarOperationServerIndex]?.url; + const localVarOperationServerBasePath = operationServerMap['SessionsApi.sessionGet']?.[localVarOperationServerIndex]?.url; return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath); }, /** * - * @summary get sessions + * @summary remove session + * @param {string} sessionId session identifier * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async sessionsGet(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.sessionsGet(options); + async sessionRemove(sessionId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.sessionRemove(sessionId, options); const localVarOperationServerIndex = configuration?.serverIndex ?? 0; - const localVarOperationServerBasePath = operationServerMap['SessionApi.sessionsGet']?.[localVarOperationServerIndex]?.url; + const localVarOperationServerBasePath = operationServerMap['SessionsApi.sessionRemove']?.[localVarOperationServerIndex]?.url; return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath); }, /** * - * @summary whoami + * @summary get sessions * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async whoami(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.whoami(options); + async sessionsGet(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.sessionsGet(options); const localVarOperationServerIndex = configuration?.serverIndex ?? 0; - const localVarOperationServerBasePath = operationServerMap['SessionApi.whoami']?.[localVarOperationServerIndex]?.url; + const localVarOperationServerBasePath = operationServerMap['SessionsApi.sessionsGet']?.[localVarOperationServerIndex]?.url; return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath); }, } }; /** - * SessionApi - factory interface + * SessionsApi - factory interface * @export */ -export const SessionApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) { - const localVarFp = SessionApiFp(configuration) +export const SessionsApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) { + const localVarFp = SessionsApiFp(configuration) return { /** * - * @summary login - * @param {SessionLogin} sessionLogin + * @summary disconnect session + * @param {string} sessionId session identifier * @param {*} [options] Override http request option. * @throws {RequiredError} */ - login(sessionLogin: SessionLogin, options?: any): AxiosPromise { - return localVarFp.login(sessionLogin, options).then((request) => request(axios, basePath)); + sessionDisconnect(sessionId: string, options?: any): AxiosPromise { + return localVarFp.sessionDisconnect(sessionId, options).then((request) => request(axios, basePath)); }, /** * - * @summary logout + * @summary get session + * @param {string} sessionId session identifier * @param {*} [options] Override http request option. * @throws {RequiredError} */ - logout(options?: any): AxiosPromise { - return localVarFp.logout(options).then((request) => request(axios, basePath)); + sessionGet(sessionId: string, options?: any): AxiosPromise { + return localVarFp.sessionGet(sessionId, options).then((request) => request(axios, basePath)); }, /** * - * @summary get sessions + * @summary remove session + * @param {string} sessionId session identifier * @param {*} [options] Override http request option. * @throws {RequiredError} */ - sessionsGet(options?: any): AxiosPromise> { - return localVarFp.sessionsGet(options).then((request) => request(axios, basePath)); + sessionRemove(sessionId: string, options?: any): AxiosPromise { + return localVarFp.sessionRemove(sessionId, options).then((request) => request(axios, basePath)); }, /** * - * @summary whoami + * @summary get sessions * @param {*} [options] Override http request option. * @throws {RequiredError} */ - whoami(options?: any): AxiosPromise { - return localVarFp.whoami(options).then((request) => request(axios, basePath)); + sessionsGet(options?: any): AxiosPromise> { + return localVarFp.sessionsGet(options).then((request) => request(axios, basePath)); }, }; }; /** - * SessionApi - object-oriented interface + * SessionsApi - object-oriented interface * @export - * @class SessionApi + * @class SessionsApi * @extends {BaseAPI} */ -export class SessionApi extends BaseAPI { +export class SessionsApi extends BaseAPI { /** * - * @summary login - * @param {SessionLogin} sessionLogin + * @summary disconnect session + * @param {string} sessionId session identifier * @param {*} [options] Override http request option. * @throws {RequiredError} - * @memberof SessionApi + * @memberof SessionsApi */ - public login(sessionLogin: SessionLogin, options?: RawAxiosRequestConfig) { - return SessionApiFp(this.configuration).login(sessionLogin, options).then((request) => request(this.axios, this.basePath)); + public sessionDisconnect(sessionId: string, options?: RawAxiosRequestConfig) { + return SessionsApiFp(this.configuration).sessionDisconnect(sessionId, options).then((request) => request(this.axios, this.basePath)); } /** * - * @summary logout + * @summary get session + * @param {string} sessionId session identifier * @param {*} [options] Override http request option. * @throws {RequiredError} - * @memberof SessionApi + * @memberof SessionsApi */ - public logout(options?: RawAxiosRequestConfig) { - return SessionApiFp(this.configuration).logout(options).then((request) => request(this.axios, this.basePath)); + public sessionGet(sessionId: string, options?: RawAxiosRequestConfig) { + return SessionsApiFp(this.configuration).sessionGet(sessionId, options).then((request) => request(this.axios, this.basePath)); } /** * - * @summary get sessions + * @summary remove session + * @param {string} sessionId session identifier * @param {*} [options] Override http request option. * @throws {RequiredError} - * @memberof SessionApi + * @memberof SessionsApi */ - public sessionsGet(options?: RawAxiosRequestConfig) { - return SessionApiFp(this.configuration).sessionsGet(options).then((request) => request(this.axios, this.basePath)); + public sessionRemove(sessionId: string, options?: RawAxiosRequestConfig) { + return SessionsApiFp(this.configuration).sessionRemove(sessionId, options).then((request) => request(this.axios, this.basePath)); } /** * - * @summary whoami + * @summary get sessions * @param {*} [options] Override http request option. * @throws {RequiredError} - * @memberof SessionApi + * @memberof SessionsApi */ - public whoami(options?: RawAxiosRequestConfig) { - return SessionApiFp(this.configuration).whoami(options).then((request) => request(this.axios, this.basePath)); + public sessionsGet(options?: RawAxiosRequestConfig) { + return SessionsApiFp(this.configuration).sessionsGet(options).then((request) => request(this.axios, this.basePath)); } } diff --git a/src/component/api/models/member-create.ts b/src/component/api/models/member-create.ts index 35d32fa..fd0ca75 100644 --- a/src/component/api/models/member-create.ts +++ b/src/component/api/models/member-create.ts @@ -14,6 +14,7 @@ // May contain unused imports in some cases +// @ts-ignore import type { MemberProfile } from './member-profile'; /** diff --git a/src/component/api/models/member-data.ts b/src/component/api/models/member-data.ts index ae392e7..1fe32bd 100644 --- a/src/component/api/models/member-data.ts +++ b/src/component/api/models/member-data.ts @@ -14,6 +14,7 @@ // May contain unused imports in some cases +// @ts-ignore import type { MemberProfile } from './member-profile'; /** diff --git a/src/component/api/models/session-data.ts b/src/component/api/models/session-data.ts index 3856916..be3af06 100644 --- a/src/component/api/models/session-data.ts +++ b/src/component/api/models/session-data.ts @@ -14,8 +14,10 @@ // May contain unused imports in some cases +// @ts-ignore import type { MemberProfile } from './member-profile'; // May contain unused imports in some cases +// @ts-ignore import type { SessionState } from './session-state'; /** diff --git a/src/component/internal/api.ts b/src/component/internal/api.ts index cc064dc..d7f0723 100644 --- a/src/component/internal/api.ts +++ b/src/component/internal/api.ts @@ -18,8 +18,12 @@ export class NekoApi { return this.config.basePath || location.href.replace(/\/+$/, '') } - get session(): SessionApi { - return new Api.SessionApi(this.config) + get default(): DefaultApi { + return new Api.DefaultApi(this.config) + } + + get sessions(): SessionsApi { + return new Api.SessionsApi(this.config) } get room(): RoomApi { @@ -31,6 +35,7 @@ export class NekoApi { } } -export type SessionApi = Api.SessionApi +export type DefaultApi = Api.DefaultApi +export type SessionsApi = Api.SessionsApi export type RoomApi = Api.RoomApi export type MembersApi = Api.MembersApi diff --git a/src/component/main.vue b/src/component/main.vue index 2170878..e27403c 100644 --- a/src/component/main.vue +++ b/src/component/main.vue @@ -84,7 +84,7 @@ import type { AxiosInstance, AxiosProgressEvent } from 'axios' import ResizeObserver from 'resize-observer-polyfill' import { NekoApi } from './internal/api' -import type { MembersApi, RoomApi } from './internal/api' +import type { SessionsApi, MembersApi, RoomApi } from './internal/api' import { NekoConnection } from './internal/connection' import { NekoMessages } from './internal/messages' import { NekoControl } from './internal/control' @@ -321,7 +321,7 @@ async function authenticate(token?: string) { state.connection.token = token // TODO: Vue.Set } - await api.session.whoami() + await api.default.whoami() state.authenticated = true // TODO: Vue.Set if (token && props.autologin) { @@ -334,7 +334,7 @@ async function login(username: string, password: string) { throw new Error('client already authenticated') } - const res = await api.session.login({ username, password }) + const res = await api.default.login({ username, password }) if (res.data.token) { api.setToken(res.data.token) state.connection.token = res.data.token // TODO: Vue.Set @@ -357,7 +357,7 @@ async function logout() { } catch {} try { - await api.session.logout() + await api.default.logout() } finally { api.setToken('') delete state.connection.token // TODO: Vue.Delete @@ -537,6 +537,7 @@ function withApi(c: new (configuration?: Configuration, basePath?: string, ax const control = new NekoControl(connection, state.control) +const sessions = computed(() => api.sessions) const room = computed(() => api.room) const members = computed(() => api.members) @@ -824,6 +825,7 @@ defineExpose({ // public methods control, // public api + sessions, room, members, })