Skip to content

Use specific route for login validation instead of systeminfo #157

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.

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 20 additions & 4 deletions src/app/core/openapi/sdk.gen.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// This file is auto-generated by @hey-api/openapi-ts

import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import type { Observable } from 'rxjs';
import { OpenAPI } from './core/OpenAPI';
import { request as __request } from './core/request';
import type { DeleteApiV1BackupByIdData, DeleteApiV1BackupByIdResponse, DeleteApiV1NotificationByIdData, DeleteApiV1NotificationByIdResponse, DeleteApiV1RemotecontrolRegisterResponse, DeleteApiV1RemotecontrolRegistrationResponse, GetApiV1AcknowledgementsResponse, GetApiV1BackupByIdData, GetApiV1BackupByIdExportArgsonlyData, GetApiV1BackupByIdExportArgsonlyResponse, GetApiV1BackupByIdExportCmdlineData, GetApiV1BackupByIdExportCmdlineResponse, GetApiV1BackupByIdExportData, GetApiV1BackupByIdExportResponse, GetApiV1BackupByIdFilesData, GetApiV1BackupByIdFilesetsData, GetApiV1BackupByIdFilesetsResponse, GetApiV1BackupByIdFilesResponse, GetApiV1BackupByIdIsactiveData, GetApiV1BackupByIdIsactiveResponse, GetApiV1BackupByIdIsdbusedelsewhereData, GetApiV1BackupByIdIsdbusedelsewhereResponse, GetApiV1BackupByIdLogData, GetApiV1BackupByIdLogResponse, GetApiV1BackupByIdRemotelogData, GetApiV1BackupByIdRemotelogResponse, GetApiV1BackupByIdResponse, GetApiV1BackupdefaultsResponse, GetApiV1BackupsResponse, GetApiV1BugreportByReportidData, GetApiV1BugreportByReportidResponse, GetApiV1ChangelogData, GetApiV1ChangelogResponse, GetApiV1CommandlineByRunidData, GetApiV1CommandlineByRunidResponse, GetApiV1CommandlineResponse, GetApiV1HypervByKeyData, GetApiV1HypervByKeyResponse, GetApiV1HypervResponse, GetApiV1LicensesResponse, GetApiV1LogdataCrashlogResponse, GetApiV1LogdataLogData, GetApiV1LogdataLogResponse, GetApiV1LogdataPollData, GetApiV1LogdataPollResponse, GetApiV1MssqlByKeyData, GetApiV1MssqlByKeyResponse, GetApiV1MssqlResponse, GetApiV1NotificationByIdData, GetApiV1NotificationByIdResponse, GetApiV1NotificationsResponse, GetApiV1ProgressstateResponse, GetApiV1RemotecontrolStatusResponse, GetApiV1ServersettingByKeyData, GetApiV1ServersettingByKeyResponse, GetApiV1ServersettingsResponse, GetApiV1ServerstateData, GetApiV1ServerstateResponse, GetApiV1SysteminfoFiltergroupsResponse, GetApiV1SysteminfoResponse, GetApiV1TaskByTaskidData, GetApiV1TaskByTaskidResponse, GetApiV1TasksResponse, GetApiV1UisettingsBySchemeData, GetApiV1UisettingsBySchemeResponse, GetApiV1UisettingsResponse, GetApiV1WebmodulesResponse, PatchApiV1ServersettingsData, PatchApiV1ServersettingsResponse, PatchApiV1UisettingsBySchemeData, PatchApiV1UisettingsBySchemeResponse, PostApiV1AuthIssueForeverTokenResponse, PostApiV1AuthIssuesignintokenData, PostApiV1AuthIssuesignintokenResponse, PostApiV1AuthIssuetokenByOperationData, PostApiV1AuthIssuetokenByOperationResponse, PostApiV1AuthLoginData, PostApiV1AuthLoginResponse, PostApiV1AuthRefreshLogoutResponse, PostApiV1AuthRefreshResponse, PostApiV1AuthSigninData, PostApiV1AuthSigninResponse, PostApiV1BackupByIdCompactData, PostApiV1BackupByIdCompactResponse, PostApiV1BackupByIdCopytotempData, PostApiV1BackupByIdCopytotempResponse, PostApiV1BackupByIdCreatereportData, PostApiV1BackupByIdCreatereportResponse, PostApiV1BackupByIdDeletedbData, PostApiV1BackupByIdDeletedbResponse, PostApiV1BackupByIdMovedbData, PostApiV1BackupByIdMovedbResponse, PostApiV1BackupByIdRepairData, PostApiV1BackupByIdRepairResponse, PostApiV1BackupByIdRepairupdateData, PostApiV1BackupByIdRepairupdateResponse, PostApiV1BackupByIdReportRemoteSizeData, PostApiV1BackupByIdReportRemoteSizeResponse, PostApiV1BackupByIdRestoreData, PostApiV1BackupByIdRestoreResponse, PostApiV1BackupByIdRunData, PostApiV1BackupByIdRunResponse, PostApiV1BackupByIdStartData, PostApiV1BackupByIdStartResponse, PostApiV1BackupByIdUpdatedbData, PostApiV1BackupByIdUpdatedbResponse, PostApiV1BackupByIdVacuumData, PostApiV1BackupByIdVacuumResponse, PostApiV1BackupByIdVerifyData, PostApiV1BackupByIdVerifyResponse, PostApiV1BackupsData, PostApiV1BackupsImportData, PostApiV1BackupsImportResponse, PostApiV1BackupsResponse, PostApiV1CommandlineByRunidAbortData, PostApiV1CommandlineByRunidAbortResponse, PostApiV1CommandlineData, PostApiV1CommandlineResponse, PostApiV1FilesystemData, PostApiV1FilesystemResponse, PostApiV1FilesystemValidateData, PostApiV1FilesystemValidateResponse, PostApiV1RemotecontrolDisableResponse, PostApiV1RemotecontrolEnableResponse, PostApiV1RemotecontrolRegisterData, PostApiV1RemotecontrolRegisterResponse, PostApiV1RemoteoperationCreateData, PostApiV1RemoteoperationCreateResponse, PostApiV1RemoteoperationDbpathData, PostApiV1RemoteoperationDbpathResponse, PostApiV1RemoteoperationTestData, PostApiV1RemoteoperationTestResponse, PostApiV1ServerstatePauseData, PostApiV1ServerstatePauseResponse, PostApiV1ServerstateResumeResponse, PostApiV1TaskByTaskidAbortData, PostApiV1TaskByTaskidAbortResponse, PostApiV1TaskByTaskidStopData, PostApiV1TaskByTaskidStopResponse, PostApiV1UisettingsData, PostApiV1UisettingsResponse, PostApiV1UpdatesCheckResponse, PostApiV1WebmoduleByModulekeyData, PostApiV1WebmoduleByModulekeyResponse, PutApiV1BackupByIdData, PutApiV1BackupByIdResponse, PutApiV1ServersettingByKeyData, PutApiV1ServersettingByKeyResponse } from './types.gen';
import type { GetApiV1CommandlineResponse, PostApiV1CommandlineData, PostApiV1CommandlineResponse, GetApiV1AcknowledgementsResponse, PostApiV1AuthRefreshResponse, PostApiV1AuthSigninData, PostApiV1AuthSigninResponse, PostApiV1AuthLoginData, PostApiV1AuthLoginResponse, PostApiV1AuthIssuesignintokenData, PostApiV1AuthIssuesignintokenResponse, PostApiV1AuthRefreshLogoutResponse, PostApiV1AuthIssuetokenByOperationData, PostApiV1AuthIssuetokenByOperationResponse, PostApiV1AuthIssueForeverTokenResponse, GetApiV1AuthValidateResponse, GetApiV1BackupdefaultsResponse, GetApiV1BackupsData, GetApiV1BackupsResponse, PostApiV1BackupsData, PostApiV1BackupsResponse, PostApiV1BackupsImportData, PostApiV1BackupsImportResponse, GetApiV1BugreportByReportidData, GetApiV1BugreportByReportidResponse, GetApiV1ChangelogData, GetApiV1ChangelogResponse, GetApiV1CommandlineByRunidData, GetApiV1CommandlineByRunidResponse, PostApiV1CommandlineByRunidAbortData, PostApiV1CommandlineByRunidAbortResponse, PostApiV1FilesystemData, PostApiV1FilesystemResponse, PostApiV1FilesystemValidateData, PostApiV1FilesystemValidateResponse, GetApiV1HypervResponse, GetApiV1HypervByKeyData, GetApiV1HypervByKeyResponse, GetApiV1LicensesResponse, GetApiV1LogdataPollData, GetApiV1LogdataPollResponse, GetApiV1LogdataLogData, GetApiV1LogdataLogResponse, GetApiV1LogdataCrashlogResponse, GetApiV1MssqlResponse, GetApiV1MssqlByKeyData, GetApiV1MssqlByKeyResponse, GetApiV1NotificationByIdData, GetApiV1NotificationByIdResponse, DeleteApiV1NotificationByIdData, DeleteApiV1NotificationByIdResponse, GetApiV1NotificationsResponse, GetApiV1RemotecontrolStatusResponse, PostApiV1RemotecontrolEnableResponse, PostApiV1RemotecontrolDisableResponse, DeleteApiV1RemotecontrolRegistrationResponse, PostApiV1RemotecontrolRegisterData, PostApiV1RemotecontrolRegisterResponse, DeleteApiV1RemotecontrolRegisterResponse, PostApiV1RemoteoperationDbpathData, PostApiV1RemoteoperationDbpathResponse, PostApiV1RemoteoperationTestData, PostApiV1RemoteoperationTestResponse, PostApiV1RemoteoperationCreateData, PostApiV1RemoteoperationCreateResponse, GetApiV1ServersettingsResponse, PatchApiV1ServersettingsData, PatchApiV1ServersettingsResponse, GetApiV1ServersettingByKeyData, GetApiV1ServersettingByKeyResponse, PutApiV1ServersettingByKeyData, PutApiV1ServersettingByKeyResponse, GetApiV1ServerstateData, GetApiV1ServerstateResponse, PostApiV1ServerstatePauseData, PostApiV1ServerstatePauseResponse, PostApiV1ServerstateResumeResponse, GetApiV1SysteminfoResponse, GetApiV1SysteminfoFiltergroupsResponse, GetApiV1TaskByTaskidData, GetApiV1TaskByTaskidResponse, PostApiV1TaskByTaskidStopData, PostApiV1TaskByTaskidStopResponse, PostApiV1TaskByTaskidAbortData, PostApiV1TaskByTaskidAbortResponse, GetApiV1UisettingsResponse, PostApiV1UisettingsData, PostApiV1UisettingsResponse, GetApiV1UisettingsBySchemeData, GetApiV1UisettingsBySchemeResponse, PatchApiV1UisettingsBySchemeData, PatchApiV1UisettingsBySchemeResponse, PostApiV1WebmoduleByModulekeyData, PostApiV1WebmoduleByModulekeyResponse, GetApiV1BackupByIdData, GetApiV1BackupByIdResponse, PutApiV1BackupByIdData, PutApiV1BackupByIdResponse, DeleteApiV1BackupByIdData, DeleteApiV1BackupByIdResponse, GetApiV1BackupByIdFilesData, GetApiV1BackupByIdFilesResponse, GetApiV1BackupByIdLogData, GetApiV1BackupByIdLogResponse, GetApiV1BackupByIdRemotelogData, GetApiV1BackupByIdRemotelogResponse, GetApiV1BackupByIdFilesetsData, GetApiV1BackupByIdFilesetsResponse, GetApiV1BackupByIdExportArgsonlyData, GetApiV1BackupByIdExportArgsonlyResponse, GetApiV1BackupByIdExportCmdlineData, GetApiV1BackupByIdExportCmdlineResponse, GetApiV1BackupByIdExportData, GetApiV1BackupByIdExportResponse, GetApiV1BackupByIdIsdbusedelsewhereData, GetApiV1BackupByIdIsdbusedelsewhereResponse, GetApiV1BackupByIdIsactiveData, GetApiV1BackupByIdIsactiveResponse, PostApiV1BackupByIdDeletedbData, PostApiV1BackupByIdDeletedbResponse, PostApiV1BackupByIdMovedbData, PostApiV1BackupByIdMovedbResponse, PostApiV1BackupByIdUpdatedbData, PostApiV1BackupByIdUpdatedbResponse, PostApiV1BackupByIdRestoreData, PostApiV1BackupByIdRestoreResponse, PostApiV1BackupByIdCreatereportData, PostApiV1BackupByIdCreatereportResponse, PostApiV1BackupByIdRepairData, PostApiV1BackupByIdRepairResponse, PostApiV1BackupByIdRepairupdateData, PostApiV1BackupByIdRepairupdateResponse, PostApiV1BackupByIdVacuumData, PostApiV1BackupByIdVacuumResponse, PostApiV1BackupByIdVerifyData, PostApiV1BackupByIdVerifyResponse, PostApiV1BackupByIdCompactData, PostApiV1BackupByIdCompactResponse, PostApiV1BackupByIdStartData, PostApiV1BackupByIdStartResponse, PostApiV1BackupByIdRunData, PostApiV1BackupByIdRunResponse, PostApiV1BackupByIdReportRemoteSizeData, PostApiV1BackupByIdReportRemoteSizeResponse, PostApiV1BackupByIdCopytotempData, PostApiV1BackupByIdCopytotempResponse, GetApiV1ProgressstateResponse, GetApiV1TasksResponse, PostApiV1UpdatesCheckResponse, GetApiV1WebmodulesResponse } from './types.gen';

@Injectable({
providedIn: 'root'
Expand Down Expand Up @@ -152,6 +152,17 @@ export class DuplicatiServerService {
});
}

/**
* @returns AuthValidateDto Success
* @throws ApiError
*/
public getApiV1AuthValidate(): Observable<GetApiV1AuthValidateResponse> {
return __request(OpenAPI, this.http, {
method: 'GET',
url: '/api/v1/auth/validate'
});
}

/**
* @returns string Success
* @throws ApiError
Expand All @@ -164,13 +175,18 @@ export class DuplicatiServerService {
}

/**
* @param data The data for the request.
* @param data.orderBy
* @returns BackupAndScheduleOutputDto Success
* @throws ApiError
*/
public getApiV1Backups(): Observable<GetApiV1BackupsResponse> {
public getApiV1Backups(data: GetApiV1BackupsData = {}): Observable<GetApiV1BackupsResponse> {
return __request(OpenAPI, this.http, {
method: 'GET',
url: '/api/v1/backups'
url: '/api/v1/backups',
query: {
orderBy: data.orderBy
}
});
}

Expand Down
10 changes: 10 additions & 0 deletions src/app/core/openapi/types.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ export type AcknowlegdementDto = {

export type ArgumentType = 'String' | 'Integer' | 'Boolean' | 'Timespan' | 'Size' | 'Enumeration' | 'Path' | 'Password' | 'Flags' | 'Decimal' | 'Unknown';

export type AuthValidateDto = {
valid?: boolean;
};

export type BackupAndScheduleInputDto = {
Backup?: BackupInputDto;
Schedule?: ScheduleInputDto;
Expand Down Expand Up @@ -555,8 +559,14 @@ export type PostApiV1AuthIssuetokenByOperationResponse = (SingleOperationTokenOu

export type PostApiV1AuthIssueForeverTokenResponse = (AccessTokenOutputDto);

export type GetApiV1AuthValidateResponse = (AuthValidateDto);

export type GetApiV1BackupdefaultsResponse = (string);

export type GetApiV1BackupsData = {
orderBy?: string;
};

export type GetApiV1BackupsResponse = (Array<BackupAndScheduleOutputDto>);

export type PostApiV1BackupsData = {
Expand Down
6 changes: 3 additions & 3 deletions src/app/core/states/app-auth.state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class AppAuthState {
})
.pipe(
take(1),
tap((res) => res.AccessToken && this.#token.set(res.AccessToken))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should infer the type automatically

tap((res: AccessTokenOutputDto) => res.AccessToken && this.#token.set(res.AccessToken))
);
}

Expand All @@ -48,7 +48,7 @@ export class AppAuthState {

return this.#dupServer.postApiV1AuthRefresh().pipe(
take(1),
tap((res) => res.AccessToken && this.#token.set(res.AccessToken))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

tap((res: AccessTokenOutputDto) => res.AccessToken && this.#token.set(res.AccessToken))
);
}

Expand All @@ -58,7 +58,7 @@ export class AppAuthState {
});

return this.#http
.get('/api/v1/systeminfo', {
.get('/api/v1/auth/validate', {
headers,
})
.pipe(
Expand Down