From 90a7f16817f3416ff3a9406413298590a1602eba Mon Sep 17 00:00:00 2001 From: Jason Rasmussen Date: Thu, 8 Feb 2024 16:57:54 -0500 Subject: [PATCH] chore(server): remove deprecated endpoints (#6984) * chore: remove deprecated endpoints * chore: open api --- .../services/asset_description.service.dart | 2 +- .../services/image_viewer.service.dart | 8 +- .../services/backup_verification.service.dart | 6 +- .../modules/trash/services/trash.service.dart | 6 +- mobile/lib/shared/services/api.service.dart | 4 + mobile/lib/shared/services/asset.service.dart | 2 +- mobile/lib/shared/services/share.service.dart | 4 +- mobile/openapi/.openapi-generator/FILES | 3 - mobile/openapi/README.md | 9 - mobile/openapi/doc/AssetApi.md | 391 --------- mobile/openapi/doc/OAuthApi.md | 44 - mobile/openapi/doc/OAuthConfigResponseDto.md | 19 - mobile/openapi/lib/api.dart | 1 - mobile/openapi/lib/api/asset_api.dart | 332 -------- mobile/openapi/lib/api/o_auth_api.dart | 52 -- mobile/openapi/lib/api_client.dart | 2 - .../lib/model/o_auth_config_response_dto.dart | 157 ---- mobile/openapi/test/asset_api_test.dart | 37 - mobile/openapi/test/o_auth_api_test.dart | 7 - .../test/o_auth_config_response_dto_test.dart | 47 -- open-api/immich-openapi-specs.json | 348 -------- open-api/typescript-sdk/axios-client/api.ts | 770 +----------------- .../fetch-client/.openapi-generator/FILES | 1 - .../fetch-client/apis/AssetApi.ts | 334 -------- .../fetch-client/apis/OAuthApi.ts | 42 - .../fetch-client/models/index.ts | 1 - server/e2e/api/specs/asset.e2e-spec.ts | 122 +-- server/e2e/api/specs/download.e2e-spec.ts | 89 ++ server/e2e/client/asset-api.ts | 6 +- server/src/domain/auth/auth.dto.ts | 9 - server/src/domain/auth/auth.service.spec.ts | 21 - server/src/domain/auth/auth.service.ts | 23 - .../system-config/system-config.core.ts | 2 - .../immich/api-v1/asset/asset.controller.ts | 20 +- .../immich/controllers/asset.controller.ts | 88 +- .../immich/controllers/oauth.controller.ts | 8 - 36 files changed, 140 insertions(+), 2877 deletions(-) delete mode 100644 mobile/openapi/doc/OAuthConfigResponseDto.md delete mode 100644 mobile/openapi/lib/model/o_auth_config_response_dto.dart delete mode 100644 mobile/openapi/test/o_auth_config_response_dto_test.dart create mode 100644 server/e2e/api/specs/download.e2e-spec.ts diff --git a/mobile/lib/modules/asset_viewer/services/asset_description.service.dart b/mobile/lib/modules/asset_viewer/services/asset_description.service.dart index 9abf69a93a3d0..09de411e5d6a5 100644 --- a/mobile/lib/modules/asset_viewer/services/asset_description.service.dart +++ b/mobile/lib/modules/asset_viewer/services/asset_description.service.dart @@ -36,7 +36,7 @@ class AssetDescriptionService { Future readLatest(String assetRemoteId, int localExifId) async { final latestAssetFromServer = - await _api.assetApi.getAssetById(assetRemoteId); + await _api.assetApi.getAssetInfo(assetRemoteId); final localExifInfo = await _db.exifInfos.get(localExifId); if (latestAssetFromServer != null && localExifInfo != null) { diff --git a/mobile/lib/modules/asset_viewer/services/image_viewer.service.dart b/mobile/lib/modules/asset_viewer/services/image_viewer.service.dart index 301fbdfe295b9..db527c6e2369e 100644 --- a/mobile/lib/modules/asset_viewer/services/image_viewer.service.dart +++ b/mobile/lib/modules/asset_viewer/services/image_viewer.service.dart @@ -25,12 +25,12 @@ class ImageViewerService { // Download LivePhotos image and motion part if (asset.isImage && asset.livePhotoVideoId != null && Platform.isIOS) { var imageResponse = - await _apiService.assetApi.downloadFileOldWithHttpInfo( + await _apiService.downloadApi.downloadFileWithHttpInfo( asset.remoteId!, ); var motionReponse = - await _apiService.assetApi.downloadFileOldWithHttpInfo( + await _apiService.downloadApi.downloadFileWithHttpInfo( asset.livePhotoVideoId!, ); @@ -71,8 +71,8 @@ class ImageViewerService { return entity != null; } else { - var res = await _apiService.assetApi - .downloadFileOldWithHttpInfo(asset.remoteId!); + var res = await _apiService.downloadApi + .downloadFileWithHttpInfo(asset.remoteId!); if (res.statusCode != 200) { _log.severe( diff --git a/mobile/lib/modules/backup/services/backup_verification.service.dart b/mobile/lib/modules/backup/services/backup_verification.service.dart index 1447abe90af10..95e3a8d58bfff 100644 --- a/mobile/lib/modules/backup/services/backup_verification.service.dart +++ b/mobile/lib/modules/backup/services/backup_verification.service.dart @@ -136,7 +136,7 @@ class BackupVerificationService { ExifInfo? exif = remote.exifInfo; if (exif != null && exif.lat != null) return false; if (exif == null || exif.fileSize == null) { - final dto = await apiService.assetApi.getAssetById(remote.remoteId!); + final dto = await apiService.assetApi.getAssetInfo(remote.remoteId!); if (dto != null && dto.exifInfo != null) { exif = ExifInfo.fromDto(dto.exifInfo!); } @@ -165,8 +165,8 @@ class BackupVerificationService { // (skip first few KBs containing metadata) final Uint64List localImage = _fakeDecodeImg(local, await file.readAsBytes()); - final res = await apiService.assetApi - .downloadFileOldWithHttpInfo(remote.remoteId!); + final res = await apiService.downloadApi + .downloadFileWithHttpInfo(remote.remoteId!); final Uint64List remoteImage = _fakeDecodeImg(remote, res.bodyBytes); final eq = const ListEquality().equals(remoteImage, localImage); diff --git a/mobile/lib/modules/trash/services/trash.service.dart b/mobile/lib/modules/trash/services/trash.service.dart index cfcae27653ba5..9a9ff5d0b6523 100644 --- a/mobile/lib/modules/trash/services/trash.service.dart +++ b/mobile/lib/modules/trash/services/trash.service.dart @@ -22,7 +22,7 @@ class TrashService { try { List remoteIds = assetList.where((a) => a.isRemote).map((e) => e.remoteId!).toList(); - await _apiService.assetApi.restoreAssetsOld(BulkIdsDto(ids: remoteIds)); + await _apiService.trashApi.restoreAssets(BulkIdsDto(ids: remoteIds)); return true; } catch (error, stack) { _log.severe("Cannot restore assets ${error.toString()}", error, stack); @@ -32,7 +32,7 @@ class TrashService { Future emptyTrash() async { try { - await _apiService.assetApi.emptyTrashOld(); + await _apiService.trashApi.emptyTrash(); } catch (error, stack) { _log.severe("Cannot empty trash ${error.toString()}", error, stack); } @@ -40,7 +40,7 @@ class TrashService { Future restoreTrash() async { try { - await _apiService.assetApi.restoreTrashOld(); + await _apiService.trashApi.restoreTrash(); } catch (error, stack) { _log.severe("Cannot restore trash ${error.toString()}", error, stack); } diff --git a/mobile/lib/shared/services/api.service.dart b/mobile/lib/shared/services/api.service.dart index 2df1ec857fbf1..9e44136fe7c30 100644 --- a/mobile/lib/shared/services/api.service.dart +++ b/mobile/lib/shared/services/api.service.dart @@ -24,6 +24,8 @@ class ApiService { late SharedLinkApi sharedLinkApi; late SystemConfigApi systemConfigApi; late ActivityApi activityApi; + late DownloadApi downloadApi; + late TrashApi trashApi; ApiService() { final endpoint = Store.tryGet(StoreKey.serverEndpoint); @@ -51,6 +53,8 @@ class ApiService { sharedLinkApi = SharedLinkApi(_apiClient); systemConfigApi = SystemConfigApi(_apiClient); activityApi = ActivityApi(_apiClient); + downloadApi = DownloadApi(_apiClient); + trashApi = TrashApi(_apiClient); } Future resolveAndSetEndpoint(String serverUrl) async { diff --git a/mobile/lib/shared/services/asset.service.dart b/mobile/lib/shared/services/asset.service.dart index 737d4d56adf22..48f8c635245c5 100644 --- a/mobile/lib/shared/services/asset.service.dart +++ b/mobile/lib/shared/services/asset.service.dart @@ -129,7 +129,7 @@ class AssetService { // fileSize is always filled on the server but not set on client if (a.exifInfo?.fileSize == null) { if (a.isRemote) { - final dto = await _apiService.assetApi.getAssetById(a.remoteId!); + final dto = await _apiService.assetApi.getAssetInfo(a.remoteId!); if (dto != null && dto.exifInfo != null) { final newExif = Asset.remote(dto).exifInfo!.copyWith(id: a.id); if (newExif != a.exifInfo) { diff --git a/mobile/lib/shared/services/share.service.dart b/mobile/lib/shared/services/share.service.dart index d50391079783e..20ee40d588cda 100644 --- a/mobile/lib/shared/services/share.service.dart +++ b/mobile/lib/shared/services/share.service.dart @@ -31,8 +31,8 @@ class ShareService { final tempDir = await getTemporaryDirectory(); final fileName = asset.fileName; final tempFile = await File('${tempDir.path}/$fileName').create(); - final res = await _apiService.assetApi - .downloadFileOldWithHttpInfo(asset.remoteId!); + final res = await _apiService.downloadApi + .downloadFileWithHttpInfo(asset.remoteId!); if (res.statusCode != 200) { _log.severe( diff --git a/mobile/openapi/.openapi-generator/FILES b/mobile/openapi/.openapi-generator/FILES index 6fc968a4914dc..186e3675c4d80 100644 --- a/mobile/openapi/.openapi-generator/FILES +++ b/mobile/openapi/.openapi-generator/FILES @@ -95,7 +95,6 @@ doc/OAuthApi.md doc/OAuthAuthorizeResponseDto.md doc/OAuthCallbackDto.md doc/OAuthConfigDto.md -doc/OAuthConfigResponseDto.md doc/PartnerApi.md doc/PartnerResponseDto.md doc/PathEntityType.md @@ -292,7 +291,6 @@ lib/model/model_type.dart lib/model/o_auth_authorize_response_dto.dart lib/model/o_auth_callback_dto.dart lib/model/o_auth_config_dto.dart -lib/model/o_auth_config_response_dto.dart lib/model/partner_response_dto.dart lib/model/path_entity_type.dart lib/model/path_type.dart @@ -462,7 +460,6 @@ test/o_auth_api_test.dart test/o_auth_authorize_response_dto_test.dart test/o_auth_callback_dto_test.dart test/o_auth_config_dto_test.dart -test/o_auth_config_response_dto_test.dart test/partner_api_test.dart test/partner_response_dto_test.dart test/path_entity_type_test.dart diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md index ac05f83b69fcd..3c662af41f09e 100644 --- a/mobile/openapi/README.md +++ b/mobile/openapi/README.md @@ -94,26 +94,19 @@ Class | Method | HTTP request | Description *AssetApi* | [**checkBulkUpload**](doc//AssetApi.md#checkbulkupload) | **POST** /asset/bulk-upload-check | *AssetApi* | [**checkExistingAssets**](doc//AssetApi.md#checkexistingassets) | **POST** /asset/exist | *AssetApi* | [**deleteAssets**](doc//AssetApi.md#deleteassets) | **DELETE** /asset | -*AssetApi* | [**downloadArchiveOld**](doc//AssetApi.md#downloadarchiveold) | **POST** /asset/download/archive | -*AssetApi* | [**downloadFileOld**](doc//AssetApi.md#downloadfileold) | **POST** /asset/download/{id} | -*AssetApi* | [**emptyTrashOld**](doc//AssetApi.md#emptytrashold) | **POST** /asset/trash/empty | *AssetApi* | [**getAllAssets**](doc//AssetApi.md#getallassets) | **GET** /asset | *AssetApi* | [**getAllUserAssetsByDeviceId**](doc//AssetApi.md#getalluserassetsbydeviceid) | **GET** /asset/device/{deviceId} | -*AssetApi* | [**getAssetById**](doc//AssetApi.md#getassetbyid) | **GET** /asset/assetById/{id} | *AssetApi* | [**getAssetInfo**](doc//AssetApi.md#getassetinfo) | **GET** /asset/{id} | *AssetApi* | [**getAssetSearchTerms**](doc//AssetApi.md#getassetsearchterms) | **GET** /asset/search-terms | *AssetApi* | [**getAssetStatistics**](doc//AssetApi.md#getassetstatistics) | **GET** /asset/statistics | *AssetApi* | [**getAssetThumbnail**](doc//AssetApi.md#getassetthumbnail) | **GET** /asset/thumbnail/{id} | *AssetApi* | [**getCuratedLocations**](doc//AssetApi.md#getcuratedlocations) | **GET** /asset/curated-locations | *AssetApi* | [**getCuratedObjects**](doc//AssetApi.md#getcuratedobjects) | **GET** /asset/curated-objects | -*AssetApi* | [**getDownloadInfoOld**](doc//AssetApi.md#getdownloadinfoold) | **POST** /asset/download/info | *AssetApi* | [**getMapMarkers**](doc//AssetApi.md#getmapmarkers) | **GET** /asset/map-marker | *AssetApi* | [**getMemoryLane**](doc//AssetApi.md#getmemorylane) | **GET** /asset/memory-lane | *AssetApi* | [**getRandom**](doc//AssetApi.md#getrandom) | **GET** /asset/random | *AssetApi* | [**getTimeBucket**](doc//AssetApi.md#gettimebucket) | **GET** /asset/time-bucket | *AssetApi* | [**getTimeBuckets**](doc//AssetApi.md#gettimebuckets) | **GET** /asset/time-buckets | -*AssetApi* | [**restoreAssetsOld**](doc//AssetApi.md#restoreassetsold) | **POST** /asset/restore | -*AssetApi* | [**restoreTrashOld**](doc//AssetApi.md#restoretrashold) | **POST** /asset/trash/restore | *AssetApi* | [**runAssetJobs**](doc//AssetApi.md#runassetjobs) | **POST** /asset/jobs | *AssetApi* | [**searchAssets**](doc//AssetApi.md#searchassets) | **GET** /assets | *AssetApi* | [**serveFile**](doc//AssetApi.md#servefile) | **GET** /asset/file/{id} | @@ -149,7 +142,6 @@ Class | Method | HTTP request | Description *LibraryApi* | [**scanLibrary**](doc//LibraryApi.md#scanlibrary) | **POST** /library/{id}/scan | *LibraryApi* | [**updateLibrary**](doc//LibraryApi.md#updatelibrary) | **PUT** /library/{id} | *OAuthApi* | [**finishOAuth**](doc//OAuthApi.md#finishoauth) | **POST** /oauth/callback | -*OAuthApi* | [**generateOAuthConfig**](doc//OAuthApi.md#generateoauthconfig) | **POST** /oauth/config | *OAuthApi* | [**linkOAuthAccount**](doc//OAuthApi.md#linkoauthaccount) | **POST** /oauth/link | *OAuthApi* | [**redirectOAuthToMobile**](doc//OAuthApi.md#redirectoauthtomobile) | **GET** /oauth/mobile-redirect | *OAuthApi* | [**startOAuth**](doc//OAuthApi.md#startoauth) | **POST** /oauth/authorize | @@ -299,7 +291,6 @@ Class | Method | HTTP request | Description - [OAuthAuthorizeResponseDto](doc//OAuthAuthorizeResponseDto.md) - [OAuthCallbackDto](doc//OAuthCallbackDto.md) - [OAuthConfigDto](doc//OAuthConfigDto.md) - - [OAuthConfigResponseDto](doc//OAuthConfigResponseDto.md) - [PartnerResponseDto](doc//PartnerResponseDto.md) - [PathEntityType](doc//PathEntityType.md) - [PathType](doc//PathType.md) diff --git a/mobile/openapi/doc/AssetApi.md b/mobile/openapi/doc/AssetApi.md index dbff762d30881..a7ea1c07c79a6 100644 --- a/mobile/openapi/doc/AssetApi.md +++ b/mobile/openapi/doc/AssetApi.md @@ -12,26 +12,19 @@ Method | HTTP request | Description [**checkBulkUpload**](AssetApi.md#checkbulkupload) | **POST** /asset/bulk-upload-check | [**checkExistingAssets**](AssetApi.md#checkexistingassets) | **POST** /asset/exist | [**deleteAssets**](AssetApi.md#deleteassets) | **DELETE** /asset | -[**downloadArchiveOld**](AssetApi.md#downloadarchiveold) | **POST** /asset/download/archive | -[**downloadFileOld**](AssetApi.md#downloadfileold) | **POST** /asset/download/{id} | -[**emptyTrashOld**](AssetApi.md#emptytrashold) | **POST** /asset/trash/empty | [**getAllAssets**](AssetApi.md#getallassets) | **GET** /asset | [**getAllUserAssetsByDeviceId**](AssetApi.md#getalluserassetsbydeviceid) | **GET** /asset/device/{deviceId} | -[**getAssetById**](AssetApi.md#getassetbyid) | **GET** /asset/assetById/{id} | [**getAssetInfo**](AssetApi.md#getassetinfo) | **GET** /asset/{id} | [**getAssetSearchTerms**](AssetApi.md#getassetsearchterms) | **GET** /asset/search-terms | [**getAssetStatistics**](AssetApi.md#getassetstatistics) | **GET** /asset/statistics | [**getAssetThumbnail**](AssetApi.md#getassetthumbnail) | **GET** /asset/thumbnail/{id} | [**getCuratedLocations**](AssetApi.md#getcuratedlocations) | **GET** /asset/curated-locations | [**getCuratedObjects**](AssetApi.md#getcuratedobjects) | **GET** /asset/curated-objects | -[**getDownloadInfoOld**](AssetApi.md#getdownloadinfoold) | **POST** /asset/download/info | [**getMapMarkers**](AssetApi.md#getmapmarkers) | **GET** /asset/map-marker | [**getMemoryLane**](AssetApi.md#getmemorylane) | **GET** /asset/memory-lane | [**getRandom**](AssetApi.md#getrandom) | **GET** /asset/random | [**getTimeBucket**](AssetApi.md#gettimebucket) | **GET** /asset/time-bucket | [**getTimeBuckets**](AssetApi.md#gettimebuckets) | **GET** /asset/time-buckets | -[**restoreAssetsOld**](AssetApi.md#restoreassetsold) | **POST** /asset/restore | -[**restoreTrashOld**](AssetApi.md#restoretrashold) | **POST** /asset/trash/restore | [**runAssetJobs**](AssetApi.md#runassetjobs) | **POST** /asset/jobs | [**searchAssets**](AssetApi.md#searchassets) | **GET** /assets | [**serveFile**](AssetApi.md#servefile) | **GET** /asset/file/{id} | @@ -209,170 +202,6 @@ void (empty response body) [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **downloadArchiveOld** -> MultipartFile downloadArchiveOld(assetIdsDto, key) - - - -### Example -```dart -import 'package:openapi/api.dart'; -// TODO Configure API key authorization: cookie -//defaultApiClient.getAuthentication('cookie').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('cookie').apiKeyPrefix = 'Bearer'; -// TODO Configure API key authorization: api_key -//defaultApiClient.getAuthentication('api_key').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('api_key').apiKeyPrefix = 'Bearer'; -// TODO Configure HTTP Bearer authorization: bearer -// Case 1. Use String Token -//defaultApiClient.getAuthentication('bearer').setAccessToken('YOUR_ACCESS_TOKEN'); -// Case 2. Use Function which generate token. -// String yourTokenGeneratorFunction() { ... } -//defaultApiClient.getAuthentication('bearer').setAccessToken(yourTokenGeneratorFunction); - -final api_instance = AssetApi(); -final assetIdsDto = AssetIdsDto(); // AssetIdsDto | -final key = key_example; // String | - -try { - final result = api_instance.downloadArchiveOld(assetIdsDto, key); - print(result); -} catch (e) { - print('Exception when calling AssetApi->downloadArchiveOld: $e\n'); -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **assetIdsDto** | [**AssetIdsDto**](AssetIdsDto.md)| | - **key** | **String**| | [optional] - -### Return type - -[**MultipartFile**](MultipartFile.md) - -### Authorization - -[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer) - -### HTTP request headers - - - **Content-Type**: application/json - - **Accept**: application/octet-stream - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - -# **downloadFileOld** -> MultipartFile downloadFileOld(id, key) - - - -### Example -```dart -import 'package:openapi/api.dart'; -// TODO Configure API key authorization: cookie -//defaultApiClient.getAuthentication('cookie').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('cookie').apiKeyPrefix = 'Bearer'; -// TODO Configure API key authorization: api_key -//defaultApiClient.getAuthentication('api_key').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('api_key').apiKeyPrefix = 'Bearer'; -// TODO Configure HTTP Bearer authorization: bearer -// Case 1. Use String Token -//defaultApiClient.getAuthentication('bearer').setAccessToken('YOUR_ACCESS_TOKEN'); -// Case 2. Use Function which generate token. -// String yourTokenGeneratorFunction() { ... } -//defaultApiClient.getAuthentication('bearer').setAccessToken(yourTokenGeneratorFunction); - -final api_instance = AssetApi(); -final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | -final key = key_example; // String | - -try { - final result = api_instance.downloadFileOld(id, key); - print(result); -} catch (e) { - print('Exception when calling AssetApi->downloadFileOld: $e\n'); -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **id** | **String**| | - **key** | **String**| | [optional] - -### Return type - -[**MultipartFile**](MultipartFile.md) - -### Authorization - -[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/octet-stream - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - -# **emptyTrashOld** -> emptyTrashOld() - - - -### Example -```dart -import 'package:openapi/api.dart'; -// TODO Configure API key authorization: cookie -//defaultApiClient.getAuthentication('cookie').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('cookie').apiKeyPrefix = 'Bearer'; -// TODO Configure API key authorization: api_key -//defaultApiClient.getAuthentication('api_key').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('api_key').apiKeyPrefix = 'Bearer'; -// TODO Configure HTTP Bearer authorization: bearer -// Case 1. Use String Token -//defaultApiClient.getAuthentication('bearer').setAccessToken('YOUR_ACCESS_TOKEN'); -// Case 2. Use Function which generate token. -// String yourTokenGeneratorFunction() { ... } -//defaultApiClient.getAuthentication('bearer').setAccessToken(yourTokenGeneratorFunction); - -final api_instance = AssetApi(); - -try { - api_instance.emptyTrashOld(); -} catch (e) { - print('Exception when calling AssetApi->emptyTrashOld: $e\n'); -} -``` - -### Parameters -This endpoint does not need any parameter. - -### Return type - -void (empty response body) - -### Authorization - -[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - # **getAllAssets** > List getAllAssets(ifNoneMatch, isArchived, isFavorite, skip, take, updatedAfter, updatedBefore, userId) @@ -501,65 +330,6 @@ Name | Type | Description | Notes [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **getAssetById** -> AssetResponseDto getAssetById(id, key) - - - -Get a single asset's information - -### Example -```dart -import 'package:openapi/api.dart'; -// TODO Configure API key authorization: cookie -//defaultApiClient.getAuthentication('cookie').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('cookie').apiKeyPrefix = 'Bearer'; -// TODO Configure API key authorization: api_key -//defaultApiClient.getAuthentication('api_key').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('api_key').apiKeyPrefix = 'Bearer'; -// TODO Configure HTTP Bearer authorization: bearer -// Case 1. Use String Token -//defaultApiClient.getAuthentication('bearer').setAccessToken('YOUR_ACCESS_TOKEN'); -// Case 2. Use Function which generate token. -// String yourTokenGeneratorFunction() { ... } -//defaultApiClient.getAuthentication('bearer').setAccessToken(yourTokenGeneratorFunction); - -final api_instance = AssetApi(); -final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | -final key = key_example; // String | - -try { - final result = api_instance.getAssetById(id, key); - print(result); -} catch (e) { - print('Exception when calling AssetApi->getAssetById: $e\n'); -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **id** | **String**| | - **key** | **String**| | [optional] - -### Return type - -[**AssetResponseDto**](AssetResponseDto.md) - -### Authorization - -[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - # **getAssetInfo** > AssetResponseDto getAssetInfo(id, key) @@ -888,63 +658,6 @@ This endpoint does not need any parameter. [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **getDownloadInfoOld** -> DownloadResponseDto getDownloadInfoOld(downloadInfoDto, key) - - - -### Example -```dart -import 'package:openapi/api.dart'; -// TODO Configure API key authorization: cookie -//defaultApiClient.getAuthentication('cookie').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('cookie').apiKeyPrefix = 'Bearer'; -// TODO Configure API key authorization: api_key -//defaultApiClient.getAuthentication('api_key').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('api_key').apiKeyPrefix = 'Bearer'; -// TODO Configure HTTP Bearer authorization: bearer -// Case 1. Use String Token -//defaultApiClient.getAuthentication('bearer').setAccessToken('YOUR_ACCESS_TOKEN'); -// Case 2. Use Function which generate token. -// String yourTokenGeneratorFunction() { ... } -//defaultApiClient.getAuthentication('bearer').setAccessToken(yourTokenGeneratorFunction); - -final api_instance = AssetApi(); -final downloadInfoDto = DownloadInfoDto(); // DownloadInfoDto | -final key = key_example; // String | - -try { - final result = api_instance.getDownloadInfoOld(downloadInfoDto, key); - print(result); -} catch (e) { - print('Exception when calling AssetApi->getDownloadInfoOld: $e\n'); -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **downloadInfoDto** | [**DownloadInfoDto**](DownloadInfoDto.md)| | - **key** | **String**| | [optional] - -### Return type - -[**DownloadResponseDto**](DownloadResponseDto.md) - -### Authorization - -[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer) - -### HTTP request headers - - - **Content-Type**: application/json - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - # **getMapMarkers** > List getMapMarkers(fileCreatedAfter, fileCreatedBefore, isArchived, isFavorite) @@ -1266,110 +979,6 @@ Name | Type | Description | Notes [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **restoreAssetsOld** -> restoreAssetsOld(bulkIdsDto) - - - -### Example -```dart -import 'package:openapi/api.dart'; -// TODO Configure API key authorization: cookie -//defaultApiClient.getAuthentication('cookie').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('cookie').apiKeyPrefix = 'Bearer'; -// TODO Configure API key authorization: api_key -//defaultApiClient.getAuthentication('api_key').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('api_key').apiKeyPrefix = 'Bearer'; -// TODO Configure HTTP Bearer authorization: bearer -// Case 1. Use String Token -//defaultApiClient.getAuthentication('bearer').setAccessToken('YOUR_ACCESS_TOKEN'); -// Case 2. Use Function which generate token. -// String yourTokenGeneratorFunction() { ... } -//defaultApiClient.getAuthentication('bearer').setAccessToken(yourTokenGeneratorFunction); - -final api_instance = AssetApi(); -final bulkIdsDto = BulkIdsDto(); // BulkIdsDto | - -try { - api_instance.restoreAssetsOld(bulkIdsDto); -} catch (e) { - print('Exception when calling AssetApi->restoreAssetsOld: $e\n'); -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **bulkIdsDto** | [**BulkIdsDto**](BulkIdsDto.md)| | - -### Return type - -void (empty response body) - -### Authorization - -[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer) - -### HTTP request headers - - - **Content-Type**: application/json - - **Accept**: Not defined - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - -# **restoreTrashOld** -> restoreTrashOld() - - - -### Example -```dart -import 'package:openapi/api.dart'; -// TODO Configure API key authorization: cookie -//defaultApiClient.getAuthentication('cookie').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('cookie').apiKeyPrefix = 'Bearer'; -// TODO Configure API key authorization: api_key -//defaultApiClient.getAuthentication('api_key').apiKey = 'YOUR_API_KEY'; -// uncomment below to setup prefix (e.g. Bearer) for API key, if needed -//defaultApiClient.getAuthentication('api_key').apiKeyPrefix = 'Bearer'; -// TODO Configure HTTP Bearer authorization: bearer -// Case 1. Use String Token -//defaultApiClient.getAuthentication('bearer').setAccessToken('YOUR_ACCESS_TOKEN'); -// Case 2. Use Function which generate token. -// String yourTokenGeneratorFunction() { ... } -//defaultApiClient.getAuthentication('bearer').setAccessToken(yourTokenGeneratorFunction); - -final api_instance = AssetApi(); - -try { - api_instance.restoreTrashOld(); -} catch (e) { - print('Exception when calling AssetApi->restoreTrashOld: $e\n'); -} -``` - -### Parameters -This endpoint does not need any parameter. - -### Return type - -void (empty response body) - -### Authorization - -[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer) - -### HTTP request headers - - - **Content-Type**: Not defined - - **Accept**: Not defined - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - # **runAssetJobs** > runAssetJobs(assetJobsDto) diff --git a/mobile/openapi/doc/OAuthApi.md b/mobile/openapi/doc/OAuthApi.md index fa6b19df53884..ce36f7163a862 100644 --- a/mobile/openapi/doc/OAuthApi.md +++ b/mobile/openapi/doc/OAuthApi.md @@ -10,7 +10,6 @@ All URIs are relative to */api* Method | HTTP request | Description ------------- | ------------- | ------------- [**finishOAuth**](OAuthApi.md#finishoauth) | **POST** /oauth/callback | -[**generateOAuthConfig**](OAuthApi.md#generateoauthconfig) | **POST** /oauth/config | [**linkOAuthAccount**](OAuthApi.md#linkoauthaccount) | **POST** /oauth/link | [**redirectOAuthToMobile**](OAuthApi.md#redirectoauthtomobile) | **GET** /oauth/mobile-redirect | [**startOAuth**](OAuthApi.md#startoauth) | **POST** /oauth/authorize | @@ -58,49 +57,6 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **generateOAuthConfig** -> OAuthConfigResponseDto generateOAuthConfig(oAuthConfigDto) - - - -@deprecated use feature flags and /oauth/authorize - -### Example -```dart -import 'package:openapi/api.dart'; - -final api_instance = OAuthApi(); -final oAuthConfigDto = OAuthConfigDto(); // OAuthConfigDto | - -try { - final result = api_instance.generateOAuthConfig(oAuthConfigDto); - print(result); -} catch (e) { - print('Exception when calling OAuthApi->generateOAuthConfig: $e\n'); -} -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **oAuthConfigDto** | [**OAuthConfigDto**](OAuthConfigDto.md)| | - -### Return type - -[**OAuthConfigResponseDto**](OAuthConfigResponseDto.md) - -### Authorization - -No authorization required - -### HTTP request headers - - - **Content-Type**: application/json - - **Accept**: application/json - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - # **linkOAuthAccount** > UserResponseDto linkOAuthAccount(oAuthCallbackDto) diff --git a/mobile/openapi/doc/OAuthConfigResponseDto.md b/mobile/openapi/doc/OAuthConfigResponseDto.md deleted file mode 100644 index 8abc6bb607fcb..0000000000000 --- a/mobile/openapi/doc/OAuthConfigResponseDto.md +++ /dev/null @@ -1,19 +0,0 @@ -# openapi.model.OAuthConfigResponseDto - -## Load the model package -```dart -import 'package:openapi/api.dart'; -``` - -## Properties -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**autoLaunch** | **bool** | | [optional] -**buttonText** | **String** | | [optional] -**enabled** | **bool** | | -**passwordLoginEnabled** | **bool** | | -**url** | **String** | | [optional] - -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - - diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart index 8b9a320566443..48305a98043ca 100644 --- a/mobile/openapi/lib/api.dart +++ b/mobile/openapi/lib/api.dart @@ -131,7 +131,6 @@ part 'model/model_type.dart'; part 'model/o_auth_authorize_response_dto.dart'; part 'model/o_auth_callback_dto.dart'; part 'model/o_auth_config_dto.dart'; -part 'model/o_auth_config_response_dto.dart'; part 'model/partner_response_dto.dart'; part 'model/path_entity_type.dart'; part 'model/path_type.dart'; diff --git a/mobile/openapi/lib/api/asset_api.dart b/mobile/openapi/lib/api/asset_api.dart index 67127392c6bcd..7f4528c12f048 100644 --- a/mobile/openapi/lib/api/asset_api.dart +++ b/mobile/openapi/lib/api/asset_api.dart @@ -159,150 +159,6 @@ class AssetApi { } } - /// Performs an HTTP 'POST /asset/download/archive' operation and returns the [Response]. - /// Parameters: - /// - /// * [AssetIdsDto] assetIdsDto (required): - /// - /// * [String] key: - Future downloadArchiveOldWithHttpInfo(AssetIdsDto assetIdsDto, { String? key, }) async { - // ignore: prefer_const_declarations - final path = r'/asset/download/archive'; - - // ignore: prefer_final_locals - Object? postBody = assetIdsDto; - - final queryParams = []; - final headerParams = {}; - final formParams = {}; - - if (key != null) { - queryParams.addAll(_queryParams('', 'key', key)); - } - - const contentTypes = ['application/json']; - - - return apiClient.invokeAPI( - path, - 'POST', - queryParams, - postBody, - headerParams, - formParams, - contentTypes.isEmpty ? null : contentTypes.first, - ); - } - - /// Parameters: - /// - /// * [AssetIdsDto] assetIdsDto (required): - /// - /// * [String] key: - Future downloadArchiveOld(AssetIdsDto assetIdsDto, { String? key, }) async { - final response = await downloadArchiveOldWithHttpInfo(assetIdsDto, key: key, ); - if (response.statusCode >= HttpStatus.badRequest) { - throw ApiException(response.statusCode, await _decodeBodyBytes(response)); - } - // When a remote server returns no body with a status of 204, we shall not decode it. - // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" - // FormatException when trying to decode an empty string. - if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) { - return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'MultipartFile',) as MultipartFile; - - } - return null; - } - - /// Performs an HTTP 'POST /asset/download/{id}' operation and returns the [Response]. - /// Parameters: - /// - /// * [String] id (required): - /// - /// * [String] key: - Future downloadFileOldWithHttpInfo(String id, { String? key, }) async { - // ignore: prefer_const_declarations - final path = r'/asset/download/{id}' - .replaceAll('{id}', id); - - // ignore: prefer_final_locals - Object? postBody; - - final queryParams = []; - final headerParams = {}; - final formParams = {}; - - if (key != null) { - queryParams.addAll(_queryParams('', 'key', key)); - } - - const contentTypes = []; - - - return apiClient.invokeAPI( - path, - 'POST', - queryParams, - postBody, - headerParams, - formParams, - contentTypes.isEmpty ? null : contentTypes.first, - ); - } - - /// Parameters: - /// - /// * [String] id (required): - /// - /// * [String] key: - Future downloadFileOld(String id, { String? key, }) async { - final response = await downloadFileOldWithHttpInfo(id, key: key, ); - if (response.statusCode >= HttpStatus.badRequest) { - throw ApiException(response.statusCode, await _decodeBodyBytes(response)); - } - // When a remote server returns no body with a status of 204, we shall not decode it. - // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" - // FormatException when trying to decode an empty string. - if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) { - return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'MultipartFile',) as MultipartFile; - - } - return null; - } - - /// Performs an HTTP 'POST /asset/trash/empty' operation and returns the [Response]. - Future emptyTrashOldWithHttpInfo() async { - // ignore: prefer_const_declarations - final path = r'/asset/trash/empty'; - - // ignore: prefer_final_locals - Object? postBody; - - final queryParams = []; - final headerParams = {}; - final formParams = {}; - - const contentTypes = []; - - - return apiClient.invokeAPI( - path, - 'POST', - queryParams, - postBody, - headerParams, - formParams, - contentTypes.isEmpty ? null : contentTypes.first, - ); - } - - Future emptyTrashOld() async { - final response = await emptyTrashOldWithHttpInfo(); - if (response.statusCode >= HttpStatus.badRequest) { - throw ApiException(response.statusCode, await _decodeBodyBytes(response)); - } - } - /// Get all AssetEntity belong to the user /// /// Note: This method returns the HTTP [Response]. @@ -470,67 +326,6 @@ class AssetApi { return null; } - /// Get a single asset's information - /// - /// Note: This method returns the HTTP [Response]. - /// - /// Parameters: - /// - /// * [String] id (required): - /// - /// * [String] key: - Future getAssetByIdWithHttpInfo(String id, { String? key, }) async { - // ignore: prefer_const_declarations - final path = r'/asset/assetById/{id}' - .replaceAll('{id}', id); - - // ignore: prefer_final_locals - Object? postBody; - - final queryParams = []; - final headerParams = {}; - final formParams = {}; - - if (key != null) { - queryParams.addAll(_queryParams('', 'key', key)); - } - - const contentTypes = []; - - - return apiClient.invokeAPI( - path, - 'GET', - queryParams, - postBody, - headerParams, - formParams, - contentTypes.isEmpty ? null : contentTypes.first, - ); - } - - /// Get a single asset's information - /// - /// Parameters: - /// - /// * [String] id (required): - /// - /// * [String] key: - Future getAssetById(String id, { String? key, }) async { - final response = await getAssetByIdWithHttpInfo(id, key: key, ); - if (response.statusCode >= HttpStatus.badRequest) { - throw ApiException(response.statusCode, await _decodeBodyBytes(response)); - } - // When a remote server returns no body with a status of 204, we shall not decode it. - // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" - // FormatException when trying to decode an empty string. - if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) { - return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AssetResponseDto',) as AssetResponseDto; - - } - return null; - } - /// Performs an HTTP 'GET /asset/{id}' operation and returns the [Response]. /// Parameters: /// @@ -847,61 +642,6 @@ class AssetApi { return null; } - /// Performs an HTTP 'POST /asset/download/info' operation and returns the [Response]. - /// Parameters: - /// - /// * [DownloadInfoDto] downloadInfoDto (required): - /// - /// * [String] key: - Future getDownloadInfoOldWithHttpInfo(DownloadInfoDto downloadInfoDto, { String? key, }) async { - // ignore: prefer_const_declarations - final path = r'/asset/download/info'; - - // ignore: prefer_final_locals - Object? postBody = downloadInfoDto; - - final queryParams = []; - final headerParams = {}; - final formParams = {}; - - if (key != null) { - queryParams.addAll(_queryParams('', 'key', key)); - } - - const contentTypes = ['application/json']; - - - return apiClient.invokeAPI( - path, - 'POST', - queryParams, - postBody, - headerParams, - formParams, - contentTypes.isEmpty ? null : contentTypes.first, - ); - } - - /// Parameters: - /// - /// * [DownloadInfoDto] downloadInfoDto (required): - /// - /// * [String] key: - Future getDownloadInfoOld(DownloadInfoDto downloadInfoDto, { String? key, }) async { - final response = await getDownloadInfoOldWithHttpInfo(downloadInfoDto, key: key, ); - if (response.statusCode >= HttpStatus.badRequest) { - throw ApiException(response.statusCode, await _decodeBodyBytes(response)); - } - // When a remote server returns no body with a status of 204, we shall not decode it. - // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" - // FormatException when trying to decode an empty string. - if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) { - return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'DownloadResponseDto',) as DownloadResponseDto; - - } - return null; - } - /// Performs an HTTP 'GET /asset/map-marker' operation and returns the [Response]. /// Parameters: /// @@ -1323,78 +1063,6 @@ class AssetApi { return null; } - /// Performs an HTTP 'POST /asset/restore' operation and returns the [Response]. - /// Parameters: - /// - /// * [BulkIdsDto] bulkIdsDto (required): - Future restoreAssetsOldWithHttpInfo(BulkIdsDto bulkIdsDto,) async { - // ignore: prefer_const_declarations - final path = r'/asset/restore'; - - // ignore: prefer_final_locals - Object? postBody = bulkIdsDto; - - final queryParams = []; - final headerParams = {}; - final formParams = {}; - - const contentTypes = ['application/json']; - - - return apiClient.invokeAPI( - path, - 'POST', - queryParams, - postBody, - headerParams, - formParams, - contentTypes.isEmpty ? null : contentTypes.first, - ); - } - - /// Parameters: - /// - /// * [BulkIdsDto] bulkIdsDto (required): - Future restoreAssetsOld(BulkIdsDto bulkIdsDto,) async { - final response = await restoreAssetsOldWithHttpInfo(bulkIdsDto,); - if (response.statusCode >= HttpStatus.badRequest) { - throw ApiException(response.statusCode, await _decodeBodyBytes(response)); - } - } - - /// Performs an HTTP 'POST /asset/trash/restore' operation and returns the [Response]. - Future restoreTrashOldWithHttpInfo() async { - // ignore: prefer_const_declarations - final path = r'/asset/trash/restore'; - - // ignore: prefer_final_locals - Object? postBody; - - final queryParams = []; - final headerParams = {}; - final formParams = {}; - - const contentTypes = []; - - - return apiClient.invokeAPI( - path, - 'POST', - queryParams, - postBody, - headerParams, - formParams, - contentTypes.isEmpty ? null : contentTypes.first, - ); - } - - Future restoreTrashOld() async { - final response = await restoreTrashOldWithHttpInfo(); - if (response.statusCode >= HttpStatus.badRequest) { - throw ApiException(response.statusCode, await _decodeBodyBytes(response)); - } - } - /// Performs an HTTP 'POST /asset/jobs' operation and returns the [Response]. /// Parameters: /// diff --git a/mobile/openapi/lib/api/o_auth_api.dart b/mobile/openapi/lib/api/o_auth_api.dart index c0d6bc06e0619..03373847980cc 100644 --- a/mobile/openapi/lib/api/o_auth_api.dart +++ b/mobile/openapi/lib/api/o_auth_api.dart @@ -63,58 +63,6 @@ class OAuthApi { return null; } - /// @deprecated use feature flags and /oauth/authorize - /// - /// Note: This method returns the HTTP [Response]. - /// - /// Parameters: - /// - /// * [OAuthConfigDto] oAuthConfigDto (required): - Future generateOAuthConfigWithHttpInfo(OAuthConfigDto oAuthConfigDto,) async { - // ignore: prefer_const_declarations - final path = r'/oauth/config'; - - // ignore: prefer_final_locals - Object? postBody = oAuthConfigDto; - - final queryParams = []; - final headerParams = {}; - final formParams = {}; - - const contentTypes = ['application/json']; - - - return apiClient.invokeAPI( - path, - 'POST', - queryParams, - postBody, - headerParams, - formParams, - contentTypes.isEmpty ? null : contentTypes.first, - ); - } - - /// @deprecated use feature flags and /oauth/authorize - /// - /// Parameters: - /// - /// * [OAuthConfigDto] oAuthConfigDto (required): - Future generateOAuthConfig(OAuthConfigDto oAuthConfigDto,) async { - final response = await generateOAuthConfigWithHttpInfo(oAuthConfigDto,); - if (response.statusCode >= HttpStatus.badRequest) { - throw ApiException(response.statusCode, await _decodeBodyBytes(response)); - } - // When a remote server returns no body with a status of 204, we shall not decode it. - // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" - // FormatException when trying to decode an empty string. - if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) { - return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'OAuthConfigResponseDto',) as OAuthConfigResponseDto; - - } - return null; - } - /// Performs an HTTP 'POST /oauth/link' operation and returns the [Response]. /// Parameters: /// diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart index a305ded56a9f1..9643a90424b20 100644 --- a/mobile/openapi/lib/api_client.dart +++ b/mobile/openapi/lib/api_client.dart @@ -344,8 +344,6 @@ class ApiClient { return OAuthCallbackDto.fromJson(value); case 'OAuthConfigDto': return OAuthConfigDto.fromJson(value); - case 'OAuthConfigResponseDto': - return OAuthConfigResponseDto.fromJson(value); case 'PartnerResponseDto': return PartnerResponseDto.fromJson(value); case 'PathEntityType': diff --git a/mobile/openapi/lib/model/o_auth_config_response_dto.dart b/mobile/openapi/lib/model/o_auth_config_response_dto.dart deleted file mode 100644 index 83fd87b6c8a44..0000000000000 --- a/mobile/openapi/lib/model/o_auth_config_response_dto.dart +++ /dev/null @@ -1,157 +0,0 @@ -// -// AUTO-GENERATED FILE, DO NOT MODIFY! -// -// @dart=2.12 - -// ignore_for_file: unused_element, unused_import -// ignore_for_file: always_put_required_named_parameters_first -// ignore_for_file: constant_identifier_names -// ignore_for_file: lines_longer_than_80_chars - -part of openapi.api; - -class OAuthConfigResponseDto { - /// Returns a new [OAuthConfigResponseDto] instance. - OAuthConfigResponseDto({ - this.autoLaunch, - this.buttonText, - required this.enabled, - required this.passwordLoginEnabled, - this.url, - }); - - /// - /// Please note: This property should have been non-nullable! Since the specification file - /// does not include a default value (using the "default:" property), however, the generated - /// source code must fall back to having a nullable type. - /// Consider adding a "default:" property in the specification file to hide this note. - /// - bool? autoLaunch; - - /// - /// Please note: This property should have been non-nullable! Since the specification file - /// does not include a default value (using the "default:" property), however, the generated - /// source code must fall back to having a nullable type. - /// Consider adding a "default:" property in the specification file to hide this note. - /// - String? buttonText; - - bool enabled; - - bool passwordLoginEnabled; - - /// - /// Please note: This property should have been non-nullable! Since the specification file - /// does not include a default value (using the "default:" property), however, the generated - /// source code must fall back to having a nullable type. - /// Consider adding a "default:" property in the specification file to hide this note. - /// - String? url; - - @override - bool operator ==(Object other) => identical(this, other) || other is OAuthConfigResponseDto && - other.autoLaunch == autoLaunch && - other.buttonText == buttonText && - other.enabled == enabled && - other.passwordLoginEnabled == passwordLoginEnabled && - other.url == url; - - @override - int get hashCode => - // ignore: unnecessary_parenthesis - (autoLaunch == null ? 0 : autoLaunch!.hashCode) + - (buttonText == null ? 0 : buttonText!.hashCode) + - (enabled.hashCode) + - (passwordLoginEnabled.hashCode) + - (url == null ? 0 : url!.hashCode); - - @override - String toString() => 'OAuthConfigResponseDto[autoLaunch=$autoLaunch, buttonText=$buttonText, enabled=$enabled, passwordLoginEnabled=$passwordLoginEnabled, url=$url]'; - - Map toJson() { - final json = {}; - if (this.autoLaunch != null) { - json[r'autoLaunch'] = this.autoLaunch; - } else { - // json[r'autoLaunch'] = null; - } - if (this.buttonText != null) { - json[r'buttonText'] = this.buttonText; - } else { - // json[r'buttonText'] = null; - } - json[r'enabled'] = this.enabled; - json[r'passwordLoginEnabled'] = this.passwordLoginEnabled; - if (this.url != null) { - json[r'url'] = this.url; - } else { - // json[r'url'] = null; - } - return json; - } - - /// Returns a new [OAuthConfigResponseDto] instance and imports its values from - /// [value] if it's a [Map], null otherwise. - // ignore: prefer_constructors_over_static_methods - static OAuthConfigResponseDto? fromJson(dynamic value) { - if (value is Map) { - final json = value.cast(); - - return OAuthConfigResponseDto( - autoLaunch: mapValueOfType(json, r'autoLaunch'), - buttonText: mapValueOfType(json, r'buttonText'), - enabled: mapValueOfType(json, r'enabled')!, - passwordLoginEnabled: mapValueOfType(json, r'passwordLoginEnabled')!, - url: mapValueOfType(json, r'url'), - ); - } - return null; - } - - static List listFromJson(dynamic json, {bool growable = false,}) { - final result = []; - if (json is List && json.isNotEmpty) { - for (final row in json) { - final value = OAuthConfigResponseDto.fromJson(row); - if (value != null) { - result.add(value); - } - } - } - return result.toList(growable: growable); - } - - static Map mapFromJson(dynamic json) { - final map = {}; - if (json is Map && json.isNotEmpty) { - json = json.cast(); // ignore: parameter_assignments - for (final entry in json.entries) { - final value = OAuthConfigResponseDto.fromJson(entry.value); - if (value != null) { - map[entry.key] = value; - } - } - } - return map; - } - - // maps a json object with a list of OAuthConfigResponseDto-objects as value to a dart map - static Map> mapListFromJson(dynamic json, {bool growable = false,}) { - final map = >{}; - if (json is Map && json.isNotEmpty) { - // ignore: parameter_assignments - json = json.cast(); - for (final entry in json.entries) { - map[entry.key] = OAuthConfigResponseDto.listFromJson(entry.value, growable: growable,); - } - } - return map; - } - - /// The list of required keys that must be present in a JSON. - static const requiredKeys = { - 'enabled', - 'passwordLoginEnabled', - }; -} - diff --git a/mobile/openapi/test/asset_api_test.dart b/mobile/openapi/test/asset_api_test.dart index 8d0910f1f0457..c34c85466c999 100644 --- a/mobile/openapi/test/asset_api_test.dart +++ b/mobile/openapi/test/asset_api_test.dart @@ -36,21 +36,6 @@ void main() { // TODO }); - //Future downloadArchiveOld(AssetIdsDto assetIdsDto, { String key }) async - test('test downloadArchiveOld', () async { - // TODO - }); - - //Future downloadFileOld(String id, { String key }) async - test('test downloadFileOld', () async { - // TODO - }); - - //Future emptyTrashOld() async - test('test emptyTrashOld', () async { - // TODO - }); - // Get all AssetEntity belong to the user // //Future> getAllAssets({ String ifNoneMatch, bool isArchived, bool isFavorite, int skip, int take, DateTime updatedAfter, DateTime updatedBefore, String userId }) async @@ -65,13 +50,6 @@ void main() { // TODO }); - // Get a single asset's information - // - //Future getAssetById(String id, { String key }) async - test('test getAssetById', () async { - // TODO - }); - //Future getAssetInfo(String id, { String key }) async test('test getAssetInfo', () async { // TODO @@ -102,11 +80,6 @@ void main() { // TODO }); - //Future getDownloadInfoOld(DownloadInfoDto downloadInfoDto, { String key }) async - test('test getDownloadInfoOld', () async { - // TODO - }); - //Future> getMapMarkers({ DateTime fileCreatedAfter, DateTime fileCreatedBefore, bool isArchived, bool isFavorite }) async test('test getMapMarkers', () async { // TODO @@ -132,16 +105,6 @@ void main() { // TODO }); - //Future restoreAssetsOld(BulkIdsDto bulkIdsDto) async - test('test restoreAssetsOld', () async { - // TODO - }); - - //Future restoreTrashOld() async - test('test restoreTrashOld', () async { - // TODO - }); - //Future runAssetJobs(AssetJobsDto assetJobsDto) async test('test runAssetJobs', () async { // TODO diff --git a/mobile/openapi/test/o_auth_api_test.dart b/mobile/openapi/test/o_auth_api_test.dart index 52326d423f6a4..055963aaecb71 100644 --- a/mobile/openapi/test/o_auth_api_test.dart +++ b/mobile/openapi/test/o_auth_api_test.dart @@ -22,13 +22,6 @@ void main() { // TODO }); - // @deprecated use feature flags and /oauth/authorize - // - //Future generateOAuthConfig(OAuthConfigDto oAuthConfigDto) async - test('test generateOAuthConfig', () async { - // TODO - }); - //Future linkOAuthAccount(OAuthCallbackDto oAuthCallbackDto) async test('test linkOAuthAccount', () async { // TODO diff --git a/mobile/openapi/test/o_auth_config_response_dto_test.dart b/mobile/openapi/test/o_auth_config_response_dto_test.dart deleted file mode 100644 index fd10307b31692..0000000000000 --- a/mobile/openapi/test/o_auth_config_response_dto_test.dart +++ /dev/null @@ -1,47 +0,0 @@ -// -// AUTO-GENERATED FILE, DO NOT MODIFY! -// -// @dart=2.12 - -// ignore_for_file: unused_element, unused_import -// ignore_for_file: always_put_required_named_parameters_first -// ignore_for_file: constant_identifier_names -// ignore_for_file: lines_longer_than_80_chars - -import 'package:openapi/api.dart'; -import 'package:test/test.dart'; - -// tests for OAuthConfigResponseDto -void main() { - // final instance = OAuthConfigResponseDto(); - - group('test OAuthConfigResponseDto', () { - // bool autoLaunch - test('to test the property `autoLaunch`', () async { - // TODO - }); - - // String buttonText - test('to test the property `buttonText`', () async { - // TODO - }); - - // bool enabled - test('to test the property `enabled`', () async { - // TODO - }); - - // bool passwordLoginEnabled - test('to test the property `passwordLoginEnabled`', () async { - // TODO - }); - - // String url - test('to test the property `url`', () async { - // TODO - }); - - - }); - -} diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json index b031456a2a0da..4c6317c2c2dcb 100644 --- a/open-api/immich-openapi-specs.json +++ b/open-api/immich-openapi-specs.json @@ -1055,58 +1055,6 @@ ] } }, - "/asset/assetById/{id}": { - "get": { - "deprecated": true, - "description": "Get a single asset's information", - "operationId": "getAssetById", - "parameters": [ - { - "name": "id", - "required": true, - "in": "path", - "schema": { - "format": "uuid", - "type": "string" - } - }, - { - "name": "key", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssetResponseDto" - } - } - }, - "description": "" - } - }, - "security": [ - { - "bearer": [] - }, - { - "cookie": [] - }, - { - "api_key": [] - } - ], - "tags": [ - "Asset" - ] - } - }, "/asset/bulk-upload-check": { "post": { "description": "Checks if assets exist by checksums", @@ -1265,160 +1213,6 @@ ] } }, - "/asset/download/archive": { - "post": { - "operationId": "downloadArchiveOld", - "parameters": [ - { - "name": "key", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - } - ], - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssetIdsDto" - } - } - }, - "required": true - }, - "responses": { - "200": { - "content": { - "application/octet-stream": { - "schema": { - "format": "binary", - "type": "string" - } - } - }, - "description": "" - } - }, - "security": [ - { - "bearer": [] - }, - { - "cookie": [] - }, - { - "api_key": [] - } - ], - "tags": [ - "Asset" - ] - } - }, - "/asset/download/info": { - "post": { - "operationId": "getDownloadInfoOld", - "parameters": [ - { - "name": "key", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - } - ], - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/DownloadInfoDto" - } - } - }, - "required": true - }, - "responses": { - "201": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/DownloadResponseDto" - } - } - }, - "description": "" - } - }, - "security": [ - { - "bearer": [] - }, - { - "cookie": [] - }, - { - "api_key": [] - } - ], - "tags": [ - "Asset" - ] - } - }, - "/asset/download/{id}": { - "post": { - "operationId": "downloadFileOld", - "parameters": [ - { - "name": "id", - "required": true, - "in": "path", - "schema": { - "format": "uuid", - "type": "string" - } - }, - { - "name": "key", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "content": { - "application/octet-stream": { - "schema": { - "format": "binary", - "type": "string" - } - } - }, - "description": "" - } - }, - "security": [ - { - "bearer": [] - }, - { - "cookie": [] - }, - { - "api_key": [] - } - ], - "tags": [ - "Asset" - ] - } - }, "/asset/exist": { "post": { "description": "Checks if multiple assets exist on the server and returns all existing - used by background backup", @@ -1732,41 +1526,6 @@ ] } }, - "/asset/restore": { - "post": { - "operationId": "restoreAssetsOld", - "parameters": [], - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/BulkIdsDto" - } - } - }, - "required": true - }, - "responses": { - "204": { - "description": "" - } - }, - "security": [ - { - "bearer": [] - }, - { - "cookie": [] - }, - { - "api_key": [] - } - ], - "tags": [ - "Asset" - ] - } - }, "/asset/search-terms": { "get": { "operationId": "getAssetSearchTerms", @@ -2217,56 +1976,6 @@ ] } }, - "/asset/trash/empty": { - "post": { - "operationId": "emptyTrashOld", - "parameters": [], - "responses": { - "204": { - "description": "" - } - }, - "security": [ - { - "bearer": [] - }, - { - "cookie": [] - }, - { - "api_key": [] - } - ], - "tags": [ - "Asset" - ] - } - }, - "/asset/trash/restore": { - "post": { - "operationId": "restoreTrashOld", - "parameters": [], - "responses": { - "204": { - "description": "" - } - }, - "security": [ - { - "bearer": [] - }, - { - "cookie": [] - }, - { - "api_key": [] - } - ], - "tags": [ - "Asset" - ] - } - }, "/asset/upload": { "post": { "operationId": "uploadFile", @@ -3935,39 +3644,6 @@ ] } }, - "/oauth/config": { - "post": { - "deprecated": true, - "description": "@deprecated use feature flags and /oauth/authorize", - "operationId": "generateOAuthConfig", - "parameters": [], - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/OAuthConfigDto" - } - } - }, - "required": true - }, - "responses": { - "201": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/OAuthConfigResponseDto" - } - } - }, - "description": "" - } - }, - "tags": [ - "OAuth" - ] - } - }, "/oauth/link": { "post": { "operationId": "linkOAuthAccount", @@ -8399,30 +8075,6 @@ ], "type": "object" }, - "OAuthConfigResponseDto": { - "properties": { - "autoLaunch": { - "type": "boolean" - }, - "buttonText": { - "type": "string" - }, - "enabled": { - "type": "boolean" - }, - "passwordLoginEnabled": { - "type": "boolean" - }, - "url": { - "type": "string" - } - }, - "required": [ - "enabled", - "passwordLoginEnabled" - ], - "type": "object" - }, "PartnerResponseDto": { "properties": { "avatarColor": { diff --git a/open-api/typescript-sdk/axios-client/api.ts b/open-api/typescript-sdk/axios-client/api.ts index f8866b7904dce..542fa0580ea98 100644 --- a/open-api/typescript-sdk/axios-client/api.ts +++ b/open-api/typescript-sdk/axios-client/api.ts @@ -2383,43 +2383,6 @@ export interface OAuthConfigDto { */ 'redirectUri': string; } -/** - * - * @export - * @interface OAuthConfigResponseDto - */ -export interface OAuthConfigResponseDto { - /** - * - * @type {boolean} - * @memberof OAuthConfigResponseDto - */ - 'autoLaunch'?: boolean; - /** - * - * @type {string} - * @memberof OAuthConfigResponseDto - */ - 'buttonText'?: string; - /** - * - * @type {boolean} - * @memberof OAuthConfigResponseDto - */ - 'enabled': boolean; - /** - * - * @type {boolean} - * @memberof OAuthConfigResponseDto - */ - 'passwordLoginEnabled': boolean; - /** - * - * @type {string} - * @memberof OAuthConfigResponseDto - */ - 'url'?: string; -} /** * * @export @@ -6981,140 +6944,6 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration options: localVarRequestOptions, }; }, - /** - * - * @param {AssetIdsDto} assetIdsDto - * @param {string} [key] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - downloadArchiveOld: async (assetIdsDto: AssetIdsDto, key?: string, options: RawAxiosRequestConfig = {}): Promise => { - // verify required parameter 'assetIdsDto' is not null or undefined - assertParamExists('downloadArchiveOld', 'assetIdsDto', assetIdsDto) - const localVarPath = `/asset/download/archive`; - // 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 cookie required - - // authentication api_key required - await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration) - - // authentication bearer required - // http bearer authentication required - await setBearerAuthToObject(localVarHeaderParameter, configuration) - - if (key !== undefined) { - localVarQueryParameter['key'] = key; - } - - - - localVarHeaderParameter['Content-Type'] = 'application/json'; - - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - localVarRequestOptions.data = serializeDataIfNeeded(assetIdsDto, localVarRequestOptions, configuration) - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - /** - * - * @param {string} id - * @param {string} [key] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - downloadFileOld: async (id: string, key?: string, options: RawAxiosRequestConfig = {}): Promise => { - // verify required parameter 'id' is not null or undefined - assertParamExists('downloadFileOld', 'id', id) - const localVarPath = `/asset/download/{id}` - .replace(`{${"id"}}`, encodeURIComponent(String(id))); - // 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 cookie required - - // authentication api_key required - await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration) - - // authentication bearer required - // http bearer authentication required - await setBearerAuthToObject(localVarHeaderParameter, configuration) - - if (key !== undefined) { - localVarQueryParameter['key'] = key; - } - - - - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - /** - * - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - emptyTrashOld: async (options: RawAxiosRequestConfig = {}): Promise => { - const localVarPath = `/asset/trash/empty`; - // 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 cookie required - - // authentication api_key required - await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration) - - // authentication bearer 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}; - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, /** * Get all AssetEntity belong to the user * @param {string} [ifNoneMatch] ETag of data already cached on the client @@ -7230,54 +7059,6 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - /** - * Get a single asset\'s information - * @param {string} id - * @param {string} [key] - * @param {*} [options] Override http request option. - * @deprecated - * @throws {RequiredError} - */ - getAssetById: async (id: string, key?: string, options: RawAxiosRequestConfig = {}): Promise => { - // verify required parameter 'id' is not null or undefined - assertParamExists('getAssetById', 'id', id) - const localVarPath = `/asset/assetById/{id}` - .replace(`{${"id"}}`, encodeURIComponent(String(id))); - // 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 cookie required - - // authentication api_key required - await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration) - - // authentication bearer required - // http bearer authentication required - await setBearerAuthToObject(localVarHeaderParameter, configuration) - - if (key !== undefined) { - localVarQueryParameter['key'] = key; - } - - - setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; @@ -7553,55 +7334,6 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration options: localVarRequestOptions, }; }, - /** - * - * @param {DownloadInfoDto} downloadInfoDto - * @param {string} [key] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - getDownloadInfoOld: async (downloadInfoDto: DownloadInfoDto, key?: string, options: RawAxiosRequestConfig = {}): Promise => { - // verify required parameter 'downloadInfoDto' is not null or undefined - assertParamExists('getDownloadInfoOld', 'downloadInfoDto', downloadInfoDto) - const localVarPath = `/asset/download/info`; - // 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 cookie required - - // authentication api_key required - await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration) - - // authentication bearer required - // http bearer authentication required - await setBearerAuthToObject(localVarHeaderParameter, configuration) - - if (key !== undefined) { - localVarQueryParameter['key'] = key; - } - - - - localVarHeaderParameter['Content-Type'] = 'application/json'; - - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - localVarRequestOptions.data = serializeDataIfNeeded(downloadInfoDto, localVarRequestOptions, configuration) - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, /** * * @param {string} [fileCreatedAfter] @@ -7948,14 +7680,14 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration }, /** * - * @param {BulkIdsDto} bulkIdsDto + * @param {AssetJobsDto} assetJobsDto * @param {*} [options] Override http request option. * @throws {RequiredError} */ - restoreAssetsOld: async (bulkIdsDto: BulkIdsDto, options: RawAxiosRequestConfig = {}): Promise => { - // verify required parameter 'bulkIdsDto' is not null or undefined - assertParamExists('restoreAssetsOld', 'bulkIdsDto', bulkIdsDto) - const localVarPath = `/asset/restore`; + runAssetJobs: async (assetJobsDto: AssetJobsDto, options: RawAxiosRequestConfig = {}): Promise => { + // verify required parameter 'assetJobsDto' is not null or undefined + assertParamExists('runAssetJobs', 'assetJobsDto', assetJobsDto) + const localVarPath = `/asset/jobs`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); let baseOptions; @@ -7983,89 +7715,7 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration setSearchParams(localVarUrlObj, localVarQueryParameter); let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - localVarRequestOptions.data = serializeDataIfNeeded(bulkIdsDto, localVarRequestOptions, configuration) - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - /** - * - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - restoreTrashOld: async (options: RawAxiosRequestConfig = {}): Promise => { - const localVarPath = `/asset/trash/restore`; - // 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 cookie required - - // authentication api_key required - await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration) - - // authentication bearer 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}; - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - /** - * - * @param {AssetJobsDto} assetJobsDto - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - runAssetJobs: async (assetJobsDto: AssetJobsDto, options: RawAxiosRequestConfig = {}): Promise => { - // verify required parameter 'assetJobsDto' is not null or undefined - assertParamExists('runAssetJobs', 'assetJobsDto', assetJobsDto) - const localVarPath = `/asset/jobs`; - // 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 cookie required - - // authentication api_key required - await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration) - - // authentication bearer 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(assetJobsDto, localVarRequestOptions, configuration) + localVarRequestOptions.data = serializeDataIfNeeded(assetJobsDto, localVarRequestOptions, configuration) return { url: toPathString(localVarUrlObj), @@ -8697,43 +8347,6 @@ export const AssetApiFp = function(configuration?: Configuration) { const operationBasePath = operationServerMap['AssetApi.deleteAssets']?.[index]?.url; return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath); }, - /** - * - * @param {AssetIdsDto} assetIdsDto - * @param {string} [key] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async downloadArchiveOld(assetIdsDto: AssetIdsDto, key?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.downloadArchiveOld(assetIdsDto, key, options); - const index = configuration?.serverIndex ?? 0; - const operationBasePath = operationServerMap['AssetApi.downloadArchiveOld']?.[index]?.url; - return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath); - }, - /** - * - * @param {string} id - * @param {string} [key] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async downloadFileOld(id: string, key?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.downloadFileOld(id, key, options); - const index = configuration?.serverIndex ?? 0; - const operationBasePath = operationServerMap['AssetApi.downloadFileOld']?.[index]?.url; - return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath); - }, - /** - * - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async emptyTrashOld(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.emptyTrashOld(options); - const index = configuration?.serverIndex ?? 0; - const operationBasePath = operationServerMap['AssetApi.emptyTrashOld']?.[index]?.url; - return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath); - }, /** * Get all AssetEntity belong to the user * @param {string} [ifNoneMatch] ETag of data already cached on the client @@ -8765,20 +8378,6 @@ export const AssetApiFp = function(configuration?: Configuration) { const operationBasePath = operationServerMap['AssetApi.getAllUserAssetsByDeviceId']?.[index]?.url; return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath); }, - /** - * Get a single asset\'s information - * @param {string} id - * @param {string} [key] - * @param {*} [options] Override http request option. - * @deprecated - * @throws {RequiredError} - */ - async getAssetById(id: string, key?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAssetById(id, key, options); - const index = configuration?.serverIndex ?? 0; - const operationBasePath = operationServerMap['AssetApi.getAssetById']?.[index]?.url; - return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath); - }, /** * * @param {string} id @@ -8853,19 +8452,6 @@ export const AssetApiFp = function(configuration?: Configuration) { const operationBasePath = operationServerMap['AssetApi.getCuratedObjects']?.[index]?.url; return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath); }, - /** - * - * @param {DownloadInfoDto} downloadInfoDto - * @param {string} [key] - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async getDownloadInfoOld(downloadInfoDto: DownloadInfoDto, key?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getDownloadInfoOld(downloadInfoDto, key, options); - const index = configuration?.serverIndex ?? 0; - const operationBasePath = operationServerMap['AssetApi.getDownloadInfoOld']?.[index]?.url; - return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath); - }, /** * * @param {string} [fileCreatedAfter] @@ -8949,29 +8535,6 @@ export const AssetApiFp = function(configuration?: Configuration) { const operationBasePath = operationServerMap['AssetApi.getTimeBuckets']?.[index]?.url; return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath); }, - /** - * - * @param {BulkIdsDto} bulkIdsDto - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async restoreAssetsOld(bulkIdsDto: BulkIdsDto, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.restoreAssetsOld(bulkIdsDto, options); - const index = configuration?.serverIndex ?? 0; - const operationBasePath = operationServerMap['AssetApi.restoreAssetsOld']?.[index]?.url; - return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath); - }, - /** - * - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async restoreTrashOld(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.restoreTrashOld(options); - const index = configuration?.serverIndex ?? 0; - const operationBasePath = operationServerMap['AssetApi.restoreTrashOld']?.[index]?.url; - return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath); - }, /** * * @param {AssetJobsDto} assetJobsDto @@ -9151,32 +8714,6 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath deleteAssets(requestParameters: AssetApiDeleteAssetsRequest, options?: RawAxiosRequestConfig): AxiosPromise { return localVarFp.deleteAssets(requestParameters.assetBulkDeleteDto, options).then((request) => request(axios, basePath)); }, - /** - * - * @param {AssetApiDownloadArchiveOldRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - downloadArchiveOld(requestParameters: AssetApiDownloadArchiveOldRequest, options?: RawAxiosRequestConfig): AxiosPromise { - return localVarFp.downloadArchiveOld(requestParameters.assetIdsDto, requestParameters.key, options).then((request) => request(axios, basePath)); - }, - /** - * - * @param {AssetApiDownloadFileOldRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - downloadFileOld(requestParameters: AssetApiDownloadFileOldRequest, options?: RawAxiosRequestConfig): AxiosPromise { - return localVarFp.downloadFileOld(requestParameters.id, requestParameters.key, options).then((request) => request(axios, basePath)); - }, - /** - * - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - emptyTrashOld(options?: RawAxiosRequestConfig): AxiosPromise { - return localVarFp.emptyTrashOld(options).then((request) => request(axios, basePath)); - }, /** * Get all AssetEntity belong to the user * @param {AssetApiGetAllAssetsRequest} requestParameters Request parameters. @@ -9195,16 +8732,6 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath getAllUserAssetsByDeviceId(requestParameters: AssetApiGetAllUserAssetsByDeviceIdRequest, options?: RawAxiosRequestConfig): AxiosPromise> { return localVarFp.getAllUserAssetsByDeviceId(requestParameters.deviceId, options).then((request) => request(axios, basePath)); }, - /** - * Get a single asset\'s information - * @param {AssetApiGetAssetByIdRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @deprecated - * @throws {RequiredError} - */ - getAssetById(requestParameters: AssetApiGetAssetByIdRequest, options?: RawAxiosRequestConfig): AxiosPromise { - return localVarFp.getAssetById(requestParameters.id, requestParameters.key, options).then((request) => request(axios, basePath)); - }, /** * * @param {AssetApiGetAssetInfoRequest} requestParameters Request parameters. @@ -9256,15 +8783,6 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath getCuratedObjects(options?: RawAxiosRequestConfig): AxiosPromise> { return localVarFp.getCuratedObjects(options).then((request) => request(axios, basePath)); }, - /** - * - * @param {AssetApiGetDownloadInfoOldRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - getDownloadInfoOld(requestParameters: AssetApiGetDownloadInfoOldRequest, options?: RawAxiosRequestConfig): AxiosPromise { - return localVarFp.getDownloadInfoOld(requestParameters.downloadInfoDto, requestParameters.key, options).then((request) => request(axios, basePath)); - }, /** * * @param {AssetApiGetMapMarkersRequest} requestParameters Request parameters. @@ -9310,23 +8828,6 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath getTimeBuckets(requestParameters: AssetApiGetTimeBucketsRequest, options?: RawAxiosRequestConfig): AxiosPromise> { return localVarFp.getTimeBuckets(requestParameters.size, requestParameters.albumId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.key, requestParameters.personId, requestParameters.userId, requestParameters.withPartners, requestParameters.withStacked, options).then((request) => request(axios, basePath)); }, - /** - * - * @param {AssetApiRestoreAssetsOldRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - restoreAssetsOld(requestParameters: AssetApiRestoreAssetsOldRequest, options?: RawAxiosRequestConfig): AxiosPromise { - return localVarFp.restoreAssetsOld(requestParameters.bulkIdsDto, options).then((request) => request(axios, basePath)); - }, - /** - * - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - restoreTrashOld(options?: RawAxiosRequestConfig): AxiosPromise { - return localVarFp.restoreTrashOld(options).then((request) => request(axios, basePath)); - }, /** * * @param {AssetApiRunAssetJobsRequest} requestParameters Request parameters. @@ -9435,48 +8936,6 @@ export interface AssetApiDeleteAssetsRequest { readonly assetBulkDeleteDto: AssetBulkDeleteDto } -/** - * Request parameters for downloadArchiveOld operation in AssetApi. - * @export - * @interface AssetApiDownloadArchiveOldRequest - */ -export interface AssetApiDownloadArchiveOldRequest { - /** - * - * @type {AssetIdsDto} - * @memberof AssetApiDownloadArchiveOld - */ - readonly assetIdsDto: AssetIdsDto - - /** - * - * @type {string} - * @memberof AssetApiDownloadArchiveOld - */ - readonly key?: string -} - -/** - * Request parameters for downloadFileOld operation in AssetApi. - * @export - * @interface AssetApiDownloadFileOldRequest - */ -export interface AssetApiDownloadFileOldRequest { - /** - * - * @type {string} - * @memberof AssetApiDownloadFileOld - */ - readonly id: string - - /** - * - * @type {string} - * @memberof AssetApiDownloadFileOld - */ - readonly key?: string -} - /** * Request parameters for getAllAssets operation in AssetApi. * @export @@ -9554,27 +9013,6 @@ export interface AssetApiGetAllUserAssetsByDeviceIdRequest { readonly deviceId: string } -/** - * Request parameters for getAssetById operation in AssetApi. - * @export - * @interface AssetApiGetAssetByIdRequest - */ -export interface AssetApiGetAssetByIdRequest { - /** - * - * @type {string} - * @memberof AssetApiGetAssetById - */ - readonly id: string - - /** - * - * @type {string} - * @memberof AssetApiGetAssetById - */ - readonly key?: string -} - /** * Request parameters for getAssetInfo operation in AssetApi. * @export @@ -9652,27 +9090,6 @@ export interface AssetApiGetAssetThumbnailRequest { readonly key?: string } -/** - * Request parameters for getDownloadInfoOld operation in AssetApi. - * @export - * @interface AssetApiGetDownloadInfoOldRequest - */ -export interface AssetApiGetDownloadInfoOldRequest { - /** - * - * @type {DownloadInfoDto} - * @memberof AssetApiGetDownloadInfoOld - */ - readonly downloadInfoDto: DownloadInfoDto - - /** - * - * @type {string} - * @memberof AssetApiGetDownloadInfoOld - */ - readonly key?: string -} - /** * Request parameters for getMapMarkers operation in AssetApi. * @export @@ -9904,20 +9321,6 @@ export interface AssetApiGetTimeBucketsRequest { readonly withStacked?: boolean } -/** - * Request parameters for restoreAssetsOld operation in AssetApi. - * @export - * @interface AssetApiRestoreAssetsOldRequest - */ -export interface AssetApiRestoreAssetsOldRequest { - /** - * - * @type {BulkIdsDto} - * @memberof AssetApiRestoreAssetsOld - */ - readonly bulkIdsDto: BulkIdsDto -} - /** * Request parameters for runAssetJobs operation in AssetApi. * @export @@ -10462,38 +9865,6 @@ export class AssetApi extends BaseAPI { return AssetApiFp(this.configuration).deleteAssets(requestParameters.assetBulkDeleteDto, options).then((request) => request(this.axios, this.basePath)); } - /** - * - * @param {AssetApiDownloadArchiveOldRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof AssetApi - */ - public downloadArchiveOld(requestParameters: AssetApiDownloadArchiveOldRequest, options?: RawAxiosRequestConfig) { - return AssetApiFp(this.configuration).downloadArchiveOld(requestParameters.assetIdsDto, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); - } - - /** - * - * @param {AssetApiDownloadFileOldRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof AssetApi - */ - public downloadFileOld(requestParameters: AssetApiDownloadFileOldRequest, options?: RawAxiosRequestConfig) { - return AssetApiFp(this.configuration).downloadFileOld(requestParameters.id, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); - } - - /** - * - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof AssetApi - */ - public emptyTrashOld(options?: RawAxiosRequestConfig) { - return AssetApiFp(this.configuration).emptyTrashOld(options).then((request) => request(this.axios, this.basePath)); - } - /** * Get all AssetEntity belong to the user * @param {AssetApiGetAllAssetsRequest} requestParameters Request parameters. @@ -10516,18 +9887,6 @@ export class AssetApi extends BaseAPI { return AssetApiFp(this.configuration).getAllUserAssetsByDeviceId(requestParameters.deviceId, options).then((request) => request(this.axios, this.basePath)); } - /** - * Get a single asset\'s information - * @param {AssetApiGetAssetByIdRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @deprecated - * @throws {RequiredError} - * @memberof AssetApi - */ - public getAssetById(requestParameters: AssetApiGetAssetByIdRequest, options?: RawAxiosRequestConfig) { - return AssetApiFp(this.configuration).getAssetById(requestParameters.id, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); - } - /** * * @param {AssetApiGetAssetInfoRequest} requestParameters Request parameters. @@ -10591,17 +9950,6 @@ export class AssetApi extends BaseAPI { return AssetApiFp(this.configuration).getCuratedObjects(options).then((request) => request(this.axios, this.basePath)); } - /** - * - * @param {AssetApiGetDownloadInfoOldRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof AssetApi - */ - public getDownloadInfoOld(requestParameters: AssetApiGetDownloadInfoOldRequest, options?: RawAxiosRequestConfig) { - return AssetApiFp(this.configuration).getDownloadInfoOld(requestParameters.downloadInfoDto, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); - } - /** * * @param {AssetApiGetMapMarkersRequest} requestParameters Request parameters. @@ -10657,27 +10005,6 @@ export class AssetApi extends BaseAPI { return AssetApiFp(this.configuration).getTimeBuckets(requestParameters.size, requestParameters.albumId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.key, requestParameters.personId, requestParameters.userId, requestParameters.withPartners, requestParameters.withStacked, options).then((request) => request(this.axios, this.basePath)); } - /** - * - * @param {AssetApiRestoreAssetsOldRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof AssetApi - */ - public restoreAssetsOld(requestParameters: AssetApiRestoreAssetsOldRequest, options?: RawAxiosRequestConfig) { - return AssetApiFp(this.configuration).restoreAssetsOld(requestParameters.bulkIdsDto, options).then((request) => request(this.axios, this.basePath)); - } - - /** - * - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof AssetApi - */ - public restoreTrashOld(options?: RawAxiosRequestConfig) { - return AssetApiFp(this.configuration).restoreTrashOld(options).then((request) => request(this.axios, this.basePath)); - } - /** * * @param {AssetApiRunAssetJobsRequest} requestParameters Request parameters. @@ -13391,42 +12718,6 @@ export const OAuthApiAxiosParamCreator = function (configuration?: Configuration options: localVarRequestOptions, }; }, - /** - * @deprecated use feature flags and /oauth/authorize - * @param {OAuthConfigDto} oAuthConfigDto - * @param {*} [options] Override http request option. - * @deprecated - * @throws {RequiredError} - */ - generateOAuthConfig: async (oAuthConfigDto: OAuthConfigDto, options: RawAxiosRequestConfig = {}): Promise => { - // verify required parameter 'oAuthConfigDto' is not null or undefined - assertParamExists('generateOAuthConfig', 'oAuthConfigDto', oAuthConfigDto) - const localVarPath = `/oauth/config`; - // 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(oAuthConfigDto, localVarRequestOptions, configuration) - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, /** * * @param {OAuthCallbackDto} oAuthCallbackDto @@ -13595,19 +12886,6 @@ export const OAuthApiFp = function(configuration?: Configuration) { const operationBasePath = operationServerMap['OAuthApi.finishOAuth']?.[index]?.url; return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath); }, - /** - * @deprecated use feature flags and /oauth/authorize - * @param {OAuthConfigDto} oAuthConfigDto - * @param {*} [options] Override http request option. - * @deprecated - * @throws {RequiredError} - */ - async generateOAuthConfig(oAuthConfigDto: OAuthConfigDto, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.generateOAuthConfig(oAuthConfigDto, options); - const index = configuration?.serverIndex ?? 0; - const operationBasePath = operationServerMap['OAuthApi.generateOAuthConfig']?.[index]?.url; - return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath); - }, /** * * @param {OAuthCallbackDto} oAuthCallbackDto @@ -13673,16 +12951,6 @@ export const OAuthApiFactory = function (configuration?: Configuration, basePath finishOAuth(requestParameters: OAuthApiFinishOAuthRequest, options?: RawAxiosRequestConfig): AxiosPromise { return localVarFp.finishOAuth(requestParameters.oAuthCallbackDto, options).then((request) => request(axios, basePath)); }, - /** - * @deprecated use feature flags and /oauth/authorize - * @param {OAuthApiGenerateOAuthConfigRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @deprecated - * @throws {RequiredError} - */ - generateOAuthConfig(requestParameters: OAuthApiGenerateOAuthConfigRequest, options?: RawAxiosRequestConfig): AxiosPromise { - return localVarFp.generateOAuthConfig(requestParameters.oAuthConfigDto, options).then((request) => request(axios, basePath)); - }, /** * * @param {OAuthApiLinkOAuthAccountRequest} requestParameters Request parameters. @@ -13734,20 +13002,6 @@ export interface OAuthApiFinishOAuthRequest { readonly oAuthCallbackDto: OAuthCallbackDto } -/** - * Request parameters for generateOAuthConfig operation in OAuthApi. - * @export - * @interface OAuthApiGenerateOAuthConfigRequest - */ -export interface OAuthApiGenerateOAuthConfigRequest { - /** - * - * @type {OAuthConfigDto} - * @memberof OAuthApiGenerateOAuthConfig - */ - readonly oAuthConfigDto: OAuthConfigDto -} - /** * Request parameters for linkOAuthAccount operation in OAuthApi. * @export @@ -13794,18 +13048,6 @@ export class OAuthApi extends BaseAPI { return OAuthApiFp(this.configuration).finishOAuth(requestParameters.oAuthCallbackDto, options).then((request) => request(this.axios, this.basePath)); } - /** - * @deprecated use feature flags and /oauth/authorize - * @param {OAuthApiGenerateOAuthConfigRequest} requestParameters Request parameters. - * @param {*} [options] Override http request option. - * @deprecated - * @throws {RequiredError} - * @memberof OAuthApi - */ - public generateOAuthConfig(requestParameters: OAuthApiGenerateOAuthConfigRequest, options?: RawAxiosRequestConfig) { - return OAuthApiFp(this.configuration).generateOAuthConfig(requestParameters.oAuthConfigDto, options).then((request) => request(this.axios, this.basePath)); - } - /** * * @param {OAuthApiLinkOAuthAccountRequest} requestParameters Request parameters. diff --git a/open-api/typescript-sdk/fetch-client/.openapi-generator/FILES b/open-api/typescript-sdk/fetch-client/.openapi-generator/FILES index 3f9fcad44ea8e..404449e74dc3e 100644 --- a/open-api/typescript-sdk/fetch-client/.openapi-generator/FILES +++ b/open-api/typescript-sdk/fetch-client/.openapi-generator/FILES @@ -101,7 +101,6 @@ models/ModelType.ts models/OAuthAuthorizeResponseDto.ts models/OAuthCallbackDto.ts models/OAuthConfigDto.ts -models/OAuthConfigResponseDto.ts models/PartnerResponseDto.ts models/PathEntityType.ts models/PathType.ts diff --git a/open-api/typescript-sdk/fetch-client/apis/AssetApi.ts b/open-api/typescript-sdk/fetch-client/apis/AssetApi.ts index 5d5ea1b170be2..38f7babb47312 100644 --- a/open-api/typescript-sdk/fetch-client/apis/AssetApi.ts +++ b/open-api/typescript-sdk/fetch-client/apis/AssetApi.ts @@ -20,19 +20,15 @@ import type { AssetBulkUploadCheckDto, AssetBulkUploadCheckResponseDto, AssetFileUploadResponseDto, - AssetIdsDto, AssetJobsDto, AssetOrder, AssetResponseDto, AssetStatsResponseDto, AssetTypeEnum, - BulkIdsDto, CheckExistingAssetsDto, CheckExistingAssetsResponseDto, CuratedLocationsResponseDto, CuratedObjectsResponseDto, - DownloadInfoDto, - DownloadResponseDto, MapMarkerResponseDto, MemoryLaneResponseDto, ThumbnailFormat, @@ -52,8 +48,6 @@ import { AssetBulkUploadCheckResponseDtoToJSON, AssetFileUploadResponseDtoFromJSON, AssetFileUploadResponseDtoToJSON, - AssetIdsDtoFromJSON, - AssetIdsDtoToJSON, AssetJobsDtoFromJSON, AssetJobsDtoToJSON, AssetOrderFromJSON, @@ -64,8 +58,6 @@ import { AssetStatsResponseDtoToJSON, AssetTypeEnumFromJSON, AssetTypeEnumToJSON, - BulkIdsDtoFromJSON, - BulkIdsDtoToJSON, CheckExistingAssetsDtoFromJSON, CheckExistingAssetsDtoToJSON, CheckExistingAssetsResponseDtoFromJSON, @@ -74,10 +66,6 @@ import { CuratedLocationsResponseDtoToJSON, CuratedObjectsResponseDtoFromJSON, CuratedObjectsResponseDtoToJSON, - DownloadInfoDtoFromJSON, - DownloadInfoDtoToJSON, - DownloadResponseDtoFromJSON, - DownloadResponseDtoToJSON, MapMarkerResponseDtoFromJSON, MapMarkerResponseDtoToJSON, MemoryLaneResponseDtoFromJSON, @@ -106,16 +94,6 @@ export interface DeleteAssetsRequest { assetBulkDeleteDto: AssetBulkDeleteDto; } -export interface DownloadArchiveOldRequest { - assetIdsDto: AssetIdsDto; - key?: string; -} - -export interface DownloadFileOldRequest { - id: string; - key?: string; -} - export interface GetAllAssetsRequest { ifNoneMatch?: string; isArchived?: boolean; @@ -131,11 +109,6 @@ export interface GetAllUserAssetsByDeviceIdRequest { deviceId: string; } -export interface GetAssetByIdRequest { - id: string; - key?: string; -} - export interface GetAssetInfoRequest { id: string; key?: string; @@ -153,11 +126,6 @@ export interface GetAssetThumbnailRequest { key?: string; } -export interface GetDownloadInfoOldRequest { - downloadInfoDto: DownloadInfoDto; - key?: string; -} - export interface GetMapMarkersRequest { fileCreatedAfter?: Date; fileCreatedBefore?: Date; @@ -201,10 +169,6 @@ export interface GetTimeBucketsRequest { withStacked?: boolean; } -export interface RestoreAssetsOldRequest { - bulkIdsDto: BulkIdsDto; -} - export interface RunAssetJobsRequest { assetJobsDto: AssetJobsDto; } @@ -428,132 +392,6 @@ export class AssetApi extends runtime.BaseAPI { await this.deleteAssetsRaw(requestParameters, initOverrides); } - /** - */ - async downloadArchiveOldRaw(requestParameters: DownloadArchiveOldRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { - if (requestParameters.assetIdsDto === null || requestParameters.assetIdsDto === undefined) { - throw new runtime.RequiredError('assetIdsDto','Required parameter requestParameters.assetIdsDto was null or undefined when calling downloadArchiveOld.'); - } - - const queryParameters: any = {}; - - if (requestParameters.key !== undefined) { - queryParameters['key'] = requestParameters.key; - } - - const headerParameters: runtime.HTTPHeaders = {}; - - headerParameters['Content-Type'] = 'application/json'; - - if (this.configuration && this.configuration.apiKey) { - headerParameters["x-api-key"] = this.configuration.apiKey("x-api-key"); // api_key authentication - } - - if (this.configuration && this.configuration.accessToken) { - const token = this.configuration.accessToken; - const tokenString = await token("bearer", []); - - if (tokenString) { - headerParameters["Authorization"] = `Bearer ${tokenString}`; - } - } - const response = await this.request({ - path: `/asset/download/archive`, - method: 'POST', - headers: headerParameters, - query: queryParameters, - body: AssetIdsDtoToJSON(requestParameters.assetIdsDto), - }, initOverrides); - - return new runtime.BlobApiResponse(response); - } - - /** - */ - async downloadArchiveOld(requestParameters: DownloadArchiveOldRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { - const response = await this.downloadArchiveOldRaw(requestParameters, initOverrides); - return await response.value(); - } - - /** - */ - async downloadFileOldRaw(requestParameters: DownloadFileOldRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { - if (requestParameters.id === null || requestParameters.id === undefined) { - throw new runtime.RequiredError('id','Required parameter requestParameters.id was null or undefined when calling downloadFileOld.'); - } - - const queryParameters: any = {}; - - if (requestParameters.key !== undefined) { - queryParameters['key'] = requestParameters.key; - } - - const headerParameters: runtime.HTTPHeaders = {}; - - if (this.configuration && this.configuration.apiKey) { - headerParameters["x-api-key"] = this.configuration.apiKey("x-api-key"); // api_key authentication - } - - if (this.configuration && this.configuration.accessToken) { - const token = this.configuration.accessToken; - const tokenString = await token("bearer", []); - - if (tokenString) { - headerParameters["Authorization"] = `Bearer ${tokenString}`; - } - } - const response = await this.request({ - path: `/asset/download/{id}`.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters.id))), - method: 'POST', - headers: headerParameters, - query: queryParameters, - }, initOverrides); - - return new runtime.BlobApiResponse(response); - } - - /** - */ - async downloadFileOld(requestParameters: DownloadFileOldRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { - const response = await this.downloadFileOldRaw(requestParameters, initOverrides); - return await response.value(); - } - - /** - */ - async emptyTrashOldRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { - const queryParameters: any = {}; - - const headerParameters: runtime.HTTPHeaders = {}; - - if (this.configuration && this.configuration.apiKey) { - headerParameters["x-api-key"] = this.configuration.apiKey("x-api-key"); // api_key authentication - } - - if (this.configuration && this.configuration.accessToken) { - const token = this.configuration.accessToken; - const tokenString = await token("bearer", []); - - if (tokenString) { - headerParameters["Authorization"] = `Bearer ${tokenString}`; - } - } - const response = await this.request({ - path: `/asset/trash/empty`, - method: 'POST', - headers: headerParameters, - query: queryParameters, - }, initOverrides); - - return new runtime.VoidApiResponse(response); - } - - /** - */ - async emptyTrashOld(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { - await this.emptyTrashOldRaw(initOverrides); - } - /** * Get all AssetEntity belong to the user */ @@ -666,54 +504,6 @@ export class AssetApi extends runtime.BaseAPI { return await response.value(); } - /** - * Get a single asset\'s information - * @deprecated - */ - async getAssetByIdRaw(requestParameters: GetAssetByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { - if (requestParameters.id === null || requestParameters.id === undefined) { - throw new runtime.RequiredError('id','Required parameter requestParameters.id was null or undefined when calling getAssetById.'); - } - - const queryParameters: any = {}; - - if (requestParameters.key !== undefined) { - queryParameters['key'] = requestParameters.key; - } - - const headerParameters: runtime.HTTPHeaders = {}; - - if (this.configuration && this.configuration.apiKey) { - headerParameters["x-api-key"] = this.configuration.apiKey("x-api-key"); // api_key authentication - } - - if (this.configuration && this.configuration.accessToken) { - const token = this.configuration.accessToken; - const tokenString = await token("bearer", []); - - if (tokenString) { - headerParameters["Authorization"] = `Bearer ${tokenString}`; - } - } - const response = await this.request({ - path: `/asset/assetById/{id}`.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters.id))), - method: 'GET', - headers: headerParameters, - query: queryParameters, - }, initOverrides); - - return new runtime.JSONApiResponse(response, (jsonValue) => AssetResponseDtoFromJSON(jsonValue)); - } - - /** - * Get a single asset\'s information - * @deprecated - */ - async getAssetById(requestParameters: GetAssetByIdRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { - const response = await this.getAssetByIdRaw(requestParameters, initOverrides); - return await response.value(); - } - /** */ async getAssetInfoRaw(requestParameters: GetAssetInfoRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { @@ -962,53 +752,6 @@ export class AssetApi extends runtime.BaseAPI { return await response.value(); } - /** - */ - async getDownloadInfoOldRaw(requestParameters: GetDownloadInfoOldRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { - if (requestParameters.downloadInfoDto === null || requestParameters.downloadInfoDto === undefined) { - throw new runtime.RequiredError('downloadInfoDto','Required parameter requestParameters.downloadInfoDto was null or undefined when calling getDownloadInfoOld.'); - } - - const queryParameters: any = {}; - - if (requestParameters.key !== undefined) { - queryParameters['key'] = requestParameters.key; - } - - const headerParameters: runtime.HTTPHeaders = {}; - - headerParameters['Content-Type'] = 'application/json'; - - if (this.configuration && this.configuration.apiKey) { - headerParameters["x-api-key"] = this.configuration.apiKey("x-api-key"); // api_key authentication - } - - if (this.configuration && this.configuration.accessToken) { - const token = this.configuration.accessToken; - const tokenString = await token("bearer", []); - - if (tokenString) { - headerParameters["Authorization"] = `Bearer ${tokenString}`; - } - } - const response = await this.request({ - path: `/asset/download/info`, - method: 'POST', - headers: headerParameters, - query: queryParameters, - body: DownloadInfoDtoToJSON(requestParameters.downloadInfoDto), - }, initOverrides); - - return new runtime.JSONApiResponse(response, (jsonValue) => DownloadResponseDtoFromJSON(jsonValue)); - } - - /** - */ - async getDownloadInfoOld(requestParameters: GetDownloadInfoOldRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { - const response = await this.getDownloadInfoOldRaw(requestParameters, initOverrides); - return await response.value(); - } - /** */ async getMapMarkersRaw(requestParameters: GetMapMarkersRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>> { @@ -1321,83 +1064,6 @@ export class AssetApi extends runtime.BaseAPI { return await response.value(); } - /** - */ - async restoreAssetsOldRaw(requestParameters: RestoreAssetsOldRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { - if (requestParameters.bulkIdsDto === null || requestParameters.bulkIdsDto === undefined) { - throw new runtime.RequiredError('bulkIdsDto','Required parameter requestParameters.bulkIdsDto was null or undefined when calling restoreAssetsOld.'); - } - - const queryParameters: any = {}; - - const headerParameters: runtime.HTTPHeaders = {}; - - headerParameters['Content-Type'] = 'application/json'; - - if (this.configuration && this.configuration.apiKey) { - headerParameters["x-api-key"] = this.configuration.apiKey("x-api-key"); // api_key authentication - } - - if (this.configuration && this.configuration.accessToken) { - const token = this.configuration.accessToken; - const tokenString = await token("bearer", []); - - if (tokenString) { - headerParameters["Authorization"] = `Bearer ${tokenString}`; - } - } - const response = await this.request({ - path: `/asset/restore`, - method: 'POST', - headers: headerParameters, - query: queryParameters, - body: BulkIdsDtoToJSON(requestParameters.bulkIdsDto), - }, initOverrides); - - return new runtime.VoidApiResponse(response); - } - - /** - */ - async restoreAssetsOld(requestParameters: RestoreAssetsOldRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { - await this.restoreAssetsOldRaw(requestParameters, initOverrides); - } - - /** - */ - async restoreTrashOldRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { - const queryParameters: any = {}; - - const headerParameters: runtime.HTTPHeaders = {}; - - if (this.configuration && this.configuration.apiKey) { - headerParameters["x-api-key"] = this.configuration.apiKey("x-api-key"); // api_key authentication - } - - if (this.configuration && this.configuration.accessToken) { - const token = this.configuration.accessToken; - const tokenString = await token("bearer", []); - - if (tokenString) { - headerParameters["Authorization"] = `Bearer ${tokenString}`; - } - } - const response = await this.request({ - path: `/asset/trash/restore`, - method: 'POST', - headers: headerParameters, - query: queryParameters, - }, initOverrides); - - return new runtime.VoidApiResponse(response); - } - - /** - */ - async restoreTrashOld(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { - await this.restoreTrashOldRaw(initOverrides); - } - /** */ async runAssetJobsRaw(requestParameters: RunAssetJobsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { diff --git a/open-api/typescript-sdk/fetch-client/apis/OAuthApi.ts b/open-api/typescript-sdk/fetch-client/apis/OAuthApi.ts index 60e30d4e0c27c..295ebbebfd25d 100644 --- a/open-api/typescript-sdk/fetch-client/apis/OAuthApi.ts +++ b/open-api/typescript-sdk/fetch-client/apis/OAuthApi.ts @@ -19,7 +19,6 @@ import type { OAuthAuthorizeResponseDto, OAuthCallbackDto, OAuthConfigDto, - OAuthConfigResponseDto, UserResponseDto, } from '../models/index'; import { @@ -31,8 +30,6 @@ import { OAuthCallbackDtoToJSON, OAuthConfigDtoFromJSON, OAuthConfigDtoToJSON, - OAuthConfigResponseDtoFromJSON, - OAuthConfigResponseDtoToJSON, UserResponseDtoFromJSON, UserResponseDtoToJSON, } from '../models/index'; @@ -41,10 +38,6 @@ export interface FinishOAuthRequest { oAuthCallbackDto: OAuthCallbackDto; } -export interface GenerateOAuthConfigRequest { - oAuthConfigDto: OAuthConfigDto; -} - export interface LinkOAuthAccountRequest { oAuthCallbackDto: OAuthCallbackDto; } @@ -89,41 +82,6 @@ export class OAuthApi extends runtime.BaseAPI { return await response.value(); } - /** - * @deprecated use feature flags and /oauth/authorize - * @deprecated - */ - async generateOAuthConfigRaw(requestParameters: GenerateOAuthConfigRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { - if (requestParameters.oAuthConfigDto === null || requestParameters.oAuthConfigDto === undefined) { - throw new runtime.RequiredError('oAuthConfigDto','Required parameter requestParameters.oAuthConfigDto was null or undefined when calling generateOAuthConfig.'); - } - - const queryParameters: any = {}; - - const headerParameters: runtime.HTTPHeaders = {}; - - headerParameters['Content-Type'] = 'application/json'; - - const response = await this.request({ - path: `/oauth/config`, - method: 'POST', - headers: headerParameters, - query: queryParameters, - body: OAuthConfigDtoToJSON(requestParameters.oAuthConfigDto), - }, initOverrides); - - return new runtime.JSONApiResponse(response, (jsonValue) => OAuthConfigResponseDtoFromJSON(jsonValue)); - } - - /** - * @deprecated use feature flags and /oauth/authorize - * @deprecated - */ - async generateOAuthConfig(requestParameters: GenerateOAuthConfigRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { - const response = await this.generateOAuthConfigRaw(requestParameters, initOverrides); - return await response.value(); - } - /** */ async linkOAuthAccountRaw(requestParameters: LinkOAuthAccountRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { diff --git a/open-api/typescript-sdk/fetch-client/models/index.ts b/open-api/typescript-sdk/fetch-client/models/index.ts index ce30d3afe87a4..19e4f387feb1c 100644 --- a/open-api/typescript-sdk/fetch-client/models/index.ts +++ b/open-api/typescript-sdk/fetch-client/models/index.ts @@ -81,7 +81,6 @@ export * from './ModelType'; export * from './OAuthAuthorizeResponseDto'; export * from './OAuthCallbackDto'; export * from './OAuthConfigDto'; -export * from './OAuthConfigResponseDto'; export * from './PartnerResponseDto'; export * from './PathEntityType'; export * from './PathType'; diff --git a/server/e2e/api/specs/asset.e2e-spec.ts b/server/e2e/api/specs/asset.e2e-spec.ts index e38f08d0ca96f..6f6bc889037e8 100644 --- a/server/e2e/api/specs/asset.e2e-spec.ts +++ b/server/e2e/api/specs/asset.e2e-spec.ts @@ -14,7 +14,7 @@ import { AssetEntity, AssetStackEntity, AssetType, SharedLinkType } from '@app/i import { AssetRepository } from '@app/infra/repositories'; import { INestApplication } from '@nestjs/common'; import { errorStub, userDto, uuidStub } from '@test/fixtures'; -import { randomBytes } from 'crypto'; +import { randomBytes } from 'node:crypto'; import request from 'supertest'; import { api } from '../../client'; import { generateAsset, testApp, today, yesterday } from '../utils'; @@ -517,17 +517,16 @@ describe(`${AssetController.name} (e2e)`, () => { } }); - // TODO remove with deprecated endpoint - describe('GET /asset/assetById/:id', () => { + describe('GET /asset/:id', () => { it('should require authentication', async () => { - const { status, body } = await request(server).get(`/asset/assetById/${uuidStub.notFound}`); + const { status, body } = await request(server).get(`/asset/${uuidStub.notFound}`); expect(body).toEqual(errorStub.unauthorized); expect(status).toBe(401); }); it('should require a valid id', async () => { const { status, body } = await request(server) - .get(`/asset/assetById/${uuidStub.invalid}`) + .get(`/asset/${uuidStub.invalid}`) .set('Authorization', `Bearer ${user1.accessToken}`); expect(status).toBe(400); expect(body).toEqual(errorStub.badRequest(['id must be a UUID'])); @@ -535,7 +534,7 @@ describe(`${AssetController.name} (e2e)`, () => { it('should require access', async () => { const { status, body } = await request(server) - .get(`/asset/assetById/${asset4.id}`) + .get(`/asset/${asset4.id}`) .set('Authorization', `Bearer ${user1.accessToken}`); expect(status).toBe(400); expect(body).toEqual(errorStub.noPermission); @@ -543,7 +542,7 @@ describe(`${AssetController.name} (e2e)`, () => { it('should get the asset info', async () => { const { status, body } = await request(server) - .get(`/asset/assetById/${asset1.id}`) + .get(`/asset/${asset1.id}`) .set('Authorization', `Bearer ${user1.accessToken}`); expect(status).toBe(200); expect(body).toMatchObject({ id: asset1.id }); @@ -555,7 +554,7 @@ describe(`${AssetController.name} (e2e)`, () => { assetIds: [asset1.id], }); - const { status, body } = await request(server).get(`/asset/assetById/${asset1.id}?key=${sharedLink.key}`); + const { status, body } = await request(server).get(`/asset/${asset1.id}?key=${sharedLink.key}`); expect(status).toBe(200); expect(body).toMatchObject({ id: asset1.id }); }); @@ -596,55 +595,12 @@ describe(`${AssetController.name} (e2e)`, () => { assetIds: [asset1.id], }); - const data = await request(server).get(`/asset/assetById/${asset1.id}?key=${sharedLink.key}`); + const data = await request(server).get(`/asset/${asset1.id}?key=${sharedLink.key}`); expect(data.status).toBe(200); expect(data.body).toMatchObject({ people: [] }); }); }); - describe('GET /asset/:id', () => { - it('should require authentication', async () => { - const { status, body } = await request(server).get(`/asset/${uuidStub.notFound}`); - expect(body).toEqual(errorStub.unauthorized); - expect(status).toBe(401); - }); - - it('should require a valid id', async () => { - const { status, body } = await request(server) - .get(`/asset/${uuidStub.invalid}`) - .set('Authorization', `Bearer ${user1.accessToken}`); - expect(status).toBe(400); - expect(body).toEqual(errorStub.badRequest(['id must be a UUID'])); - }); - - it('should require access', async () => { - const { status, body } = await request(server) - .get(`/asset/${asset4.id}`) - .set('Authorization', `Bearer ${user1.accessToken}`); - expect(status).toBe(400); - expect(body).toEqual(errorStub.noPermission); - }); - - it('should get the asset info', async () => { - const { status, body } = await request(server) - .get(`/asset/${asset1.id}`) - .set('Authorization', `Bearer ${user1.accessToken}`); - expect(status).toBe(200); - expect(body).toMatchObject({ id: asset1.id }); - }); - - it('should work with a shared link', async () => { - const sharedLink = await api.sharedLinkApi.create(server, user1.accessToken, { - type: SharedLinkType.INDIVIDUAL, - assetIds: [asset1.id], - }); - - const { status, body } = await request(server).get(`/asset/${asset1.id}?key=${sharedLink.key}`); - expect(status).toBe(200); - expect(body).toMatchObject({ id: asset1.id }); - }); - }); - describe('POST /asset/upload', () => { it('should require authentication', async () => { const { status, body } = await request(server) @@ -920,46 +876,6 @@ describe(`${AssetController.name} (e2e)`, () => { }); }); - describe('POST /asset/download/info', () => { - it('should require authentication', async () => { - const { status, body } = await request(server) - .post(`/asset/download/info`) - .send({ assetIds: [asset1.id] }); - - expect(status).toBe(401); - expect(body).toEqual(errorStub.unauthorized); - }); - - it('should download info', async () => { - const { status, body } = await request(server) - .post('/asset/download/info') - .set('Authorization', `Bearer ${user1.accessToken}`) - .send({ assetIds: [asset1.id] }); - - expect(status).toBe(201); - expect(body).toEqual(expect.objectContaining({ archives: [expect.objectContaining({ assetIds: [asset1.id] })] })); - }); - }); - - describe('POST /asset/download/:id', () => { - it('should require authentication', async () => { - const { status, body } = await request(server).post(`/asset/download/${asset1.id}`); - - expect(status).toBe(401); - expect(body).toEqual(errorStub.unauthorized); - }); - - it('should download file', async () => { - const asset = await api.assetApi.upload(server, user1.accessToken, 'example'); - const response = await request(server) - .post(`/asset/download/${asset.id}`) - .set('Authorization', `Bearer ${user1.accessToken}`); - - expect(response.status).toBe(200); - expect(response.headers['content-type']).toEqual('image/jpeg'); - }); - }); - describe('GET /asset/statistics', () => { beforeEach(async () => { await api.assetApi.upload(server, user1.accessToken, 'favored_asset', { isFavorite: true }); @@ -1459,20 +1375,20 @@ describe(`${AssetController.name} (e2e)`, () => { }); }); + const getAssetIdsWithoutFaces = async () => { + const assetPagination = usePagination(10, (pagination) => + assetRepository.getWithout(pagination, WithoutProperty.FACES), + ); + let assets: AssetEntity[] = []; + for await (const assetsPage of assetPagination) { + assets = [...assets, ...assetsPage]; + } + return assets.map((a) => a.id); + }; + describe(AssetRepository.name, () => { describe('getWithout', () => { describe('WithoutProperty.FACES', () => { - const getAssetIdsWithoutFaces = async () => { - const assetPagination = usePagination(10, (pagination) => - assetRepository.getWithout(pagination, WithoutProperty.FACES), - ); - let assets: AssetEntity[] = []; - for await (const assetsPage of assetPagination) { - assets = [...assets, ...assetsPage]; - } - return assets.map((a) => a.id); - }; - beforeEach(async () => { await assetRepository.save({ id: asset1.id, resizePath: '/path/to/resize' }); expect(await getAssetIdsWithoutFaces()).toContain(asset1.id); diff --git a/server/e2e/api/specs/download.e2e-spec.ts b/server/e2e/api/specs/download.e2e-spec.ts new file mode 100644 index 0000000000000..9f8c477df90c0 --- /dev/null +++ b/server/e2e/api/specs/download.e2e-spec.ts @@ -0,0 +1,89 @@ +import { AssetResponseDto, IAssetRepository, LibraryResponseDto, LoginResponseDto, mapAsset } from '@app/domain'; +import { AssetController } from '@app/immich'; +import { AssetEntity } from '@app/infra/entities'; +import { INestApplication } from '@nestjs/common'; +import { errorStub, userDto } from '@test/fixtures'; +import request from 'supertest'; +import { api } from '../../client'; +import { generateAsset, testApp } from '../utils'; + +describe(`${AssetController.name} (e2e)`, () => { + let app: INestApplication; + let server: any; + let assetRepository: IAssetRepository; + let user1: LoginResponseDto; + let libraries: LibraryResponseDto[]; + let asset1: AssetResponseDto; + + const createAsset = async ( + loginResponse: LoginResponseDto, + fileCreatedAt: Date, + other: Partial = {}, + ) => { + const asset = await assetRepository.create( + generateAsset(loginResponse.userId, libraries, { fileCreatedAt, ...other }), + ); + + return mapAsset(asset); + }; + + beforeAll(async () => { + app = await testApp.create(); + server = app.getHttpServer(); + assetRepository = app.get(IAssetRepository); + + await testApp.reset(); + + await api.authApi.adminSignUp(server); + const admin = await api.authApi.adminLogin(server); + + await api.userApi.create(server, admin.accessToken, userDto.user1); + user1 = await api.authApi.login(server, userDto.user1); + libraries = await api.libraryApi.getAll(server, user1.accessToken); + asset1 = await createAsset(user1, new Date('1970-01-01')); + }); + + afterAll(async () => { + await testApp.teardown(); + }); + + describe('POST /download/info', () => { + it('should require authentication', async () => { + const { status, body } = await request(server) + .post(`/download/info`) + .send({ assetIds: [asset1.id] }); + + expect(status).toBe(401); + expect(body).toEqual(errorStub.unauthorized); + }); + + it('should download info', async () => { + const { status, body } = await request(server) + .post('/download/info') + .set('Authorization', `Bearer ${user1.accessToken}`) + .send({ assetIds: [asset1.id] }); + + expect(status).toBe(201); + expect(body).toEqual(expect.objectContaining({ archives: [expect.objectContaining({ assetIds: [asset1.id] })] })); + }); + }); + + describe('POST /download/asset/:id', () => { + it('should require authentication', async () => { + const { status, body } = await request(server).post(`/download/asset/${asset1.id}`); + + expect(status).toBe(401); + expect(body).toEqual(errorStub.unauthorized); + }); + + it('should download file', async () => { + const asset = await api.assetApi.upload(server, user1.accessToken, 'example'); + const response = await request(server) + .post(`/download/asset/${asset.id}`) + .set('Authorization', `Bearer ${user1.accessToken}`); + + expect(response.status).toBe(200); + expect(response.headers['content-type']).toEqual('image/jpeg'); + }); + }); +}); diff --git a/server/e2e/client/asset-api.ts b/server/e2e/client/asset-api.ts index b9ae897b33aa0..8d2a1b79bcc67 100644 --- a/server/e2e/client/asset-api.ts +++ b/server/e2e/client/asset-api.ts @@ -1,7 +1,7 @@ import { AssetResponseDto } from '@app/domain'; import { CreateAssetDto } from '@app/immich/api-v1/asset/dto/create-asset.dto'; import { AssetFileUploadResponseDto } from '@app/immich/api-v1/asset/response-dto/asset-file-upload-response.dto'; -import { randomBytes } from 'crypto'; +import { randomBytes } from 'node:crypto'; import request from 'supertest'; type UploadDto = Partial & { content?: Buffer; filename?: string }; @@ -34,9 +34,7 @@ export const assetApi = { return body as AssetResponseDto; }, get: async (server: any, accessToken: string, id: string): Promise => { - const { body, status } = await request(server) - .get(`/asset/assetById/${id}`) - .set('Authorization', `Bearer ${accessToken}`); + const { body, status } = await request(server).get(`/asset/${id}`).set('Authorization', `Bearer ${accessToken}`); expect(status).toBe(200); return body as AssetResponseDto; }, diff --git a/server/src/domain/auth/auth.dto.ts b/server/src/domain/auth/auth.dto.ts index 854ac9996361f..2f6f4b4b72e57 100644 --- a/server/src/domain/auth/auth.dto.ts +++ b/server/src/domain/auth/auth.dto.ts @@ -106,15 +106,6 @@ export class OAuthConfigDto { redirectUri!: string; } -/** @deprecated use oauth authorize */ -export class OAuthConfigResponseDto { - enabled!: boolean; - passwordLoginEnabled!: boolean; - url?: string; - buttonText?: string; - autoLaunch?: boolean; -} - export class OAuthAuthorizeResponseDto { url!: string; } diff --git a/server/src/domain/auth/auth.service.spec.ts b/server/src/domain/auth/auth.service.spec.ts index 78462cb4905c2..8ebb75857a0cf 100644 --- a/server/src/domain/auth/auth.service.spec.ts +++ b/server/src/domain/auth/auth.service.spec.ts @@ -429,27 +429,6 @@ describe('AuthService', () => { }); }); - describe('generateConfig', () => { - it('should work when oauth is not configured', async () => { - configMock.load.mockResolvedValue(systemConfigStub.disabled); - await expect(sut.generateConfig({ redirectUri: 'http://callback' })).resolves.toEqual({ - enabled: false, - passwordLoginEnabled: false, - }); - }); - - it('should generate the config', async () => { - configMock.load.mockResolvedValue(systemConfigStub.enabled); - await expect(sut.generateConfig({ redirectUri: 'http://redirect' })).resolves.toEqual({ - enabled: true, - buttonText: 'OAuth', - url: 'http://authorization-url', - autoLaunch: false, - passwordLoginEnabled: true, - }); - }); - }); - describe('callback', () => { it('should throw an error if OAuth is not enabled', async () => { await expect(sut.callback({ url: '' }, loginDetails)).rejects.toBeInstanceOf(BadRequestException); diff --git a/server/src/domain/auth/auth.service.ts b/server/src/domain/auth/auth.service.ts index 2acade6365664..d4c2e4e189737 100644 --- a/server/src/domain/auth/auth.service.ts +++ b/server/src/domain/auth/auth.service.ts @@ -42,7 +42,6 @@ import { OAuthAuthorizeResponseDto, OAuthCallbackDto, OAuthConfigDto, - OAuthConfigResponseDto, SignUpDto, mapLoginResponse, mapUserToken, @@ -201,28 +200,6 @@ export class AuthService { return `${MOBILE_REDIRECT}?${url.split('?')[1] || ''}`; } - async generateConfig(dto: OAuthConfigDto): Promise { - const config = await this.configCore.getConfig(); - const response = { - enabled: config.oauth.enabled, - passwordLoginEnabled: config.passwordLogin.enabled, - }; - - if (!response.enabled) { - return response; - } - - const { scope, buttonText, autoLaunch } = config.oauth; - const oauthClient = await this.getOAuthClient(config); - const url = oauthClient.authorizationUrl({ - redirect_uri: this.normalize(config, dto.redirectUri), - scope, - state: generators.state(), - }); - - return { ...response, buttonText, url, autoLaunch }; - } - async authorize(dto: OAuthConfigDto): Promise { const config = await this.configCore.getConfig(); if (!config.oauth.enabled) { diff --git a/server/src/domain/system-config/system-config.core.ts b/server/src/domain/system-config/system-config.core.ts index 0516e040431f1..1591e87d63310 100644 --- a/server/src/domain/system-config/system-config.core.ts +++ b/server/src/domain/system-config/system-config.core.ts @@ -230,8 +230,6 @@ export class SystemConfigCore { [FeatureFlag.SIDECAR]: true, [FeatureFlag.SEARCH]: true, [FeatureFlag.TRASH]: config.trash.enabled, - - // TODO: use these instead of `POST oauth/config` [FeatureFlag.OAUTH]: config.oauth.enabled, [FeatureFlag.OAUTH_AUTO_LAUNCH]: config.oauth.autoLaunch, [FeatureFlag.PASSWORD_LOGIN]: config.passwordLogin.enabled, diff --git a/server/src/immich/api-v1/asset/asset.controller.ts b/server/src/immich/api-v1/asset/asset.controller.ts index ddcb8417c8929..bc59e2dfef243 100644 --- a/server/src/immich/api-v1/asset/asset.controller.ts +++ b/server/src/immich/api-v1/asset/asset.controller.ts @@ -1,4 +1,4 @@ -import { AssetResponseDto, AssetService, AuthDto } from '@app/domain'; +import { AssetResponseDto, AuthDto } from '@app/domain'; import { Body, Controller, @@ -18,7 +18,7 @@ import { import { ApiBody, ApiConsumes, ApiHeader, ApiTags } from '@nestjs/swagger'; import { NextFunction, Response } from 'express'; import { Auth, Authenticated, FileResponse, SharedLinkRoute } from '../../app.guard'; -import { UseValidation, sendFile } from '../../app.utils'; +import { sendFile } from '../../app.utils'; import { UUIDParamDto } from '../../controllers/dto/uuid-param.dto'; import { FileUploadInterceptor, ImmichFile, Route, mapToUploadFile } from '../../interceptors'; import FileNotEmptyValidator from '../validation/file-not-empty-validator'; @@ -45,10 +45,7 @@ interface UploadFiles { @Controller(Route.ASSET) @Authenticated() export class AssetController { - constructor( - private serviceV1: AssetServiceV1, - private service: AssetService, - ) {} + constructor(private serviceV1: AssetServiceV1) {} @SharedLinkRoute() @Post('upload') @@ -143,17 +140,6 @@ export class AssetController { return this.serviceV1.getAllAssets(auth, dto); } - /** - * Get a single asset's information - * @deprecated Use `/asset/:id` - */ - @SharedLinkRoute() - @UseValidation() - @Get('/assetById/:id') - getAssetById(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise { - return this.service.get(auth, id) as Promise; - } - /** * Checks if multiple assets exist on the server and returns all existing - used by background backup */ diff --git a/server/src/immich/controllers/asset.controller.ts b/server/src/immich/controllers/asset.controller.ts index 86a2b155ab819..ad29ff080d99a 100644 --- a/server/src/immich/controllers/asset.controller.ts +++ b/server/src/immich/controllers/asset.controller.ts @@ -1,7 +1,6 @@ import { AssetBulkDeleteDto, AssetBulkUpdateDto, - AssetIdsDto, AssetJobsDto, AssetResponseDto, AssetSearchDto, @@ -9,10 +8,7 @@ import { AssetStatsDto, AssetStatsResponseDto, AuthDto, - BulkIdsDto, DeviceIdDto, - DownloadInfoDto, - DownloadResponseDto, DownloadService, MapMarkerDto, MapMarkerResponseDto, @@ -26,25 +22,10 @@ import { UpdateAssetDto as UpdateDto, UpdateStackParentDto, } from '@app/domain'; -import { - Body, - Controller, - Delete, - Get, - HttpCode, - HttpStatus, - Next, - Param, - Post, - Put, - Query, - Res, - StreamableFile, -} from '@nestjs/common'; +import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put, Query } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; -import { NextFunction, Response } from 'express'; -import { Auth, Authenticated, FileResponse, SharedLinkRoute } from '../app.guard'; -import { UseValidation, asStreamableFile, sendFile } from '../app.utils'; +import { Auth, Authenticated, SharedLinkRoute } from '../app.guard'; +import { UseValidation } from '../app.utils'; import { Route } from '../interceptors'; import { UUIDParamDto } from './dto/uuid-param.dto'; @@ -87,42 +68,6 @@ export class AssetController { return this.service.getRandom(auth, dto.count ?? 1); } - /** - * @deprecated use `/download/info` - */ - @SharedLinkRoute() - @Post('download/info') - getDownloadInfoOld(@Auth() auth: AuthDto, @Body() dto: DownloadInfoDto): Promise { - return this.downloadService.getDownloadInfo(auth, dto); - } - - /** - * @deprecated use `/download/archive` - */ - @SharedLinkRoute() - @Post('download/archive') - @HttpCode(HttpStatus.OK) - @FileResponse() - downloadArchiveOld(@Auth() auth: AuthDto, @Body() dto: AssetIdsDto): Promise { - return this.downloadService.downloadArchive(auth, dto).then(asStreamableFile); - } - - /** - * @deprecated use `/download/:id` - */ - @SharedLinkRoute() - @Post('download/:id') - @HttpCode(HttpStatus.OK) - @FileResponse() - async downloadFileOld( - @Res() res: Response, - @Next() next: NextFunction, - @Auth() auth: AuthDto, - @Param() { id }: UUIDParamDto, - ) { - await sendFile(res, next, () => this.downloadService.downloadFile(auth, id)); - } - /** * Get all asset of a device that are in the database, ID only. */ @@ -166,33 +111,6 @@ export class AssetController { return this.service.deleteAll(auth, dto); } - /** - * @deprecated use `POST /trash/restore/assets` - */ - @Post('restore') - @HttpCode(HttpStatus.NO_CONTENT) - restoreAssetsOld(@Auth() auth: AuthDto, @Body() dto: BulkIdsDto): Promise { - return this.trashService.restoreAssets(auth, dto); - } - - /** - * @deprecated use `POST /trash/empty` - */ - @Post('trash/empty') - @HttpCode(HttpStatus.NO_CONTENT) - emptyTrashOld(@Auth() auth: AuthDto): Promise { - return this.trashService.empty(auth); - } - - /** - * @deprecated use `POST /trash/restore` - */ - @Post('trash/restore') - @HttpCode(HttpStatus.NO_CONTENT) - restoreTrashOld(@Auth() auth: AuthDto): Promise { - return this.trashService.restore(auth); - } - @Put('stack/parent') @HttpCode(HttpStatus.OK) updateStackParent(@Auth() auth: AuthDto, @Body() dto: UpdateStackParentDto): Promise { diff --git a/server/src/immich/controllers/oauth.controller.ts b/server/src/immich/controllers/oauth.controller.ts index 678e4a4f3cc69..a62458715bbaf 100644 --- a/server/src/immich/controllers/oauth.controller.ts +++ b/server/src/immich/controllers/oauth.controller.ts @@ -6,7 +6,6 @@ import { OAuthAuthorizeResponseDto, OAuthCallbackDto, OAuthConfigDto, - OAuthConfigResponseDto, UserResponseDto, } from '@app/domain'; import { Body, Controller, Get, HttpStatus, Post, Redirect, Req, Res } from '@nestjs/common'; @@ -32,13 +31,6 @@ export class OAuthController { }; } - /** @deprecated use feature flags and /oauth/authorize */ - @PublicRoute() - @Post('config') - generateOAuthConfig(@Body() dto: OAuthConfigDto): Promise { - return this.service.generateConfig(dto); - } - @PublicRoute() @Post('authorize') startOAuth(@Body() dto: OAuthConfigDto): Promise {