From 82f12b8ee6a90ac3350c6864a743479d18d4053a Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jrasm91@gmail.com>
Date: Fri, 17 Nov 2023 00:44:59 -0500
Subject: [PATCH] chore(server): remove import file endpoint (#5093)
* chore(server): remove import file endpoint
* chore: open api
---
cli/src/api/open-api/api.ts | 179 ------------
mobile/openapi/.openapi-generator/FILES | 3 -
mobile/openapi/README.md | 2 -
mobile/openapi/doc/AssetApi.md | 56 ----
mobile/openapi/doc/ImportAssetDto.md | 28 --
mobile/openapi/lib/api.dart | 1 -
mobile/openapi/lib/api/asset_api.dart | 47 ---
mobile/openapi/lib/api_client.dart | 2 -
.../openapi/lib/model/import_asset_dto.dart | 273 ------------------
mobile/openapi/test/asset_api_test.dart | 5 -
.../openapi/test/import_asset_dto_test.dart | 92 ------
server/immich-openapi-specs.json | 100 -------
.../immich/api-v1/asset/asset.controller.ts | 16 +-
server/src/immich/api-v1/asset/asset.core.ts | 4 +-
.../immich/api-v1/asset/asset.service.spec.ts | 52 +---
.../src/immich/api-v1/asset/asset.service.ts | 68 +----
.../api-v1/asset/dto/create-asset.dto.ts | 20 --
web/src/api/open-api/api.ts | 179 ------------
18 files changed, 7 insertions(+), 1120 deletions(-)
delete mode 100644 mobile/openapi/doc/ImportAssetDto.md
delete mode 100644 mobile/openapi/lib/model/import_asset_dto.dart
delete mode 100644 mobile/openapi/test/import_asset_dto_test.dart
diff --git a/cli/src/api/open-api/api.ts b/cli/src/api/open-api/api.ts
index c4a62ca05..a64e632c0 100644
--- a/cli/src/api/open-api/api.ts
+++ b/cli/src/api/open-api/api.ts
@@ -1773,97 +1773,6 @@ export interface FileReportItemDto {
}
-/**
- *
- * @export
- * @interface ImportAssetDto
- */
-export interface ImportAssetDto {
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'assetPath': string;
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'deviceAssetId': string;
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'deviceId': string;
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'duration'?: string;
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'fileCreatedAt': string;
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'fileModifiedAt': string;
- /**
- *
- * @type {boolean}
- * @memberof ImportAssetDto
- */
- 'isArchived'?: boolean;
- /**
- *
- * @type {boolean}
- * @memberof ImportAssetDto
- */
- 'isExternal'?: boolean;
- /**
- *
- * @type {boolean}
- * @memberof ImportAssetDto
- */
- 'isFavorite'?: boolean;
- /**
- *
- * @type {boolean}
- * @memberof ImportAssetDto
- */
- 'isOffline'?: boolean;
- /**
- *
- * @type {boolean}
- * @memberof ImportAssetDto
- */
- 'isReadOnly'?: boolean;
- /**
- *
- * @type {boolean}
- * @memberof ImportAssetDto
- */
- 'isVisible'?: boolean;
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'libraryId'?: string;
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'sidecarPath'?: string;
-}
/**
*
* @export
@@ -7609,50 +7518,6 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration
options: localVarRequestOptions,
};
},
- /**
- *
- * @param {ImportAssetDto} importAssetDto
- * @param {*} [options] Override http request option.
- * @throws {RequiredError}
- */
- importFile: async (importAssetDto: ImportAssetDto, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
- // verify required parameter 'importAssetDto' is not null or undefined
- assertParamExists('importFile', 'importAssetDto', importAssetDto)
- const localVarPath = `/asset/import`;
- // 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(importAssetDto, localVarRequestOptions, configuration)
-
- return {
- url: toPathString(localVarUrlObj),
- options: localVarRequestOptions,
- };
- },
/**
*
* @param {BulkIdsDto} bulkIdsDto
@@ -8602,16 +8467,6 @@ export const AssetApiFp = function(configuration?: Configuration) {
const localVarAxiosArgs = await localVarAxiosParamCreator.getUserAssetsByDeviceId(deviceId, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
- /**
- *
- * @param {ImportAssetDto} importAssetDto
- * @param {*} [options] Override http request option.
- * @throws {RequiredError}
- */
- async importFile(importAssetDto: ImportAssetDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<AssetFileUploadResponseDto>> {
- const localVarAxiosArgs = await localVarAxiosParamCreator.importFile(importAssetDto, options);
- return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
- },
/**
*
* @param {BulkIdsDto} bulkIdsDto
@@ -8945,15 +8800,6 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath
getUserAssetsByDeviceId(requestParameters: AssetApiGetUserAssetsByDeviceIdRequest, options?: AxiosRequestConfig): AxiosPromise<Array<string>> {
return localVarFp.getUserAssetsByDeviceId(requestParameters.deviceId, options).then((request) => request(axios, basePath));
},
- /**
- *
- * @param {AssetApiImportFileRequest} requestParameters Request parameters.
- * @param {*} [options] Override http request option.
- * @throws {RequiredError}
- */
- importFile(requestParameters: AssetApiImportFileRequest, options?: AxiosRequestConfig): AxiosPromise<AssetFileUploadResponseDto> {
- return localVarFp.importFile(requestParameters.importAssetDto, options).then((request) => request(axios, basePath));
- },
/**
*
* @param {AssetApiRestoreAssetsRequest} requestParameters Request parameters.
@@ -9527,20 +9373,6 @@ export interface AssetApiGetUserAssetsByDeviceIdRequest {
readonly deviceId: string
}
-/**
- * Request parameters for importFile operation in AssetApi.
- * @export
- * @interface AssetApiImportFileRequest
- */
-export interface AssetApiImportFileRequest {
- /**
- *
- * @type {ImportAssetDto}
- * @memberof AssetApiImportFile
- */
- readonly importAssetDto: ImportAssetDto
-}
-
/**
* Request parameters for restoreAssets operation in AssetApi.
* @export
@@ -10282,17 +10114,6 @@ export class AssetApi extends BaseAPI {
return AssetApiFp(this.configuration).getUserAssetsByDeviceId(requestParameters.deviceId, options).then((request) => request(this.axios, this.basePath));
}
- /**
- *
- * @param {AssetApiImportFileRequest} requestParameters Request parameters.
- * @param {*} [options] Override http request option.
- * @throws {RequiredError}
- * @memberof AssetApi
- */
- public importFile(requestParameters: AssetApiImportFileRequest, options?: AxiosRequestConfig) {
- return AssetApiFp(this.configuration).importFile(requestParameters.importAssetDto, options).then((request) => request(this.axios, this.basePath));
- }
-
/**
*
* @param {AssetApiRestoreAssetsRequest} requestParameters Request parameters.
diff --git a/mobile/openapi/.openapi-generator/FILES b/mobile/openapi/.openapi-generator/FILES
index 9fa09ace2..10f10fb01 100644
--- a/mobile/openapi/.openapi-generator/FILES
+++ b/mobile/openapi/.openapi-generator/FILES
@@ -66,7 +66,6 @@ doc/FileChecksumResponseDto.md
doc/FileReportDto.md
doc/FileReportFixDto.md
doc/FileReportItemDto.md
-doc/ImportAssetDto.md
doc/JobApi.md
doc/JobCommand.md
doc/JobCommandDto.md
@@ -255,7 +254,6 @@ lib/model/file_checksum_response_dto.dart
lib/model/file_report_dto.dart
lib/model/file_report_fix_dto.dart
lib/model/file_report_item_dto.dart
-lib/model/import_asset_dto.dart
lib/model/job_command.dart
lib/model/job_command_dto.dart
lib/model/job_counts_dto.dart
@@ -413,7 +411,6 @@ test/file_checksum_response_dto_test.dart
test/file_report_dto_test.dart
test/file_report_fix_dto_test.dart
test/file_report_item_dto_test.dart
-test/import_asset_dto_test.dart
test/job_api_test.dart
test/job_command_dto_test.dart
test/job_command_test.dart
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index a3c42639e..49958f2dc 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -111,7 +111,6 @@ Class | Method | HTTP request | Description
*AssetApi* | [**getTimeBucket**](doc//AssetApi.md#gettimebucket) | **GET** /asset/time-bucket |
*AssetApi* | [**getTimeBuckets**](doc//AssetApi.md#gettimebuckets) | **GET** /asset/time-buckets |
*AssetApi* | [**getUserAssetsByDeviceId**](doc//AssetApi.md#getuserassetsbydeviceid) | **GET** /asset/{deviceId} |
-*AssetApi* | [**importFile**](doc//AssetApi.md#importfile) | **POST** /asset/import |
*AssetApi* | [**restoreAssets**](doc//AssetApi.md#restoreassets) | **POST** /asset/restore |
*AssetApi* | [**restoreTrash**](doc//AssetApi.md#restoretrash) | **POST** /asset/trash/restore |
*AssetApi* | [**runAssetJobs**](doc//AssetApi.md#runassetjobs) | **POST** /asset/jobs |
@@ -264,7 +263,6 @@ Class | Method | HTTP request | Description
- [FileReportDto](doc//FileReportDto.md)
- [FileReportFixDto](doc//FileReportFixDto.md)
- [FileReportItemDto](doc//FileReportItemDto.md)
- - [ImportAssetDto](doc//ImportAssetDto.md)
- [JobCommand](doc//JobCommand.md)
- [JobCommandDto](doc//JobCommandDto.md)
- [JobCountsDto](doc//JobCountsDto.md)
diff --git a/mobile/openapi/doc/AssetApi.md b/mobile/openapi/doc/AssetApi.md
index e57d58c26..16f7ef94d 100644
--- a/mobile/openapi/doc/AssetApi.md
+++ b/mobile/openapi/doc/AssetApi.md
@@ -29,7 +29,6 @@ Method | HTTP request | Description
[**getTimeBucket**](AssetApi.md#gettimebucket) | **GET** /asset/time-bucket |
[**getTimeBuckets**](AssetApi.md#gettimebuckets) | **GET** /asset/time-buckets |
[**getUserAssetsByDeviceId**](AssetApi.md#getuserassetsbydeviceid) | **GET** /asset/{deviceId} |
-[**importFile**](AssetApi.md#importfile) | **POST** /asset/import |
[**restoreAssets**](AssetApi.md#restoreassets) | **POST** /asset/restore |
[**restoreTrash**](AssetApi.md#restoretrash) | **POST** /asset/trash/restore |
[**runAssetJobs**](AssetApi.md#runassetjobs) | **POST** /asset/jobs |
@@ -1209,61 +1208,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)
-# **importFile**
-> AssetFileUploadResponseDto importFile(importAssetDto)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = AssetApi();
-final importAssetDto = ImportAssetDto(); // ImportAssetDto |
-
-try {
- final result = api_instance.importFile(importAssetDto);
- print(result);
-} catch (e) {
- print('Exception when calling AssetApi->importFile: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description | Notes
-------------- | ------------- | ------------- | -------------
- **importAssetDto** | [**ImportAssetDto**](ImportAssetDto.md)| |
-
-### Return type
-
-[**AssetFileUploadResponseDto**](AssetFileUploadResponseDto.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)
-
# **restoreAssets**
> restoreAssets(bulkIdsDto)
diff --git a/mobile/openapi/doc/ImportAssetDto.md b/mobile/openapi/doc/ImportAssetDto.md
deleted file mode 100644
index 3f2747edc..000000000
--- a/mobile/openapi/doc/ImportAssetDto.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# openapi.model.ImportAssetDto
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**assetPath** | **String** | |
-**deviceAssetId** | **String** | |
-**deviceId** | **String** | |
-**duration** | **String** | | [optional]
-**fileCreatedAt** | [**DateTime**](DateTime.md) | |
-**fileModifiedAt** | [**DateTime**](DateTime.md) | |
-**isArchived** | **bool** | | [optional]
-**isExternal** | **bool** | | [optional]
-**isFavorite** | **bool** | | [optional]
-**isOffline** | **bool** | | [optional]
-**isReadOnly** | **bool** | | [optional] [default to true]
-**isVisible** | **bool** | | [optional]
-**libraryId** | **String** | | [optional]
-**sidecarPath** | **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 6fa19074d..3052d5d8b 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -103,7 +103,6 @@ part 'model/file_checksum_response_dto.dart';
part 'model/file_report_dto.dart';
part 'model/file_report_fix_dto.dart';
part 'model/file_report_item_dto.dart';
-part 'model/import_asset_dto.dart';
part 'model/job_command.dart';
part 'model/job_command_dto.dart';
part 'model/job_counts_dto.dart';
diff --git a/mobile/openapi/lib/api/asset_api.dart b/mobile/openapi/lib/api/asset_api.dart
index 95cc99e6e..366c83d57 100644
--- a/mobile/openapi/lib/api/asset_api.dart
+++ b/mobile/openapi/lib/api/asset_api.dart
@@ -1267,53 +1267,6 @@ class AssetApi {
return null;
}
- /// Performs an HTTP 'POST /asset/import' operation and returns the [Response].
- /// Parameters:
- ///
- /// * [ImportAssetDto] importAssetDto (required):
- Future<Response> importFileWithHttpInfo(ImportAssetDto importAssetDto,) async {
- // ignore: prefer_const_declarations
- final path = r'/asset/import';
-
- // ignore: prefer_final_locals
- Object? postBody = importAssetDto;
-
- final queryParams = <QueryParam>[];
- final headerParams = <String, String>{};
- final formParams = <String, String>{};
-
- const contentTypes = <String>['application/json'];
-
-
- return apiClient.invokeAPI(
- path,
- 'POST',
- queryParams,
- postBody,
- headerParams,
- formParams,
- contentTypes.isEmpty ? null : contentTypes.first,
- );
- }
-
- /// Parameters:
- ///
- /// * [ImportAssetDto] importAssetDto (required):
- Future<AssetFileUploadResponseDto?> importFile(ImportAssetDto importAssetDto,) async {
- final response = await importFileWithHttpInfo(importAssetDto,);
- 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), 'AssetFileUploadResponseDto',) as AssetFileUploadResponseDto;
-
- }
- return null;
- }
-
/// Performs an HTTP 'POST /asset/restore' operation and returns the [Response].
/// Parameters:
///
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index 23b8764c1..77a999701 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -295,8 +295,6 @@ class ApiClient {
return FileReportFixDto.fromJson(value);
case 'FileReportItemDto':
return FileReportItemDto.fromJson(value);
- case 'ImportAssetDto':
- return ImportAssetDto.fromJson(value);
case 'JobCommand':
return JobCommandTypeTransformer().decode(value);
case 'JobCommandDto':
diff --git a/mobile/openapi/lib/model/import_asset_dto.dart b/mobile/openapi/lib/model/import_asset_dto.dart
deleted file mode 100644
index 7ba26da9d..000000000
--- a/mobile/openapi/lib/model/import_asset_dto.dart
+++ /dev/null
@@ -1,273 +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 ImportAssetDto {
- /// Returns a new [ImportAssetDto] instance.
- ImportAssetDto({
- required this.assetPath,
- required this.deviceAssetId,
- required this.deviceId,
- this.duration,
- required this.fileCreatedAt,
- required this.fileModifiedAt,
- this.isArchived,
- this.isExternal,
- this.isFavorite,
- this.isOffline,
- this.isReadOnly = true,
- this.isVisible,
- this.libraryId,
- this.sidecarPath,
- });
-
- String assetPath;
-
- String deviceAssetId;
-
- String deviceId;
-
- ///
- /// 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? duration;
-
- DateTime fileCreatedAt;
-
- DateTime fileModifiedAt;
-
- ///
- /// 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? isArchived;
-
- ///
- /// 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? isExternal;
-
- ///
- /// 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? isFavorite;
-
- ///
- /// 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? isOffline;
-
- bool isReadOnly;
-
- ///
- /// 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? isVisible;
-
- ///
- /// 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? libraryId;
-
- ///
- /// 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? sidecarPath;
-
- @override
- bool operator ==(Object other) => identical(this, other) || other is ImportAssetDto &&
- other.assetPath == assetPath &&
- other.deviceAssetId == deviceAssetId &&
- other.deviceId == deviceId &&
- other.duration == duration &&
- other.fileCreatedAt == fileCreatedAt &&
- other.fileModifiedAt == fileModifiedAt &&
- other.isArchived == isArchived &&
- other.isExternal == isExternal &&
- other.isFavorite == isFavorite &&
- other.isOffline == isOffline &&
- other.isReadOnly == isReadOnly &&
- other.isVisible == isVisible &&
- other.libraryId == libraryId &&
- other.sidecarPath == sidecarPath;
-
- @override
- int get hashCode =>
- // ignore: unnecessary_parenthesis
- (assetPath.hashCode) +
- (deviceAssetId.hashCode) +
- (deviceId.hashCode) +
- (duration == null ? 0 : duration!.hashCode) +
- (fileCreatedAt.hashCode) +
- (fileModifiedAt.hashCode) +
- (isArchived == null ? 0 : isArchived!.hashCode) +
- (isExternal == null ? 0 : isExternal!.hashCode) +
- (isFavorite == null ? 0 : isFavorite!.hashCode) +
- (isOffline == null ? 0 : isOffline!.hashCode) +
- (isReadOnly.hashCode) +
- (isVisible == null ? 0 : isVisible!.hashCode) +
- (libraryId == null ? 0 : libraryId!.hashCode) +
- (sidecarPath == null ? 0 : sidecarPath!.hashCode);
-
- @override
- String toString() => 'ImportAssetDto[assetPath=$assetPath, deviceAssetId=$deviceAssetId, deviceId=$deviceId, duration=$duration, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, isArchived=$isArchived, isExternal=$isExternal, isFavorite=$isFavorite, isOffline=$isOffline, isReadOnly=$isReadOnly, isVisible=$isVisible, libraryId=$libraryId, sidecarPath=$sidecarPath]';
-
- Map<String, dynamic> toJson() {
- final json = <String, dynamic>{};
- json[r'assetPath'] = this.assetPath;
- json[r'deviceAssetId'] = this.deviceAssetId;
- json[r'deviceId'] = this.deviceId;
- if (this.duration != null) {
- json[r'duration'] = this.duration;
- } else {
- // json[r'duration'] = null;
- }
- json[r'fileCreatedAt'] = this.fileCreatedAt.toUtc().toIso8601String();
- json[r'fileModifiedAt'] = this.fileModifiedAt.toUtc().toIso8601String();
- if (this.isArchived != null) {
- json[r'isArchived'] = this.isArchived;
- } else {
- // json[r'isArchived'] = null;
- }
- if (this.isExternal != null) {
- json[r'isExternal'] = this.isExternal;
- } else {
- // json[r'isExternal'] = null;
- }
- if (this.isFavorite != null) {
- json[r'isFavorite'] = this.isFavorite;
- } else {
- // json[r'isFavorite'] = null;
- }
- if (this.isOffline != null) {
- json[r'isOffline'] = this.isOffline;
- } else {
- // json[r'isOffline'] = null;
- }
- json[r'isReadOnly'] = this.isReadOnly;
- if (this.isVisible != null) {
- json[r'isVisible'] = this.isVisible;
- } else {
- // json[r'isVisible'] = null;
- }
- if (this.libraryId != null) {
- json[r'libraryId'] = this.libraryId;
- } else {
- // json[r'libraryId'] = null;
- }
- if (this.sidecarPath != null) {
- json[r'sidecarPath'] = this.sidecarPath;
- } else {
- // json[r'sidecarPath'] = null;
- }
- return json;
- }
-
- /// Returns a new [ImportAssetDto] instance and imports its values from
- /// [value] if it's a [Map], null otherwise.
- // ignore: prefer_constructors_over_static_methods
- static ImportAssetDto? fromJson(dynamic value) {
- if (value is Map) {
- final json = value.cast<String, dynamic>();
-
- return ImportAssetDto(
- assetPath: mapValueOfType<String>(json, r'assetPath')!,
- deviceAssetId: mapValueOfType<String>(json, r'deviceAssetId')!,
- deviceId: mapValueOfType<String>(json, r'deviceId')!,
- duration: mapValueOfType<String>(json, r'duration'),
- fileCreatedAt: mapDateTime(json, r'fileCreatedAt', '')!,
- fileModifiedAt: mapDateTime(json, r'fileModifiedAt', '')!,
- isArchived: mapValueOfType<bool>(json, r'isArchived'),
- isExternal: mapValueOfType<bool>(json, r'isExternal'),
- isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
- isOffline: mapValueOfType<bool>(json, r'isOffline'),
- isReadOnly: mapValueOfType<bool>(json, r'isReadOnly') ?? true,
- isVisible: mapValueOfType<bool>(json, r'isVisible'),
- libraryId: mapValueOfType<String>(json, r'libraryId'),
- sidecarPath: mapValueOfType<String>(json, r'sidecarPath'),
- );
- }
- return null;
- }
-
- static List<ImportAssetDto> listFromJson(dynamic json, {bool growable = false,}) {
- final result = <ImportAssetDto>[];
- if (json is List && json.isNotEmpty) {
- for (final row in json) {
- final value = ImportAssetDto.fromJson(row);
- if (value != null) {
- result.add(value);
- }
- }
- }
- return result.toList(growable: growable);
- }
-
- static Map<String, ImportAssetDto> mapFromJson(dynamic json) {
- final map = <String, ImportAssetDto>{};
- if (json is Map && json.isNotEmpty) {
- json = json.cast<String, dynamic>(); // ignore: parameter_assignments
- for (final entry in json.entries) {
- final value = ImportAssetDto.fromJson(entry.value);
- if (value != null) {
- map[entry.key] = value;
- }
- }
- }
- return map;
- }
-
- // maps a json object with a list of ImportAssetDto-objects as value to a dart map
- static Map<String, List<ImportAssetDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
- final map = <String, List<ImportAssetDto>>{};
- if (json is Map && json.isNotEmpty) {
- // ignore: parameter_assignments
- json = json.cast<String, dynamic>();
- for (final entry in json.entries) {
- map[entry.key] = ImportAssetDto.listFromJson(entry.value, growable: growable,);
- }
- }
- return map;
- }
-
- /// The list of required keys that must be present in a JSON.
- static const requiredKeys = <String>{
- 'assetPath',
- 'deviceAssetId',
- 'deviceId',
- 'fileCreatedAt',
- 'fileModifiedAt',
- };
-}
-
diff --git a/mobile/openapi/test/asset_api_test.dart b/mobile/openapi/test/asset_api_test.dart
index 275e5d127..50c35d289 100644
--- a/mobile/openapi/test/asset_api_test.dart
+++ b/mobile/openapi/test/asset_api_test.dart
@@ -127,11 +127,6 @@ void main() {
// TODO
});
- //Future<AssetFileUploadResponseDto> importFile(ImportAssetDto importAssetDto) async
- test('test importFile', () async {
- // TODO
- });
-
//Future restoreAssets(BulkIdsDto bulkIdsDto) async
test('test restoreAssets', () async {
// TODO
diff --git a/mobile/openapi/test/import_asset_dto_test.dart b/mobile/openapi/test/import_asset_dto_test.dart
deleted file mode 100644
index 94e2a3bc4..000000000
--- a/mobile/openapi/test/import_asset_dto_test.dart
+++ /dev/null
@@ -1,92 +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 ImportAssetDto
-void main() {
- // final instance = ImportAssetDto();
-
- group('test ImportAssetDto', () {
- // String assetPath
- test('to test the property `assetPath`', () async {
- // TODO
- });
-
- // String deviceAssetId
- test('to test the property `deviceAssetId`', () async {
- // TODO
- });
-
- // String deviceId
- test('to test the property `deviceId`', () async {
- // TODO
- });
-
- // String duration
- test('to test the property `duration`', () async {
- // TODO
- });
-
- // DateTime fileCreatedAt
- test('to test the property `fileCreatedAt`', () async {
- // TODO
- });
-
- // DateTime fileModifiedAt
- test('to test the property `fileModifiedAt`', () async {
- // TODO
- });
-
- // bool isArchived
- test('to test the property `isArchived`', () async {
- // TODO
- });
-
- // bool isExternal
- test('to test the property `isExternal`', () async {
- // TODO
- });
-
- // bool isFavorite
- test('to test the property `isFavorite`', () async {
- // TODO
- });
-
- // bool isOffline
- test('to test the property `isOffline`', () async {
- // TODO
- });
-
- // bool isReadOnly (default value: true)
- test('to test the property `isReadOnly`', () async {
- // TODO
- });
-
- // bool isVisible
- test('to test the property `isVisible`', () async {
- // TODO
- });
-
- // String libraryId
- test('to test the property `libraryId`', () async {
- // TODO
- });
-
- // String sidecarPath
- test('to test the property `sidecarPath`', () async {
- // TODO
- });
-
-
- });
-
-}
diff --git a/server/immich-openapi-specs.json b/server/immich-openapi-specs.json
index 8ece619f7..3e145dc32 100644
--- a/server/immich-openapi-specs.json
+++ b/server/immich-openapi-specs.json
@@ -1485,48 +1485,6 @@
]
}
},
- "/asset/import": {
- "post": {
- "operationId": "importFile",
- "parameters": [],
- "requestBody": {
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/ImportAssetDto"
- }
- }
- },
- "required": true
- },
- "responses": {
- "201": {
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/AssetFileUploadResponseDto"
- }
- }
- },
- "description": ""
- }
- },
- "security": [
- {
- "bearer": []
- },
- {
- "cookie": []
- },
- {
- "api_key": []
- }
- ],
- "tags": [
- "Asset"
- ]
- }
- },
"/asset/jobs": {
"post": {
"operationId": "runAssetJobs",
@@ -7540,64 +7498,6 @@
],
"type": "object"
},
- "ImportAssetDto": {
- "properties": {
- "assetPath": {
- "type": "string"
- },
- "deviceAssetId": {
- "type": "string"
- },
- "deviceId": {
- "type": "string"
- },
- "duration": {
- "type": "string"
- },
- "fileCreatedAt": {
- "format": "date-time",
- "type": "string"
- },
- "fileModifiedAt": {
- "format": "date-time",
- "type": "string"
- },
- "isArchived": {
- "type": "boolean"
- },
- "isExternal": {
- "type": "boolean"
- },
- "isFavorite": {
- "type": "boolean"
- },
- "isOffline": {
- "type": "boolean"
- },
- "isReadOnly": {
- "default": true,
- "type": "boolean"
- },
- "isVisible": {
- "type": "boolean"
- },
- "libraryId": {
- "format": "uuid",
- "type": "string"
- },
- "sidecarPath": {
- "type": "string"
- }
- },
- "required": [
- "assetPath",
- "deviceAssetId",
- "deviceId",
- "fileCreatedAt",
- "fileModifiedAt"
- ],
- "type": "object"
- },
"JobCommand": {
"enum": [
"start",
diff --git a/server/src/immich/api-v1/asset/asset.controller.ts b/server/src/immich/api-v1/asset/asset.controller.ts
index 4ff1fef27..e7a04564c 100644
--- a/server/src/immich/api-v1/asset/asset.controller.ts
+++ b/server/src/immich/api-v1/asset/asset.controller.ts
@@ -24,7 +24,7 @@ import { AssetService } from './asset.service';
import { AssetBulkUploadCheckDto } from './dto/asset-check.dto';
import { AssetSearchDto } from './dto/asset-search.dto';
import { CheckExistingAssetsDto } from './dto/check-existing-assets.dto';
-import { CreateAssetDto, ImportAssetDto } from './dto/create-asset.dto';
+import { CreateAssetDto } from './dto/create-asset.dto';
import { DeviceIdDto } from './dto/device-id.dto';
import { GetAssetThumbnailDto } from './dto/get-asset-thumbnail.dto';
import { ServeFileDto } from './dto/serve-file.dto';
@@ -81,20 +81,6 @@ export class AssetController {
return responseDto;
}
- @Post('import')
- async importFile(
- @AuthUser() authUser: AuthUserDto,
- @Body(new ValidationPipe({ transform: true })) dto: ImportAssetDto,
- @Response({ passthrough: true }) res: Res,
- ): Promise<AssetFileUploadResponseDto> {
- const responseDto = await this.assetService.importFile(authUser, dto);
- if (responseDto.duplicate) {
- res.status(200);
- }
-
- return responseDto;
- }
-
@SharedLinkRoute()
@Get('/file/:id')
@ApiOkResponse({
diff --git a/server/src/immich/api-v1/asset/asset.core.ts b/server/src/immich/api-v1/asset/asset.core.ts
index 9f5691b22..d6ce0efad 100644
--- a/server/src/immich/api-v1/asset/asset.core.ts
+++ b/server/src/immich/api-v1/asset/asset.core.ts
@@ -2,7 +2,7 @@ import { AuthUserDto, IJobRepository, JobName, mimeTypes, UploadFile } from '@ap
import { AssetEntity } from '@app/infra/entities';
import { parse } from 'node:path';
import { IAssetRepository } from './asset-repository';
-import { CreateAssetDto, ImportAssetDto } from './dto/create-asset.dto';
+import { CreateAssetDto } from './dto/create-asset.dto';
export class AssetCore {
constructor(
@@ -12,7 +12,7 @@ export class AssetCore {
async create(
authUser: AuthUserDto,
- dto: (CreateAssetDto | ImportAssetDto) & { libraryId: string },
+ dto: CreateAssetDto & { libraryId: string },
file: UploadFile,
livePhotoAssetId?: string,
sidecarPath?: string,
diff --git a/server/src/immich/api-v1/asset/asset.service.spec.ts b/server/src/immich/api-v1/asset/asset.service.spec.ts
index 80af06e25..cc2102766 100644
--- a/server/src/immich/api-v1/asset/asset.service.spec.ts
+++ b/server/src/immich/api-v1/asset/asset.service.spec.ts
@@ -1,4 +1,4 @@
-import { ICryptoRepository, IJobRepository, ILibraryRepository, IStorageRepository, JobName } from '@app/domain';
+import { IJobRepository, ILibraryRepository, JobName } from '@app/domain';
import { ASSET_CHECKSUM_CONSTRAINT, AssetEntity, AssetType, ExifEntity } from '@app/infra/entities';
import { BadRequestException } from '@nestjs/common';
import {
@@ -7,10 +7,8 @@ import {
authStub,
fileStub,
newAccessRepositoryMock,
- newCryptoRepositoryMock,
newJobRepositoryMock,
newLibraryRepositoryMock,
- newStorageRepositoryMock,
} from '@test';
import { when } from 'jest-when';
import { QueryFailedError } from 'typeorm';
@@ -87,9 +85,7 @@ describe('AssetService', () => {
let sut: AssetService;
let accessMock: IAccessRepositoryMock;
let assetRepositoryMock: jest.Mocked<IAssetRepository>;
- let cryptoMock: jest.Mocked<ICryptoRepository>;
let jobMock: jest.Mocked<IJobRepository>;
- let storageMock: jest.Mocked<IStorageRepository>;
let libraryMock: jest.Mocked<ILibraryRepository>;
beforeEach(() => {
@@ -109,12 +105,10 @@ describe('AssetService', () => {
};
accessMock = newAccessRepositoryMock();
- cryptoMock = newCryptoRepositoryMock();
jobMock = newJobRepositoryMock();
- storageMock = newStorageRepositoryMock();
libraryMock = newLibraryRepositoryMock();
- sut = new AssetService(accessMock, assetRepositoryMock, cryptoMock, jobMock, libraryMock, storageMock);
+ sut = new AssetService(accessMock, assetRepositoryMock, jobMock, libraryMock);
when(assetRepositoryMock.get)
.calledWith(assetStub.livePhotoStillAsset.id)
@@ -164,7 +158,6 @@ describe('AssetService', () => {
name: JobName.DELETE_FILES,
data: { files: ['fake_path/asset_1.jpeg', undefined, undefined] },
});
- expect(storageMock.moveFile).not.toHaveBeenCalled();
});
it('should handle a live photo', async () => {
@@ -237,47 +230,6 @@ describe('AssetService', () => {
});
});
- describe('importFile', () => {
- it('should handle a file import', async () => {
- assetRepositoryMock.create.mockResolvedValue(assetStub.image);
- storageMock.checkFileExists.mockResolvedValue(true);
- accessMock.library.hasOwnerAccess.mockResolvedValue(true);
-
- await expect(
- sut.importFile(authStub.external1, {
- ..._getCreateAssetDto(),
- assetPath: '/data/user1/fake_path/asset_1.jpeg',
- isReadOnly: true,
- libraryId: 'library-id',
- }),
- ).resolves.toEqual({ duplicate: false, id: 'asset-id' });
-
- expect(assetRepositoryMock.create).toHaveBeenCalled();
- });
-
- it('should handle a duplicate if originalPath already exists', async () => {
- const error = new QueryFailedError('', [], '');
- (error as any).constraint = ASSET_CHECKSUM_CONSTRAINT;
-
- assetRepositoryMock.create.mockRejectedValue(error);
- assetRepositoryMock.getAssetsByChecksums.mockResolvedValue([assetStub.image]);
- storageMock.checkFileExists.mockResolvedValue(true);
- accessMock.library.hasOwnerAccess.mockResolvedValue(true);
- cryptoMock.hashFile.mockResolvedValue(Buffer.from('file hash', 'utf8'));
-
- await expect(
- sut.importFile(authStub.external1, {
- ..._getCreateAssetDto(),
- assetPath: '/data/user1/fake_path/asset_1.jpeg',
- isReadOnly: true,
- libraryId: 'library-id',
- }),
- ).resolves.toEqual({ duplicate: true, id: 'asset-id' });
-
- expect(assetRepositoryMock.create).toHaveBeenCalled();
- });
- });
-
describe('getAssetById', () => {
it('should allow owner access', async () => {
accessMock.asset.hasOwnerAccess.mockResolvedValue(true);
diff --git a/server/src/immich/api-v1/asset/asset.service.ts b/server/src/immich/api-v1/asset/asset.service.ts
index 83e36808a..48b64672d 100644
--- a/server/src/immich/api-v1/asset/asset.service.ts
+++ b/server/src/immich/api-v1/asset/asset.service.ts
@@ -4,10 +4,8 @@ import {
AuthUserDto,
getLivePhotoMotionFilename,
IAccessRepository,
- ICryptoRepository,
IJobRepository,
ILibraryRepository,
- IStorageRepository,
JobName,
mapAsset,
mimeTypes,
@@ -16,14 +14,7 @@ import {
UploadFile,
} from '@app/domain';
import { ASSET_CHECKSUM_CONSTRAINT, AssetEntity, AssetType, LibraryType } from '@app/infra/entities';
-import {
- BadRequestException,
- Inject,
- Injectable,
- InternalServerErrorException,
- Logger,
- NotFoundException,
-} from '@nestjs/common';
+import { Inject, Injectable, InternalServerErrorException, Logger, NotFoundException } from '@nestjs/common';
import { Response as Res, Response } from 'express';
import { constants } from 'fs';
import fs from 'fs/promises';
@@ -34,7 +25,7 @@ import { AssetCore } from './asset.core';
import { AssetBulkUploadCheckDto } from './dto/asset-check.dto';
import { AssetSearchDto } from './dto/asset-search.dto';
import { CheckExistingAssetsDto } from './dto/check-existing-assets.dto';
-import { CreateAssetDto, ImportAssetDto } from './dto/create-asset.dto';
+import { CreateAssetDto } from './dto/create-asset.dto';
import { GetAssetThumbnailDto, GetAssetThumbnailFormatEnum } from './dto/get-asset-thumbnail.dto';
import { SearchPropertiesDto } from './dto/search-properties.dto';
import { ServeFileDto } from './dto/serve-file.dto';
@@ -60,10 +51,8 @@ export class AssetService {
constructor(
@Inject(IAccessRepository) accessRepository: IAccessRepository,
@Inject(IAssetRepository) private _assetRepository: IAssetRepository,
- @Inject(ICryptoRepository) private cryptoRepository: ICryptoRepository,
@Inject(IJobRepository) private jobRepository: IJobRepository,
@Inject(ILibraryRepository) private libraryRepository: ILibraryRepository,
- @Inject(IStorageRepository) private storageRepository: IStorageRepository,
) {
this.assetCore = new AssetCore(_assetRepository, jobRepository);
this.access = AccessCore.create(accessRepository);
@@ -121,59 +110,6 @@ export class AssetService {
}
}
- public async importFile(authUser: AuthUserDto, dto: ImportAssetDto): Promise<AssetFileUploadResponseDto> {
- dto = {
- ...dto,
- assetPath: path.resolve(dto.assetPath),
- sidecarPath: dto.sidecarPath ? path.resolve(dto.sidecarPath) : undefined,
- };
-
- if (!mimeTypes.isAsset(dto.assetPath)) {
- throw new BadRequestException(`Unsupported file type ${dto.assetPath}`);
- }
-
- if (dto.sidecarPath && !mimeTypes.isSidecar(dto.sidecarPath)) {
- throw new BadRequestException(`Unsupported sidecar file type`);
- }
-
- for (const filepath of [dto.assetPath, dto.sidecarPath]) {
- if (!filepath) {
- continue;
- }
-
- const exists = await this.storageRepository.checkFileExists(filepath, constants.R_OK);
- if (!exists) {
- throw new BadRequestException('File does not exist');
- }
- }
-
- if (!authUser.externalPath || !dto.assetPath.match(new RegExp(`^${authUser.externalPath}`))) {
- throw new BadRequestException("File does not exist within user's external path");
- }
-
- const assetFile: UploadFile = {
- checksum: await this.cryptoRepository.hashFile(dto.assetPath),
- originalPath: dto.assetPath,
- originalName: path.parse(dto.assetPath).name,
- };
-
- try {
- const libraryId = await this.getLibraryId(authUser, dto.libraryId);
- await this.access.requirePermission(authUser, Permission.ASSET_UPLOAD, libraryId);
- const asset = await this.assetCore.create(authUser, { ...dto, libraryId }, assetFile, undefined, dto.sidecarPath);
- return { id: asset.id, duplicate: false };
- } catch (error: QueryFailedError | Error | any) {
- // handle duplicates with a success response
- if (error instanceof QueryFailedError && (error as any).constraint === ASSET_CHECKSUM_CONSTRAINT) {
- const [duplicate] = await this._assetRepository.getAssetsByChecksums(authUser.id, [assetFile.checksum]);
- return { id: duplicate.id, duplicate: true };
- }
-
- this.logger.error(`Error importing file ${error}`, error?.stack);
- throw new BadRequestException(`Error importing file`, `${error}`);
- }
- }
-
public async getUserAssetsByDeviceId(authUser: AuthUserDto, deviceId: string) {
return this._assetRepository.getAllByDeviceId(authUser.id, deviceId);
}
diff --git a/server/src/immich/api-v1/asset/dto/create-asset.dto.ts b/server/src/immich/api-v1/asset/dto/create-asset.dto.ts
index 0338fe792..ae347e61b 100644
--- a/server/src/immich/api-v1/asset/dto/create-asset.dto.ts
+++ b/server/src/immich/api-v1/asset/dto/create-asset.dto.ts
@@ -70,23 +70,3 @@ export class CreateAssetDto extends CreateAssetBase {
@ApiProperty({ type: 'string', format: 'binary', required: false })
[UploadFieldName.SIDECAR_DATA]?: any;
}
-
-export class ImportAssetDto extends CreateAssetBase {
- @Optional()
- @IsBoolean()
- @Transform(toBoolean)
- isReadOnly?: boolean = true;
-
- @ValidateUUID()
- @Optional()
- libraryId?: string;
-
- @IsString()
- @IsNotEmpty()
- assetPath!: string;
-
- @IsString()
- @Optional()
- @IsNotEmpty()
- sidecarPath?: string;
-}
diff --git a/web/src/api/open-api/api.ts b/web/src/api/open-api/api.ts
index c4a62ca05..a64e632c0 100644
--- a/web/src/api/open-api/api.ts
+++ b/web/src/api/open-api/api.ts
@@ -1773,97 +1773,6 @@ export interface FileReportItemDto {
}
-/**
- *
- * @export
- * @interface ImportAssetDto
- */
-export interface ImportAssetDto {
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'assetPath': string;
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'deviceAssetId': string;
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'deviceId': string;
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'duration'?: string;
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'fileCreatedAt': string;
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'fileModifiedAt': string;
- /**
- *
- * @type {boolean}
- * @memberof ImportAssetDto
- */
- 'isArchived'?: boolean;
- /**
- *
- * @type {boolean}
- * @memberof ImportAssetDto
- */
- 'isExternal'?: boolean;
- /**
- *
- * @type {boolean}
- * @memberof ImportAssetDto
- */
- 'isFavorite'?: boolean;
- /**
- *
- * @type {boolean}
- * @memberof ImportAssetDto
- */
- 'isOffline'?: boolean;
- /**
- *
- * @type {boolean}
- * @memberof ImportAssetDto
- */
- 'isReadOnly'?: boolean;
- /**
- *
- * @type {boolean}
- * @memberof ImportAssetDto
- */
- 'isVisible'?: boolean;
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'libraryId'?: string;
- /**
- *
- * @type {string}
- * @memberof ImportAssetDto
- */
- 'sidecarPath'?: string;
-}
/**
*
* @export
@@ -7609,50 +7518,6 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration
options: localVarRequestOptions,
};
},
- /**
- *
- * @param {ImportAssetDto} importAssetDto
- * @param {*} [options] Override http request option.
- * @throws {RequiredError}
- */
- importFile: async (importAssetDto: ImportAssetDto, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
- // verify required parameter 'importAssetDto' is not null or undefined
- assertParamExists('importFile', 'importAssetDto', importAssetDto)
- const localVarPath = `/asset/import`;
- // 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(importAssetDto, localVarRequestOptions, configuration)
-
- return {
- url: toPathString(localVarUrlObj),
- options: localVarRequestOptions,
- };
- },
/**
*
* @param {BulkIdsDto} bulkIdsDto
@@ -8602,16 +8467,6 @@ export const AssetApiFp = function(configuration?: Configuration) {
const localVarAxiosArgs = await localVarAxiosParamCreator.getUserAssetsByDeviceId(deviceId, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
- /**
- *
- * @param {ImportAssetDto} importAssetDto
- * @param {*} [options] Override http request option.
- * @throws {RequiredError}
- */
- async importFile(importAssetDto: ImportAssetDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<AssetFileUploadResponseDto>> {
- const localVarAxiosArgs = await localVarAxiosParamCreator.importFile(importAssetDto, options);
- return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
- },
/**
*
* @param {BulkIdsDto} bulkIdsDto
@@ -8945,15 +8800,6 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath
getUserAssetsByDeviceId(requestParameters: AssetApiGetUserAssetsByDeviceIdRequest, options?: AxiosRequestConfig): AxiosPromise<Array<string>> {
return localVarFp.getUserAssetsByDeviceId(requestParameters.deviceId, options).then((request) => request(axios, basePath));
},
- /**
- *
- * @param {AssetApiImportFileRequest} requestParameters Request parameters.
- * @param {*} [options] Override http request option.
- * @throws {RequiredError}
- */
- importFile(requestParameters: AssetApiImportFileRequest, options?: AxiosRequestConfig): AxiosPromise<AssetFileUploadResponseDto> {
- return localVarFp.importFile(requestParameters.importAssetDto, options).then((request) => request(axios, basePath));
- },
/**
*
* @param {AssetApiRestoreAssetsRequest} requestParameters Request parameters.
@@ -9527,20 +9373,6 @@ export interface AssetApiGetUserAssetsByDeviceIdRequest {
readonly deviceId: string
}
-/**
- * Request parameters for importFile operation in AssetApi.
- * @export
- * @interface AssetApiImportFileRequest
- */
-export interface AssetApiImportFileRequest {
- /**
- *
- * @type {ImportAssetDto}
- * @memberof AssetApiImportFile
- */
- readonly importAssetDto: ImportAssetDto
-}
-
/**
* Request parameters for restoreAssets operation in AssetApi.
* @export
@@ -10282,17 +10114,6 @@ export class AssetApi extends BaseAPI {
return AssetApiFp(this.configuration).getUserAssetsByDeviceId(requestParameters.deviceId, options).then((request) => request(this.axios, this.basePath));
}
- /**
- *
- * @param {AssetApiImportFileRequest} requestParameters Request parameters.
- * @param {*} [options] Override http request option.
- * @throws {RequiredError}
- * @memberof AssetApi
- */
- public importFile(requestParameters: AssetApiImportFileRequest, options?: AxiosRequestConfig) {
- return AssetApiFp(this.configuration).importFile(requestParameters.importAssetDto, options).then((request) => request(this.axios, this.basePath));
- }
-
/**
*
* @param {AssetApiRestoreAssetsRequest} requestParameters Request parameters.