diff --git a/mobile/lib/shared/services/asset.service.dart b/mobile/lib/shared/services/asset.service.dart index 2ffeb53faa..737d4d56ad 100644 --- a/mobile/lib/shared/services/asset.service.dart +++ b/mobile/lib/shared/services/asset.service.dart @@ -53,7 +53,7 @@ class AssetService { Future<(List? toUpsert, List? toDelete)> _getRemoteAssetChanges(User user, DateTime since) async { final deleted = await _apiService.auditApi - .getAuditDeletes(EntityType.ASSET, since, userId: user.id); + .getAuditDeletes(since, EntityType.ASSET, userId: user.id); if (deleted == null || deleted.needsFullSync) return (null, null); final assetDto = await _apiService.assetApi .getAllAssets(userId: user.id, updatedAfter: since); diff --git a/mobile/openapi/doc/ActivityApi.md b/mobile/openapi/doc/ActivityApi.md index 6221ef5e4f..1552e30863 100644 Binary files a/mobile/openapi/doc/ActivityApi.md and b/mobile/openapi/doc/ActivityApi.md differ diff --git a/mobile/openapi/doc/AlbumApi.md b/mobile/openapi/doc/AlbumApi.md index fab77bc03a..427181880d 100644 Binary files a/mobile/openapi/doc/AlbumApi.md and b/mobile/openapi/doc/AlbumApi.md differ diff --git a/mobile/openapi/doc/AssetApi.md b/mobile/openapi/doc/AssetApi.md index fb2ad2411c..0284488148 100644 Binary files a/mobile/openapi/doc/AssetApi.md and b/mobile/openapi/doc/AssetApi.md differ diff --git a/mobile/openapi/doc/AuditApi.md b/mobile/openapi/doc/AuditApi.md index 8fbca70bc7..8514cdec73 100644 Binary files a/mobile/openapi/doc/AuditApi.md and b/mobile/openapi/doc/AuditApi.md differ diff --git a/mobile/openapi/doc/SearchApi.md b/mobile/openapi/doc/SearchApi.md index 524ce03f5b..1cd5f60a7c 100644 Binary files a/mobile/openapi/doc/SearchApi.md and b/mobile/openapi/doc/SearchApi.md differ diff --git a/mobile/openapi/doc/SharedLinkApi.md b/mobile/openapi/doc/SharedLinkApi.md index 873ffc5825..ff62cf423e 100644 Binary files a/mobile/openapi/doc/SharedLinkApi.md and b/mobile/openapi/doc/SharedLinkApi.md differ diff --git a/mobile/openapi/lib/api/activity_api.dart b/mobile/openapi/lib/api/activity_api.dart index 8e2354e201..250f8f9b21 100644 Binary files a/mobile/openapi/lib/api/activity_api.dart and b/mobile/openapi/lib/api/activity_api.dart differ diff --git a/mobile/openapi/lib/api/album_api.dart b/mobile/openapi/lib/api/album_api.dart index 122a83940d..bca2a985c5 100644 Binary files a/mobile/openapi/lib/api/album_api.dart and b/mobile/openapi/lib/api/album_api.dart differ diff --git a/mobile/openapi/lib/api/asset_api.dart b/mobile/openapi/lib/api/asset_api.dart index 45c1e11043..84b73ea9aa 100644 Binary files a/mobile/openapi/lib/api/asset_api.dart and b/mobile/openapi/lib/api/asset_api.dart differ diff --git a/mobile/openapi/lib/api/audit_api.dart b/mobile/openapi/lib/api/audit_api.dart index 24b93f178f..d78246c31b 100644 Binary files a/mobile/openapi/lib/api/audit_api.dart and b/mobile/openapi/lib/api/audit_api.dart differ diff --git a/mobile/openapi/lib/api/search_api.dart b/mobile/openapi/lib/api/search_api.dart index 5dd8dc0c70..2efae6838a 100644 Binary files a/mobile/openapi/lib/api/search_api.dart and b/mobile/openapi/lib/api/search_api.dart differ diff --git a/mobile/openapi/lib/api/shared_link_api.dart b/mobile/openapi/lib/api/shared_link_api.dart index 661da45eb8..e43ee615c3 100644 Binary files a/mobile/openapi/lib/api/shared_link_api.dart and b/mobile/openapi/lib/api/shared_link_api.dart differ diff --git a/mobile/openapi/test/activity_api_test.dart b/mobile/openapi/test/activity_api_test.dart index 7353c6ea35..05ffd928e0 100644 Binary files a/mobile/openapi/test/activity_api_test.dart and b/mobile/openapi/test/activity_api_test.dart differ diff --git a/mobile/openapi/test/album_api_test.dart b/mobile/openapi/test/album_api_test.dart index af4cd2a45b..aee26e095d 100644 Binary files a/mobile/openapi/test/album_api_test.dart and b/mobile/openapi/test/album_api_test.dart differ diff --git a/mobile/openapi/test/asset_api_test.dart b/mobile/openapi/test/asset_api_test.dart index c4f6c85112..b87cacf29a 100644 Binary files a/mobile/openapi/test/asset_api_test.dart and b/mobile/openapi/test/asset_api_test.dart differ diff --git a/mobile/openapi/test/audit_api_test.dart b/mobile/openapi/test/audit_api_test.dart index 2ce8d3d860..8161d4e4db 100644 Binary files a/mobile/openapi/test/audit_api_test.dart and b/mobile/openapi/test/audit_api_test.dart differ diff --git a/mobile/openapi/test/search_api_test.dart b/mobile/openapi/test/search_api_test.dart index edbbfa45b7..50406e90d1 100644 Binary files a/mobile/openapi/test/search_api_test.dart and b/mobile/openapi/test/search_api_test.dart differ diff --git a/mobile/openapi/test/shared_link_api_test.dart b/mobile/openapi/test/shared_link_api_test.dart index edc2c55d0a..ebe5bf199f 100644 Binary files a/mobile/openapi/test/shared_link_api_test.dart and b/mobile/openapi/test/shared_link_api_test.dart differ diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json index 549a377576..0c3a480a27 100644 --- a/open-api/immich-openapi-specs.json +++ b/open-api/immich-openapi-specs.json @@ -23,14 +23,6 @@ "type": "string" } }, - { - "name": "type", - "required": false, - "in": "query", - "schema": { - "$ref": "#/components/schemas/ReactionType" - } - }, { "name": "level", "required": false, @@ -39,6 +31,14 @@ "$ref": "#/components/schemas/ReactionLevel" } }, + { + "name": "type", + "required": false, + "in": "query", + "schema": { + "$ref": "#/components/schemas/ReactionType" + } + }, { "name": "userId", "required": false, @@ -210,14 +210,6 @@ "get": { "operationId": "getAllAlbums", "parameters": [ - { - "name": "shared", - "required": false, - "in": "query", - "schema": { - "type": "boolean" - } - }, { "name": "assetId", "required": false, @@ -227,6 +219,14 @@ "format": "uuid", "type": "string" } + }, + { + "name": "shared", + "required": false, + "in": "query", + "schema": { + "type": "boolean" + } } ], "responses": { @@ -378,14 +378,6 @@ "type": "string" } }, - { - "name": "withoutAssets", - "required": false, - "in": "query", - "schema": { - "type": "boolean" - } - }, { "name": "key", "required": false, @@ -393,6 +385,14 @@ "schema": { "type": "string" } + }, + { + "name": "withoutAssets", + "required": false, + "in": "query", + "schema": { + "type": "boolean" + } } ], "responses": { @@ -922,6 +922,31 @@ "description": "Get all AssetEntity belong to the user", "operationId": "getAllAssets", "parameters": [ + { + "name": "if-none-match", + "in": "header", + "description": "ETag of data already cached on the client", + "required": false, + "schema": { + "type": "string" + } + }, + { + "name": "isArchived", + "required": false, + "in": "query", + "schema": { + "type": "boolean" + } + }, + { + "name": "isFavorite", + "required": false, + "in": "query", + "schema": { + "type": "boolean" + } + }, { "name": "skip", "required": false, @@ -938,31 +963,6 @@ "type": "integer" } }, - { - "name": "userId", - "required": false, - "in": "query", - "schema": { - "format": "uuid", - "type": "string" - } - }, - { - "name": "isFavorite", - "required": false, - "in": "query", - "schema": { - "type": "boolean" - } - }, - { - "name": "isArchived", - "required": false, - "in": "query", - "schema": { - "type": "boolean" - } - }, { "name": "updatedAfter", "required": false, @@ -982,11 +982,11 @@ } }, { - "name": "if-none-match", - "in": "header", - "description": "ETag of data already cached on the client", + "name": "userId", "required": false, + "in": "query", "schema": { + "format": "uuid", "type": "string" } } @@ -1569,22 +1569,6 @@ "get": { "operationId": "getMapMarkers", "parameters": [ - { - "name": "isArchived", - "required": false, - "in": "query", - "schema": { - "type": "boolean" - } - }, - { - "name": "isFavorite", - "required": false, - "in": "query", - "schema": { - "type": "boolean" - } - }, { "name": "fileCreatedAfter", "required": false, @@ -1602,6 +1586,22 @@ "format": "date-time", "type": "string" } + }, + { + "name": "isArchived", + "required": false, + "in": "query", + "schema": { + "type": "boolean" + } + }, + { + "name": "isFavorite", + "required": false, + "in": "query", + "schema": { + "type": "boolean" + } } ], "responses": { @@ -1897,6 +1897,14 @@ "get": { "operationId": "getAssetThumbnail", "parameters": [ + { + "name": "format", + "required": false, + "in": "query", + "schema": { + "$ref": "#/components/schemas/ThumbnailFormat" + } + }, { "name": "id", "required": true, @@ -1906,14 +1914,6 @@ "type": "string" } }, - { - "name": "format", - "required": false, - "in": "query", - "schema": { - "$ref": "#/components/schemas/ThumbnailFormat" - } - }, { "name": "key", "required": false, @@ -1956,23 +1956,6 @@ "get": { "operationId": "getTimeBucket", "parameters": [ - { - "name": "size", - "required": true, - "in": "query", - "schema": { - "$ref": "#/components/schemas/TimeBucketSize" - } - }, - { - "name": "userId", - "required": false, - "in": "query", - "schema": { - "format": "uuid", - "type": "string" - } - }, { "name": "albumId", "required": false, @@ -1982,15 +1965,6 @@ "type": "string" } }, - { - "name": "personId", - "required": false, - "in": "query", - "schema": { - "format": "uuid", - "type": "string" - } - }, { "name": "isArchived", "required": false, @@ -2016,19 +1990,28 @@ } }, { - "name": "withStacked", + "name": "key", "required": false, "in": "query", "schema": { - "type": "boolean" + "type": "string" } }, { - "name": "withPartners", + "name": "personId", "required": false, "in": "query", "schema": { - "type": "boolean" + "format": "uuid", + "type": "string" + } + }, + { + "name": "size", + "required": true, + "in": "query", + "schema": { + "$ref": "#/components/schemas/TimeBucketSize" } }, { @@ -2040,12 +2023,29 @@ } }, { - "name": "key", + "name": "userId", "required": false, "in": "query", "schema": { + "format": "uuid", "type": "string" } + }, + { + "name": "withPartners", + "required": false, + "in": "query", + "schema": { + "type": "boolean" + } + }, + { + "name": "withStacked", + "required": false, + "in": "query", + "schema": { + "type": "boolean" + } } ], "responses": { @@ -2092,23 +2092,6 @@ "get": { "operationId": "getTimeBuckets", "parameters": [ - { - "name": "size", - "required": true, - "in": "query", - "schema": { - "$ref": "#/components/schemas/TimeBucketSize" - } - }, - { - "name": "userId", - "required": false, - "in": "query", - "schema": { - "format": "uuid", - "type": "string" - } - }, { "name": "albumId", "required": false, @@ -2118,15 +2101,6 @@ "type": "string" } }, - { - "name": "personId", - "required": false, - "in": "query", - "schema": { - "format": "uuid", - "type": "string" - } - }, { "name": "isArchived", "required": false, @@ -2152,11 +2126,37 @@ } }, { - "name": "withStacked", + "name": "key", "required": false, "in": "query", "schema": { - "type": "boolean" + "type": "string" + } + }, + { + "name": "personId", + "required": false, + "in": "query", + "schema": { + "format": "uuid", + "type": "string" + } + }, + { + "name": "size", + "required": true, + "in": "query", + "schema": { + "$ref": "#/components/schemas/TimeBucketSize" + } + }, + { + "name": "userId", + "required": false, + "in": "query", + "schema": { + "format": "uuid", + "type": "string" } }, { @@ -2168,11 +2168,11 @@ } }, { - "name": "key", + "name": "withStacked", "required": false, "in": "query", "schema": { - "type": "string" + "type": "boolean" } } ], @@ -2421,37 +2421,45 @@ "operationId": "searchAssets", "parameters": [ { - "name": "id", + "name": "checksum", "required": false, "in": "query", "schema": { - "format": "uuid", "type": "string" } }, { - "name": "libraryId", + "name": "city", "required": false, "in": "query", "schema": { - "format": "uuid", "type": "string" } }, { - "name": "type", + "name": "country", "required": false, "in": "query", "schema": { - "$ref": "#/components/schemas/AssetTypeEnum" + "type": "string" } }, { - "name": "order", + "name": "createdAfter", "required": false, "in": "query", "schema": { - "$ref": "#/components/schemas/AssetOrder" + "format": "date-time", + "type": "string" + } + }, + { + "name": "createdBefore", + "required": false, + "in": "query", + "schema": { + "format": "date-time", + "type": "string" } }, { @@ -2471,13 +2479,22 @@ } }, { - "name": "checksum", + "name": "encodedVideoPath", "required": false, "in": "query", "schema": { "type": "string" } }, + { + "name": "id", + "required": false, + "in": "query", + "schema": { + "format": "uuid", + "type": "string" + } + }, { "name": "isArchived", "required": false, @@ -2543,15 +2560,166 @@ } }, { - "name": "withDeleted", + "name": "lensModel", "required": false, "in": "query", "schema": { - "type": "boolean" + "type": "string" } }, { - "name": "withStacked", + "name": "libraryId", + "required": false, + "in": "query", + "schema": { + "format": "uuid", + "type": "string" + } + }, + { + "name": "make", + "required": false, + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "model", + "required": false, + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "order", + "required": false, + "in": "query", + "schema": { + "$ref": "#/components/schemas/AssetOrder" + } + }, + { + "name": "originalFileName", + "required": false, + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "originalPath", + "required": false, + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "page", + "required": false, + "in": "query", + "schema": { + "type": "number" + } + }, + { + "name": "resizePath", + "required": false, + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "size", + "required": false, + "in": "query", + "schema": { + "type": "number" + } + }, + { + "name": "state", + "required": false, + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "takenAfter", + "required": false, + "in": "query", + "schema": { + "format": "date-time", + "type": "string" + } + }, + { + "name": "takenBefore", + "required": false, + "in": "query", + "schema": { + "format": "date-time", + "type": "string" + } + }, + { + "name": "trashedAfter", + "required": false, + "in": "query", + "schema": { + "format": "date-time", + "type": "string" + } + }, + { + "name": "trashedBefore", + "required": false, + "in": "query", + "schema": { + "format": "date-time", + "type": "string" + } + }, + { + "name": "type", + "required": false, + "in": "query", + "schema": { + "$ref": "#/components/schemas/AssetTypeEnum" + } + }, + { + "name": "updatedAfter", + "required": false, + "in": "query", + "schema": { + "format": "date-time", + "type": "string" + } + }, + { + "name": "updatedBefore", + "required": false, + "in": "query", + "schema": { + "format": "date-time", + "type": "string" + } + }, + { + "name": "webpPath", + "required": false, + "in": "query", + "schema": { + "type": "string" + } + }, + { + "name": "withDeleted", "required": false, "in": "query", "schema": { @@ -2575,179 +2743,11 @@ } }, { - "name": "createdBefore", + "name": "withStacked", "required": false, "in": "query", "schema": { - "format": "date-time", - "type": "string" - } - }, - { - "name": "createdAfter", - "required": false, - "in": "query", - "schema": { - "format": "date-time", - "type": "string" - } - }, - { - "name": "updatedBefore", - "required": false, - "in": "query", - "schema": { - "format": "date-time", - "type": "string" - } - }, - { - "name": "updatedAfter", - "required": false, - "in": "query", - "schema": { - "format": "date-time", - "type": "string" - } - }, - { - "name": "trashedBefore", - "required": false, - "in": "query", - "schema": { - "format": "date-time", - "type": "string" - } - }, - { - "name": "trashedAfter", - "required": false, - "in": "query", - "schema": { - "format": "date-time", - "type": "string" - } - }, - { - "name": "takenBefore", - "required": false, - "in": "query", - "schema": { - "format": "date-time", - "type": "string" - } - }, - { - "name": "takenAfter", - "required": false, - "in": "query", - "schema": { - "format": "date-time", - "type": "string" - } - }, - { - "name": "originalFileName", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "originalPath", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "resizePath", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "webpPath", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "encodedVideoPath", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "city", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "state", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "country", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "make", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "model", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "lensModel", - "required": false, - "in": "query", - "schema": { - "type": "string" - } - }, - { - "name": "page", - "required": false, - "in": "query", - "schema": { - "type": "number" - } - }, - { - "name": "size", - "required": false, - "in": "query", - "schema": { - "type": "number" + "type": "boolean" } } ], @@ -2786,6 +2786,15 @@ "get": { "operationId": "getAuditDeletes", "parameters": [ + { + "name": "after", + "required": true, + "in": "query", + "schema": { + "format": "date-time", + "type": "string" + } + }, { "name": "entityType", "required": true, @@ -2802,15 +2811,6 @@ "format": "uuid", "type": "string" } - }, - { - "name": "after", - "required": true, - "in": "query", - "schema": { - "format": "date-time", - "type": "string" - } } ], "responses": { @@ -4523,6 +4523,22 @@ "get": { "operationId": "search", "parameters": [ + { + "name": "clip", + "required": false, + "in": "query", + "schema": { + "type": "boolean" + } + }, + { + "name": "motion", + "required": false, + "in": "query", + "schema": { + "type": "boolean" + } + }, { "name": "q", "required": false, @@ -4540,7 +4556,7 @@ } }, { - "name": "clip", + "name": "recent", "required": false, "in": "query", "schema": { @@ -4561,22 +4577,6 @@ "type": "string" } }, - { - "name": "recent", - "required": false, - "in": "query", - "schema": { - "type": "boolean" - } - }, - { - "name": "motion", - "required": false, - "in": "query", - "schema": { - "type": "boolean" - } - }, { "name": "withArchived", "required": false, @@ -4995,6 +4995,14 @@ "get": { "operationId": "getMySharedLink", "parameters": [ + { + "name": "key", + "required": false, + "in": "query", + "schema": { + "type": "string" + } + }, { "name": "password", "required": false, @@ -5011,14 +5019,6 @@ "schema": { "type": "string" } - }, - { - "name": "key", - "required": false, - "in": "query", - "schema": { - "type": "string" - } } ], "responses": { @@ -6268,8 +6268,8 @@ } }, "required": [ - "secret", - "apiKey" + "apiKey", + "secret" ], "type": "object" }, @@ -6291,9 +6291,9 @@ } }, "required": [ + "createdAt", "id", "name", - "createdAt", "updatedAt" ], "type": "object" @@ -6361,11 +6361,11 @@ } }, "required": [ - "id", + "assetId", "createdAt", + "id", "type", - "user", - "assetId" + "user" ], "type": "object" }, @@ -6408,9 +6408,9 @@ } }, "required": [ + "notShared", "owned", - "shared", - "notShared" + "shared" ], "type": "object" }, @@ -6481,20 +6481,20 @@ } }, "required": [ - "assetCount", - "id", - "ownerId", "albumName", - "description", - "createdAt", - "updatedAt", "albumThumbnailAssetId", + "assetCount", + "assets", + "createdAt", + "description", + "hasSharedLink", + "id", + "isActivityEnabled", + "owner", + "ownerId", "shared", "sharedUsers", - "hasSharedLink", - "assets", - "owner", - "isActivityEnabled" + "updatedAt" ], "type": "object" }, @@ -6538,18 +6538,18 @@ } }, "required": [ - "thumbnailGeneration", - "metadataExtraction", - "videoConversion", - "smartSearch", - "storageTemplateMigration", - "migration", "backgroundTask", - "search", "faceDetection", "facialRecognition", + "library", + "metadataExtraction", + "migration", + "search", "sidecar", - "library" + "smartSearch", + "storageTemplateMigration", + "thumbnailGeneration", + "videoConversion" ], "type": "object" }, @@ -6633,8 +6633,8 @@ } }, "required": [ - "id", - "checksum" + "checksum", + "id" ], "type": "object" }, @@ -6676,8 +6676,8 @@ } }, "required": [ - "id", - "action" + "action", + "id" ], "type": "object" }, @@ -6715,13 +6715,13 @@ } }, "required": [ - "id", - "imageHeight", - "imageWidth", "boundingBoxX1", "boundingBoxX2", "boundingBoxY1", "boundingBoxY2", + "id", + "imageHeight", + "imageWidth", "person" ], "type": "object" @@ -6752,8 +6752,8 @@ } }, "required": [ - "personId", - "assetId" + "assetId", + "personId" ], "type": "object" }, @@ -6783,13 +6783,13 @@ } }, "required": [ - "id", - "imageHeight", - "imageWidth", "boundingBoxX1", "boundingBoxX2", "boundingBoxY1", - "boundingBoxY2" + "boundingBoxY2", + "id", + "imageHeight", + "imageWidth" ], "type": "object" }, @@ -6803,8 +6803,8 @@ } }, "required": [ - "id", - "duplicate" + "duplicate", + "id" ], "type": "object" }, @@ -6998,30 +6998,30 @@ } }, "required": [ - "type", - "stackCount", + "checksum", "deviceAssetId", "deviceId", - "ownerId", - "libraryId", - "originalPath", - "originalFileName", - "resized", + "duration", "fileCreatedAt", "fileModifiedAt", - "updatedAt", - "isFavorite", - "isArchived", - "isTrashed", - "isOffline", - "isExternal", - "isReadOnly", - "checksum", + "hasMetadata", "id", - "thumbhash", + "isArchived", + "isExternal", + "isFavorite", + "isOffline", + "isReadOnly", + "isTrashed", + "libraryId", "localDateTime", - "duration", - "hasMetadata" + "originalFileName", + "originalPath", + "ownerId", + "resized", + "stackCount", + "thumbhash", + "type", + "updatedAt" ], "type": "object" }, @@ -7039,8 +7039,8 @@ }, "required": [ "images", - "videos", - "total" + "total", + "videos" ], "type": "object" }, @@ -7074,8 +7074,8 @@ } }, "required": [ - "needsFullSync", - "ids" + "ids", + "needsFullSync" ], "type": "object" }, @@ -7101,12 +7101,12 @@ } }, "required": [ - "id", "createdAt", - "updatedAt", "current", + "deviceOS", "deviceType", - "deviceOS" + "id", + "updatedAt" ], "type": "object" }, @@ -7197,8 +7197,8 @@ } }, "required": [ - "password", - "newPassword" + "newPassword", + "password" ], "type": "object" }, @@ -7383,8 +7383,8 @@ } }, "required": [ - "userId", - "profileImagePath" + "profileImagePath", + "userId" ], "type": "object" }, @@ -7398,8 +7398,8 @@ } }, "required": [ - "type", - "name" + "name", + "type" ], "type": "object" }, @@ -7433,8 +7433,8 @@ }, "required": [ "email", - "password", - "name" + "name", + "password" ], "type": "object" }, @@ -7457,11 +7457,11 @@ } }, "required": [ - "id", "city", - "resizePath", "deviceAssetId", - "deviceId" + "deviceId", + "id", + "resizePath" ], "type": "object" }, @@ -7484,11 +7484,11 @@ } }, "required": [ + "deviceAssetId", + "deviceId", "id", "object", - "resizePath", - "deviceAssetId", - "deviceId" + "resizePath" ], "type": "object" }, @@ -7505,8 +7505,8 @@ } }, "required": [ - "size", - "assetIds" + "assetIds", + "size" ], "type": "object" }, @@ -7546,8 +7546,8 @@ } }, "required": [ - "totalSize", - "archives" + "archives", + "totalSize" ], "type": "object" }, @@ -7707,8 +7707,8 @@ } }, "required": [ - "filename", - "checksum" + "checksum", + "filename" ], "type": "object" }, @@ -7728,8 +7728,8 @@ } }, "required": [ - "orphans", - "extras" + "extras", + "orphans" ], "type": "object" }, @@ -7823,10 +7823,10 @@ "required": [ "active", "completed", - "failed", "delayed", - "waiting", - "paused" + "failed", + "paused", + "waiting" ], "type": "object" }, @@ -7917,16 +7917,16 @@ } }, "required": [ - "type", "assetCount", - "id", - "ownerId", - "name", - "importPaths", - "exclusionPatterns", "createdAt", - "updatedAt", - "refreshedAt" + "exclusionPatterns", + "id", + "importPaths", + "name", + "ownerId", + "refreshedAt", + "type", + "updatedAt" ], "type": "object" }, @@ -7952,9 +7952,9 @@ }, "required": [ "photos", - "videos", "total", - "usage" + "usage", + "videos" ], "type": "object" }, @@ -8019,12 +8019,12 @@ }, "required": [ "accessToken", - "userId", - "userEmail", + "isAdmin", "name", "profileImagePath", - "isAdmin", - "shouldChangePassword" + "shouldChangePassword", + "userEmail", + "userId" ], "type": "object" }, @@ -8038,8 +8038,8 @@ } }, "required": [ - "successful", - "redirectUri" + "redirectUri", + "successful" ], "type": "object" }, @@ -8084,8 +8084,8 @@ } }, "required": [ - "title", - "assets" + "assets", + "title" ], "type": "object" }, @@ -8234,20 +8234,20 @@ }, "required": [ "avatarColor", - "quotaSizeInBytes", - "quotaUsageInBytes", - "storageLabel", - "externalPath", - "shouldChangePassword", - "isAdmin", "createdAt", "deletedAt", - "updatedAt", - "oauthId", - "id", - "name", "email", - "profileImagePath" + "externalPath", + "id", + "isAdmin", + "name", + "oauthId", + "profileImagePath", + "quotaSizeInBytes", + "quotaUsageInBytes", + "shouldChangePassword", + "storageLabel", + "updatedAt" ], "type": "object" }, @@ -8287,9 +8287,9 @@ } }, "required": [ + "people", "total", - "visible", - "people" + "visible" ], "type": "object" }, @@ -8360,9 +8360,9 @@ "required": [ "birthDate", "id", + "isHidden", "name", - "thumbnailPath", - "isHidden" + "thumbnailPath" ], "type": "object" }, @@ -8430,9 +8430,9 @@ "birthDate", "faces", "id", + "isHidden", "name", - "thumbnailPath", - "isHidden" + "thumbnailPath" ], "type": "object" }, @@ -8489,10 +8489,10 @@ } }, "required": [ - "minScore", + "enabled", "maxDistance", "minFaces", - "enabled", + "minScore", "modelName" ], "type": "object" @@ -8531,10 +8531,10 @@ } }, "required": [ - "total", "count", + "facets", "items", - "facets" + "total" ], "type": "object" }, @@ -8560,10 +8560,10 @@ } }, "required": [ - "total", "count", + "facets", "items", - "facets" + "total" ], "type": "object" }, @@ -8577,8 +8577,8 @@ } }, "required": [ - "value", - "data" + "data", + "value" ], "type": "object" }, @@ -8628,8 +8628,8 @@ } }, "required": [ - "fieldName", - "counts" + "counts", + "fieldName" ], "type": "object" }, @@ -8670,12 +8670,12 @@ } }, "required": [ - "trashDays", - "oauthButtonText", - "loginPageMessage", + "externalDomain", "isInitialized", "isOnboarded", - "externalDomain" + "loginPageMessage", + "oauthButtonText", + "trashDays" ], "type": "object" }, @@ -8720,13 +8720,13 @@ "configFile", "facialRecognition", "map", - "trash", - "reverseGeocoding", "oauth", "oauthAutoLaunch", "passwordLogin", + "reverseGeocoding", + "search", "sidecar", - "search" + "trash" ], "type": "object" }, @@ -8759,13 +8759,13 @@ } }, "required": [ - "diskSizeRaw", - "diskUseRaw", + "diskAvailable", "diskAvailableRaw", - "diskUsagePercentage", "diskSize", + "diskSizeRaw", + "diskUsagePercentage", "diskUse", - "diskAvailable" + "diskUseRaw" ], "type": "object" }, @@ -8791,9 +8791,9 @@ } }, "required": [ - "video", "image", - "sidecar" + "sidecar", + "video" ], "type": "object" }, @@ -8843,9 +8843,9 @@ }, "required": [ "photos", - "videos", "usage", - "usageByUser" + "usageByUser", + "videos" ], "type": "object" }, @@ -9009,18 +9009,18 @@ } }, "required": [ - "type", - "id", - "description", - "password", - "userId", - "key", - "createdAt", - "expiresAt", - "assets", - "allowUpload", "allowDownload", - "showMetadata" + "allowUpload", + "assets", + "createdAt", + "description", + "expiresAt", + "id", + "key", + "password", + "showMetadata", + "type", + "userId" ], "type": "object" }, @@ -9048,8 +9048,8 @@ }, "required": [ "email", - "password", - "name" + "name", + "password" ], "type": "object" }, @@ -9122,6 +9122,8 @@ }, "required": [ "ffmpeg", + "job", + "library", "logging", "machineLearning", "map", @@ -9129,13 +9131,11 @@ "oauth", "passwordLogin", "reverseGeocoding", + "server", "storageTemplate", - "job", - "thumbnail", - "trash", "theme", - "library", - "server" + "thumbnail", + "trash" ], "type": "object" }, @@ -9194,22 +9194,22 @@ } }, "required": [ - "crf", - "threads", - "targetVideoCodec", - "targetAudioCodec", - "bframes", - "refs", - "gopSize", - "npl", - "cqMode", - "transcode", "accel", - "tonemap", - "preset", - "targetResolution", + "bframes", + "cqMode", + "crf", + "gopSize", "maxBitrate", + "npl", + "preset", + "refs", + "targetAudioCodec", + "targetResolution", + "targetVideoCodec", "temporalAQ", + "threads", + "tonemap", + "transcode", "twoPass" ], "type": "object" @@ -9248,16 +9248,16 @@ } }, "required": [ - "thumbnailGeneration", - "metadataExtraction", - "videoConversion", - "smartSearch", - "migration", "backgroundTask", - "search", "faceDetection", + "library", + "metadataExtraction", + "migration", + "search", "sidecar", - "library" + "smartSearch", + "thumbnailGeneration", + "videoConversion" ], "type": "object" }, @@ -9282,8 +9282,8 @@ } }, "required": [ - "enabled", - "cronExpression" + "cronExpression", + "enabled" ], "type": "object" }, @@ -9297,8 +9297,8 @@ } }, "required": [ - "level", - "enabled" + "enabled", + "level" ], "type": "object" }, @@ -9318,10 +9318,10 @@ } }, "required": [ - "enabled", - "url", "clip", - "facialRecognition" + "enabled", + "facialRecognition", + "url" ], "type": "object" }, @@ -9338,9 +9338,9 @@ } }, "required": [ + "darkStyle", "enabled", - "lightStyle", - "darkStyle" + "lightStyle" ], "type": "object" }, @@ -9392,17 +9392,17 @@ } }, "required": [ - "enabled", - "issuerUrl", + "autoLaunch", + "autoRegister", + "buttonText", "clientId", "clientSecret", - "scope", - "storageLabelClaim", - "buttonText", - "autoRegister", - "autoLaunch", + "enabled", + "issuerUrl", "mobileOverrideEnabled", - "mobileRedirectUri" + "mobileRedirectUri", + "scope", + "storageLabelClaim" ], "type": "object" }, @@ -9514,14 +9514,14 @@ } }, "required": [ - "yearOptions", - "monthOptions", - "weekOptions", "dayOptions", "hourOptions", "minuteOptions", + "monthOptions", + "presetOptions", "secondOptions", - "presetOptions" + "weekOptions", + "yearOptions" ], "type": "object" }, @@ -9552,10 +9552,10 @@ } }, "required": [ - "webpSize", + "colorspace", "jpegSize", "quality", - "colorspace" + "webpSize" ], "type": "object" }, @@ -9590,9 +9590,9 @@ } }, "required": [ - "type", "id", "name", + "type", "userId" ], "type": "object" @@ -9622,8 +9622,8 @@ } }, "required": [ - "timeBucket", - "count" + "count", + "timeBucket" ], "type": "object" }, @@ -9749,8 +9749,8 @@ } }, "required": [ - "oldParentId", - "newParentId" + "newParentId", + "oldParentId" ], "type": "object" }, @@ -9831,12 +9831,12 @@ } }, "required": [ + "photos", + "quotaSizeInBytes", + "usage", "userId", "userName", - "photos", - "videos", - "usage", - "quotaSizeInBytes" + "videos" ], "type": "object" }, @@ -9875,9 +9875,9 @@ }, "required": [ "avatarColor", + "email", "id", "name", - "email", "profileImagePath" ], "type": "object" @@ -9945,20 +9945,20 @@ }, "required": [ "avatarColor", - "quotaSizeInBytes", - "quotaUsageInBytes", - "storageLabel", - "externalPath", - "shouldChangePassword", - "isAdmin", "createdAt", "deletedAt", - "updatedAt", - "oauthId", - "id", - "name", "email", - "profileImagePath" + "externalPath", + "id", + "isAdmin", + "name", + "oauthId", + "profileImagePath", + "quotaSizeInBytes", + "quotaUsageInBytes", + "shouldChangePassword", + "storageLabel", + "updatedAt" ], "type": "object" }, diff --git a/open-api/typescript-sdk/client/api.ts b/open-api/typescript-sdk/client/api.ts index 25005732de..f1cbdae068 100644 --- a/open-api/typescript-sdk/client/api.ts +++ b/open-api/typescript-sdk/client/api.ts @@ -5387,13 +5387,13 @@ export const ActivityApiAxiosParamCreator = function (configuration?: Configurat * * @param {string} albumId * @param {string} [assetId] - * @param {ReactionType} [type] * @param {ReactionLevel} [level] + * @param {ReactionType} [type] * @param {string} [userId] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getActivities: async (albumId: string, assetId?: string, type?: ReactionType, level?: ReactionLevel, userId?: string, options: AxiosRequestConfig = {}): Promise => { + getActivities: async (albumId: string, assetId?: string, level?: ReactionLevel, type?: ReactionType, userId?: string, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'albumId' is not null or undefined assertParamExists('getActivities', 'albumId', albumId) const localVarPath = `/activity`; @@ -5425,14 +5425,14 @@ export const ActivityApiAxiosParamCreator = function (configuration?: Configurat localVarQueryParameter['assetId'] = assetId; } - if (type !== undefined) { - localVarQueryParameter['type'] = type; - } - if (level !== undefined) { localVarQueryParameter['level'] = level; } + if (type !== undefined) { + localVarQueryParameter['type'] = type; + } + if (userId !== undefined) { localVarQueryParameter['userId'] = userId; } @@ -5532,14 +5532,14 @@ export const ActivityApiFp = function(configuration?: Configuration) { * * @param {string} albumId * @param {string} [assetId] - * @param {ReactionType} [type] * @param {ReactionLevel} [level] + * @param {ReactionType} [type] * @param {string} [userId] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getActivities(albumId: string, assetId?: string, type?: ReactionType, level?: ReactionLevel, userId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getActivities(albumId, assetId, type, level, userId, options); + async getActivities(albumId: string, assetId?: string, level?: ReactionLevel, type?: ReactionType, userId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getActivities(albumId, assetId, level, type, userId, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -5588,7 +5588,7 @@ export const ActivityApiFactory = function (configuration?: Configuration, baseP * @throws {RequiredError} */ getActivities(requestParameters: ActivityApiGetActivitiesRequest, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getActivities(requestParameters.albumId, requestParameters.assetId, requestParameters.type, requestParameters.level, requestParameters.userId, options).then((request) => request(axios, basePath)); + return localVarFp.getActivities(requestParameters.albumId, requestParameters.assetId, requestParameters.level, requestParameters.type, requestParameters.userId, options).then((request) => request(axios, basePath)); }, /** * @@ -5650,13 +5650,6 @@ export interface ActivityApiGetActivitiesRequest { */ readonly assetId?: string - /** - * - * @type {ReactionType} - * @memberof ActivityApiGetActivities - */ - readonly type?: ReactionType - /** * * @type {ReactionLevel} @@ -5664,6 +5657,13 @@ export interface ActivityApiGetActivitiesRequest { */ readonly level?: ReactionLevel + /** + * + * @type {ReactionType} + * @memberof ActivityApiGetActivities + */ + readonly type?: ReactionType + /** * * @type {string} @@ -5730,7 +5730,7 @@ export class ActivityApi extends BaseAPI { * @memberof ActivityApi */ public getActivities(requestParameters: ActivityApiGetActivitiesRequest, options?: AxiosRequestConfig) { - return ActivityApiFp(this.configuration).getActivities(requestParameters.albumId, requestParameters.assetId, requestParameters.type, requestParameters.level, requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); + return ActivityApiFp(this.configuration).getActivities(requestParameters.albumId, requestParameters.assetId, requestParameters.level, requestParameters.type, requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); } /** @@ -5980,12 +5980,12 @@ export const AlbumApiAxiosParamCreator = function (configuration?: Configuration /** * * @param {string} id - * @param {boolean} [withoutAssets] * @param {string} [key] + * @param {boolean} [withoutAssets] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAlbumInfo: async (id: string, withoutAssets?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise => { + getAlbumInfo: async (id: string, key?: string, withoutAssets?: boolean, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'id' is not null or undefined assertParamExists('getAlbumInfo', 'id', id) const localVarPath = `/album/{id}` @@ -6010,14 +6010,14 @@ export const AlbumApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) - if (withoutAssets !== undefined) { - localVarQueryParameter['withoutAssets'] = withoutAssets; - } - if (key !== undefined) { localVarQueryParameter['key'] = key; } + if (withoutAssets !== undefined) { + localVarQueryParameter['withoutAssets'] = withoutAssets; + } + setSearchParams(localVarUrlObj, localVarQueryParameter); @@ -6031,12 +6031,12 @@ export const AlbumApiAxiosParamCreator = function (configuration?: Configuration }, /** * - * @param {boolean} [shared] * @param {string} [assetId] Only returns albums that contain the asset Ignores the shared parameter undefined: get all albums + * @param {boolean} [shared] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAllAlbums: async (shared?: boolean, assetId?: string, options: AxiosRequestConfig = {}): Promise => { + getAllAlbums: async (assetId?: string, shared?: boolean, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/album`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -6058,14 +6058,14 @@ export const AlbumApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) - if (shared !== undefined) { - localVarQueryParameter['shared'] = shared; - } - if (assetId !== undefined) { localVarQueryParameter['assetId'] = assetId; } + if (shared !== undefined) { + localVarQueryParameter['shared'] = shared; + } + setSearchParams(localVarUrlObj, localVarQueryParameter); @@ -6284,24 +6284,24 @@ export const AlbumApiFp = function(configuration?: Configuration) { /** * * @param {string} id - * @param {boolean} [withoutAssets] * @param {string} [key] + * @param {boolean} [withoutAssets] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getAlbumInfo(id: string, withoutAssets?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAlbumInfo(id, withoutAssets, key, options); + async getAlbumInfo(id: string, key?: string, withoutAssets?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getAlbumInfo(id, key, withoutAssets, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** * - * @param {boolean} [shared] * @param {string} [assetId] Only returns albums that contain the asset Ignores the shared parameter undefined: get all albums + * @param {boolean} [shared] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getAllAlbums(shared?: boolean, assetId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAllAlbums(shared, assetId, options); + async getAllAlbums(assetId?: string, shared?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getAllAlbums(assetId, shared, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -6398,7 +6398,7 @@ export const AlbumApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ getAlbumInfo(requestParameters: AlbumApiGetAlbumInfoRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getAlbumInfo(requestParameters.id, requestParameters.withoutAssets, requestParameters.key, options).then((request) => request(axios, basePath)); + return localVarFp.getAlbumInfo(requestParameters.id, requestParameters.key, requestParameters.withoutAssets, options).then((request) => request(axios, basePath)); }, /** * @@ -6407,7 +6407,7 @@ export const AlbumApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ getAllAlbums(requestParameters: AlbumApiGetAllAlbumsRequest = {}, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getAllAlbums(requestParameters.shared, requestParameters.assetId, options).then((request) => request(axios, basePath)); + return localVarFp.getAllAlbums(requestParameters.assetId, requestParameters.shared, options).then((request) => request(axios, basePath)); }, /** * @@ -6529,19 +6529,19 @@ export interface AlbumApiGetAlbumInfoRequest { */ readonly id: string - /** - * - * @type {boolean} - * @memberof AlbumApiGetAlbumInfo - */ - readonly withoutAssets?: boolean - /** * * @type {string} * @memberof AlbumApiGetAlbumInfo */ readonly key?: string + + /** + * + * @type {boolean} + * @memberof AlbumApiGetAlbumInfo + */ + readonly withoutAssets?: boolean } /** @@ -6550,19 +6550,19 @@ export interface AlbumApiGetAlbumInfoRequest { * @interface AlbumApiGetAllAlbumsRequest */ export interface AlbumApiGetAllAlbumsRequest { - /** - * - * @type {boolean} - * @memberof AlbumApiGetAllAlbums - */ - readonly shared?: boolean - /** * Only returns albums that contain the asset Ignores the shared parameter undefined: get all albums * @type {string} * @memberof AlbumApiGetAllAlbums */ readonly assetId?: string + + /** + * + * @type {boolean} + * @memberof AlbumApiGetAllAlbums + */ + readonly shared?: boolean } /** @@ -6697,7 +6697,7 @@ export class AlbumApi extends BaseAPI { * @memberof AlbumApi */ public getAlbumInfo(requestParameters: AlbumApiGetAlbumInfoRequest, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).getAlbumInfo(requestParameters.id, requestParameters.withoutAssets, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); + return AlbumApiFp(this.configuration).getAlbumInfo(requestParameters.id, requestParameters.key, requestParameters.withoutAssets, options).then((request) => request(this.axios, this.basePath)); } /** @@ -6708,7 +6708,7 @@ export class AlbumApi extends BaseAPI { * @memberof AlbumApi */ public getAllAlbums(requestParameters: AlbumApiGetAllAlbumsRequest = {}, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).getAllAlbums(requestParameters.shared, requestParameters.assetId, options).then((request) => request(this.axios, this.basePath)); + return AlbumApiFp(this.configuration).getAllAlbums(requestParameters.assetId, requestParameters.shared, options).then((request) => request(this.axios, this.basePath)); } /** @@ -7020,18 +7020,18 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration }, /** * Get all AssetEntity belong to the user + * @param {string} [ifNoneMatch] ETag of data already cached on the client + * @param {boolean} [isArchived] + * @param {boolean} [isFavorite] * @param {number} [skip] * @param {number} [take] - * @param {string} [userId] - * @param {boolean} [isFavorite] - * @param {boolean} [isArchived] * @param {string} [updatedAfter] * @param {string} [updatedBefore] - * @param {string} [ifNoneMatch] ETag of data already cached on the client + * @param {string} [userId] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAllAssets: async (skip?: number, take?: number, userId?: string, isFavorite?: boolean, isArchived?: boolean, updatedAfter?: string, updatedBefore?: string, ifNoneMatch?: string, options: AxiosRequestConfig = {}): Promise => { + getAllAssets: async (ifNoneMatch?: string, isArchived?: boolean, isFavorite?: boolean, skip?: number, take?: number, updatedAfter?: string, updatedBefore?: string, userId?: string, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/asset`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -7053,24 +7053,20 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) - if (skip !== undefined) { - localVarQueryParameter['skip'] = skip; - } - - if (take !== undefined) { - localVarQueryParameter['take'] = take; - } - - if (userId !== undefined) { - localVarQueryParameter['userId'] = userId; + if (isArchived !== undefined) { + localVarQueryParameter['isArchived'] = isArchived; } if (isFavorite !== undefined) { localVarQueryParameter['isFavorite'] = isFavorite; } - if (isArchived !== undefined) { - localVarQueryParameter['isArchived'] = isArchived; + if (skip !== undefined) { + localVarQueryParameter['skip'] = skip; + } + + if (take !== undefined) { + localVarQueryParameter['take'] = take; } if (updatedAfter !== undefined) { @@ -7085,6 +7081,10 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration updatedBefore; } + if (userId !== undefined) { + localVarQueryParameter['userId'] = userId; + } + if (ifNoneMatch != null) { localVarHeaderParameter['if-none-match'] = String(ifNoneMatch); } @@ -7459,14 +7459,14 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration }, /** * - * @param {boolean} [isArchived] - * @param {boolean} [isFavorite] * @param {string} [fileCreatedAfter] * @param {string} [fileCreatedBefore] + * @param {boolean} [isArchived] + * @param {boolean} [isFavorite] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getMapMarkers: async (isArchived?: boolean, isFavorite?: boolean, fileCreatedAfter?: string, fileCreatedBefore?: string, options: AxiosRequestConfig = {}): Promise => { + getMapMarkers: async (fileCreatedAfter?: string, fileCreatedBefore?: string, isArchived?: boolean, isFavorite?: boolean, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/asset/map-marker`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -7488,14 +7488,6 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) - if (isArchived !== undefined) { - localVarQueryParameter['isArchived'] = isArchived; - } - - if (isFavorite !== undefined) { - localVarQueryParameter['isFavorite'] = isFavorite; - } - if (fileCreatedAfter !== undefined) { localVarQueryParameter['fileCreatedAfter'] = (fileCreatedAfter as any instanceof Date) ? (fileCreatedAfter as any).toISOString() : @@ -7508,6 +7500,14 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration fileCreatedBefore; } + if (isArchived !== undefined) { + localVarQueryParameter['isArchived'] = isArchived; + } + + if (isFavorite !== undefined) { + localVarQueryParameter['isFavorite'] = isFavorite; + } + setSearchParams(localVarUrlObj, localVarQueryParameter); @@ -7618,19 +7618,19 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration * * @param {TimeBucketSize} size * @param {string} timeBucket - * @param {string} [userId] * @param {string} [albumId] - * @param {string} [personId] * @param {boolean} [isArchived] * @param {boolean} [isFavorite] * @param {boolean} [isTrashed] - * @param {boolean} [withStacked] - * @param {boolean} [withPartners] * @param {string} [key] + * @param {string} [personId] + * @param {string} [userId] + * @param {boolean} [withPartners] + * @param {boolean} [withStacked] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getTimeBucket: async (size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, withPartners?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise => { + getTimeBucket: async (size: TimeBucketSize, timeBucket: string, albumId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, key?: string, personId?: string, userId?: string, withPartners?: boolean, withStacked?: boolean, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'size' is not null or undefined assertParamExists('getTimeBucket', 'size', size) // verify required parameter 'timeBucket' is not null or undefined @@ -7656,22 +7656,10 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) - if (size !== undefined) { - localVarQueryParameter['size'] = size; - } - - if (userId !== undefined) { - localVarQueryParameter['userId'] = userId; - } - if (albumId !== undefined) { localVarQueryParameter['albumId'] = albumId; } - if (personId !== undefined) { - localVarQueryParameter['personId'] = personId; - } - if (isArchived !== undefined) { localVarQueryParameter['isArchived'] = isArchived; } @@ -7684,20 +7672,32 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration localVarQueryParameter['isTrashed'] = isTrashed; } - if (withStacked !== undefined) { - localVarQueryParameter['withStacked'] = withStacked; + if (key !== undefined) { + localVarQueryParameter['key'] = key; } - if (withPartners !== undefined) { - localVarQueryParameter['withPartners'] = withPartners; + if (personId !== undefined) { + localVarQueryParameter['personId'] = personId; + } + + if (size !== undefined) { + localVarQueryParameter['size'] = size; } if (timeBucket !== undefined) { localVarQueryParameter['timeBucket'] = timeBucket; } - if (key !== undefined) { - localVarQueryParameter['key'] = key; + if (userId !== undefined) { + localVarQueryParameter['userId'] = userId; + } + + if (withPartners !== undefined) { + localVarQueryParameter['withPartners'] = withPartners; + } + + if (withStacked !== undefined) { + localVarQueryParameter['withStacked'] = withStacked; } @@ -7714,19 +7714,19 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration /** * * @param {TimeBucketSize} size - * @param {string} [userId] * @param {string} [albumId] - * @param {string} [personId] * @param {boolean} [isArchived] * @param {boolean} [isFavorite] * @param {boolean} [isTrashed] - * @param {boolean} [withStacked] - * @param {boolean} [withPartners] * @param {string} [key] + * @param {string} [personId] + * @param {string} [userId] + * @param {boolean} [withPartners] + * @param {boolean} [withStacked] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getTimeBuckets: async (size: TimeBucketSize, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, withPartners?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise => { + getTimeBuckets: async (size: TimeBucketSize, albumId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, key?: string, personId?: string, userId?: string, withPartners?: boolean, withStacked?: boolean, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'size' is not null or undefined assertParamExists('getTimeBuckets', 'size', size) const localVarPath = `/asset/time-buckets`; @@ -7750,22 +7750,10 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) - if (size !== undefined) { - localVarQueryParameter['size'] = size; - } - - if (userId !== undefined) { - localVarQueryParameter['userId'] = userId; - } - if (albumId !== undefined) { localVarQueryParameter['albumId'] = albumId; } - if (personId !== undefined) { - localVarQueryParameter['personId'] = personId; - } - if (isArchived !== undefined) { localVarQueryParameter['isArchived'] = isArchived; } @@ -7778,16 +7766,28 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration localVarQueryParameter['isTrashed'] = isTrashed; } - if (withStacked !== undefined) { - localVarQueryParameter['withStacked'] = withStacked; + if (key !== undefined) { + localVarQueryParameter['key'] = key; + } + + if (personId !== undefined) { + localVarQueryParameter['personId'] = personId; + } + + if (size !== undefined) { + localVarQueryParameter['size'] = size; + } + + if (userId !== undefined) { + localVarQueryParameter['userId'] = userId; } if (withPartners !== undefined) { localVarQueryParameter['withPartners'] = withPartners; } - if (key !== undefined) { - localVarQueryParameter['key'] = key; + if (withStacked !== undefined) { + localVarQueryParameter['withStacked'] = withStacked; } @@ -7973,13 +7973,15 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration }, /** * - * @param {string} [id] - * @param {string} [libraryId] - * @param {AssetTypeEnum} [type] - * @param {AssetOrder} [order] + * @param {string} [checksum] + * @param {string} [city] + * @param {string} [country] + * @param {string} [createdAfter] + * @param {string} [createdBefore] * @param {string} [deviceAssetId] * @param {string} [deviceId] - * @param {string} [checksum] + * @param {string} [encodedVideoPath] + * @param {string} [id] * @param {boolean} [isArchived] * @param {boolean} [isEncoded] * @param {boolean} [isExternal] @@ -7988,35 +7990,33 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration * @param {boolean} [isOffline] * @param {boolean} [isReadOnly] * @param {boolean} [isVisible] - * @param {boolean} [withDeleted] - * @param {boolean} [withStacked] - * @param {boolean} [withExif] - * @param {boolean} [withPeople] - * @param {string} [createdBefore] - * @param {string} [createdAfter] - * @param {string} [updatedBefore] - * @param {string} [updatedAfter] - * @param {string} [trashedBefore] - * @param {string} [trashedAfter] - * @param {string} [takenBefore] - * @param {string} [takenAfter] - * @param {string} [originalFileName] - * @param {string} [originalPath] - * @param {string} [resizePath] - * @param {string} [webpPath] - * @param {string} [encodedVideoPath] - * @param {string} [city] - * @param {string} [state] - * @param {string} [country] + * @param {string} [lensModel] + * @param {string} [libraryId] * @param {string} [make] * @param {string} [model] - * @param {string} [lensModel] + * @param {AssetOrder} [order] + * @param {string} [originalFileName] + * @param {string} [originalPath] * @param {number} [page] + * @param {string} [resizePath] * @param {number} [size] + * @param {string} [state] + * @param {string} [takenAfter] + * @param {string} [takenBefore] + * @param {string} [trashedAfter] + * @param {string} [trashedBefore] + * @param {AssetTypeEnum} [type] + * @param {string} [updatedAfter] + * @param {string} [updatedBefore] + * @param {string} [webpPath] + * @param {boolean} [withDeleted] + * @param {boolean} [withExif] + * @param {boolean} [withPeople] + * @param {boolean} [withStacked] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - searchAssets: async (id?: string, libraryId?: string, type?: AssetTypeEnum, order?: AssetOrder, deviceAssetId?: string, deviceId?: string, checksum?: string, isArchived?: boolean, isEncoded?: boolean, isExternal?: boolean, isFavorite?: boolean, isMotion?: boolean, isOffline?: boolean, isReadOnly?: boolean, isVisible?: boolean, withDeleted?: boolean, withStacked?: boolean, withExif?: boolean, withPeople?: boolean, createdBefore?: string, createdAfter?: string, updatedBefore?: string, updatedAfter?: string, trashedBefore?: string, trashedAfter?: string, takenBefore?: string, takenAfter?: string, originalFileName?: string, originalPath?: string, resizePath?: string, webpPath?: string, encodedVideoPath?: string, city?: string, state?: string, country?: string, make?: string, model?: string, lensModel?: string, page?: number, size?: number, options: AxiosRequestConfig = {}): Promise => { + searchAssets: async (checksum?: string, city?: string, country?: string, createdAfter?: string, createdBefore?: string, deviceAssetId?: string, deviceId?: string, encodedVideoPath?: string, id?: string, isArchived?: boolean, isEncoded?: boolean, isExternal?: boolean, isFavorite?: boolean, isMotion?: boolean, isOffline?: boolean, isReadOnly?: boolean, isVisible?: boolean, lensModel?: string, libraryId?: string, make?: string, model?: string, order?: AssetOrder, originalFileName?: string, originalPath?: string, page?: number, resizePath?: string, size?: number, state?: string, takenAfter?: string, takenBefore?: string, trashedAfter?: string, trashedBefore?: string, type?: AssetTypeEnum, updatedAfter?: string, updatedBefore?: string, webpPath?: string, withDeleted?: boolean, withExif?: boolean, withPeople?: boolean, withStacked?: boolean, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/assets`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -8038,20 +8038,28 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) - if (id !== undefined) { - localVarQueryParameter['id'] = id; + if (checksum !== undefined) { + localVarQueryParameter['checksum'] = checksum; } - if (libraryId !== undefined) { - localVarQueryParameter['libraryId'] = libraryId; + if (city !== undefined) { + localVarQueryParameter['city'] = city; } - if (type !== undefined) { - localVarQueryParameter['type'] = type; + if (country !== undefined) { + localVarQueryParameter['country'] = country; } - if (order !== undefined) { - localVarQueryParameter['order'] = order; + if (createdAfter !== undefined) { + localVarQueryParameter['createdAfter'] = (createdAfter as any instanceof Date) ? + (createdAfter as any).toISOString() : + createdAfter; + } + + if (createdBefore !== undefined) { + localVarQueryParameter['createdBefore'] = (createdBefore as any instanceof Date) ? + (createdBefore as any).toISOString() : + createdBefore; } if (deviceAssetId !== undefined) { @@ -8062,8 +8070,12 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration localVarQueryParameter['deviceId'] = deviceId; } - if (checksum !== undefined) { - localVarQueryParameter['checksum'] = checksum; + if (encodedVideoPath !== undefined) { + localVarQueryParameter['encodedVideoPath'] = encodedVideoPath; + } + + if (id !== undefined) { + localVarQueryParameter['id'] = id; } if (isArchived !== undefined) { @@ -8098,100 +8110,12 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration localVarQueryParameter['isVisible'] = isVisible; } - if (withDeleted !== undefined) { - localVarQueryParameter['withDeleted'] = withDeleted; + if (lensModel !== undefined) { + localVarQueryParameter['lensModel'] = lensModel; } - if (withStacked !== undefined) { - localVarQueryParameter['withStacked'] = withStacked; - } - - if (withExif !== undefined) { - localVarQueryParameter['withExif'] = withExif; - } - - if (withPeople !== undefined) { - localVarQueryParameter['withPeople'] = withPeople; - } - - if (createdBefore !== undefined) { - localVarQueryParameter['createdBefore'] = (createdBefore as any instanceof Date) ? - (createdBefore as any).toISOString() : - createdBefore; - } - - if (createdAfter !== undefined) { - localVarQueryParameter['createdAfter'] = (createdAfter as any instanceof Date) ? - (createdAfter as any).toISOString() : - createdAfter; - } - - if (updatedBefore !== undefined) { - localVarQueryParameter['updatedBefore'] = (updatedBefore as any instanceof Date) ? - (updatedBefore as any).toISOString() : - updatedBefore; - } - - if (updatedAfter !== undefined) { - localVarQueryParameter['updatedAfter'] = (updatedAfter as any instanceof Date) ? - (updatedAfter as any).toISOString() : - updatedAfter; - } - - if (trashedBefore !== undefined) { - localVarQueryParameter['trashedBefore'] = (trashedBefore as any instanceof Date) ? - (trashedBefore as any).toISOString() : - trashedBefore; - } - - if (trashedAfter !== undefined) { - localVarQueryParameter['trashedAfter'] = (trashedAfter as any instanceof Date) ? - (trashedAfter as any).toISOString() : - trashedAfter; - } - - if (takenBefore !== undefined) { - localVarQueryParameter['takenBefore'] = (takenBefore as any instanceof Date) ? - (takenBefore as any).toISOString() : - takenBefore; - } - - if (takenAfter !== undefined) { - localVarQueryParameter['takenAfter'] = (takenAfter as any instanceof Date) ? - (takenAfter as any).toISOString() : - takenAfter; - } - - if (originalFileName !== undefined) { - localVarQueryParameter['originalFileName'] = originalFileName; - } - - if (originalPath !== undefined) { - localVarQueryParameter['originalPath'] = originalPath; - } - - if (resizePath !== undefined) { - localVarQueryParameter['resizePath'] = resizePath; - } - - if (webpPath !== undefined) { - localVarQueryParameter['webpPath'] = webpPath; - } - - if (encodedVideoPath !== undefined) { - localVarQueryParameter['encodedVideoPath'] = encodedVideoPath; - } - - if (city !== undefined) { - localVarQueryParameter['city'] = city; - } - - if (state !== undefined) { - localVarQueryParameter['state'] = state; - } - - if (country !== undefined) { - localVarQueryParameter['country'] = country; + if (libraryId !== undefined) { + localVarQueryParameter['libraryId'] = libraryId; } if (make !== undefined) { @@ -8202,18 +8126,94 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration localVarQueryParameter['model'] = model; } - if (lensModel !== undefined) { - localVarQueryParameter['lensModel'] = lensModel; + if (order !== undefined) { + localVarQueryParameter['order'] = order; + } + + if (originalFileName !== undefined) { + localVarQueryParameter['originalFileName'] = originalFileName; + } + + if (originalPath !== undefined) { + localVarQueryParameter['originalPath'] = originalPath; } if (page !== undefined) { localVarQueryParameter['page'] = page; } + if (resizePath !== undefined) { + localVarQueryParameter['resizePath'] = resizePath; + } + if (size !== undefined) { localVarQueryParameter['size'] = size; } + if (state !== undefined) { + localVarQueryParameter['state'] = state; + } + + if (takenAfter !== undefined) { + localVarQueryParameter['takenAfter'] = (takenAfter as any instanceof Date) ? + (takenAfter as any).toISOString() : + takenAfter; + } + + if (takenBefore !== undefined) { + localVarQueryParameter['takenBefore'] = (takenBefore as any instanceof Date) ? + (takenBefore as any).toISOString() : + takenBefore; + } + + if (trashedAfter !== undefined) { + localVarQueryParameter['trashedAfter'] = (trashedAfter as any instanceof Date) ? + (trashedAfter as any).toISOString() : + trashedAfter; + } + + if (trashedBefore !== undefined) { + localVarQueryParameter['trashedBefore'] = (trashedBefore as any instanceof Date) ? + (trashedBefore as any).toISOString() : + trashedBefore; + } + + if (type !== undefined) { + localVarQueryParameter['type'] = type; + } + + if (updatedAfter !== undefined) { + localVarQueryParameter['updatedAfter'] = (updatedAfter as any instanceof Date) ? + (updatedAfter as any).toISOString() : + updatedAfter; + } + + if (updatedBefore !== undefined) { + localVarQueryParameter['updatedBefore'] = (updatedBefore as any instanceof Date) ? + (updatedBefore as any).toISOString() : + updatedBefore; + } + + if (webpPath !== undefined) { + localVarQueryParameter['webpPath'] = webpPath; + } + + if (withDeleted !== undefined) { + localVarQueryParameter['withDeleted'] = withDeleted; + } + + if (withExif !== undefined) { + localVarQueryParameter['withExif'] = withExif; + } + + if (withPeople !== undefined) { + localVarQueryParameter['withPeople'] = withPeople; + } + + if (withStacked !== undefined) { + localVarQueryParameter['withStacked'] = withStacked; + } + setSearchParams(localVarUrlObj, localVarQueryParameter); @@ -8623,19 +8623,19 @@ export const AssetApiFp = function(configuration?: Configuration) { }, /** * Get all AssetEntity belong to the user + * @param {string} [ifNoneMatch] ETag of data already cached on the client + * @param {boolean} [isArchived] + * @param {boolean} [isFavorite] * @param {number} [skip] * @param {number} [take] - * @param {string} [userId] - * @param {boolean} [isFavorite] - * @param {boolean} [isArchived] * @param {string} [updatedAfter] * @param {string} [updatedBefore] - * @param {string} [ifNoneMatch] ETag of data already cached on the client + * @param {string} [userId] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getAllAssets(skip?: number, take?: number, userId?: string, isFavorite?: boolean, isArchived?: boolean, updatedAfter?: string, updatedBefore?: string, ifNoneMatch?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAllAssets(skip, take, userId, isFavorite, isArchived, updatedAfter, updatedBefore, ifNoneMatch, options); + async getAllAssets(ifNoneMatch?: string, isArchived?: boolean, isFavorite?: boolean, skip?: number, take?: number, updatedAfter?: string, updatedBefore?: string, userId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getAllAssets(ifNoneMatch, isArchived, isFavorite, skip, take, updatedAfter, updatedBefore, userId, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -8723,15 +8723,15 @@ export const AssetApiFp = function(configuration?: Configuration) { }, /** * - * @param {boolean} [isArchived] - * @param {boolean} [isFavorite] * @param {string} [fileCreatedAfter] * @param {string} [fileCreatedBefore] + * @param {boolean} [isArchived] + * @param {boolean} [isFavorite] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getMapMarkers(isArchived?: boolean, isFavorite?: boolean, fileCreatedAfter?: string, fileCreatedBefore?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getMapMarkers(isArchived, isFavorite, fileCreatedAfter, fileCreatedBefore, options); + async getMapMarkers(fileCreatedAfter?: string, fileCreatedBefore?: string, isArchived?: boolean, isFavorite?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getMapMarkers(fileCreatedAfter, fileCreatedBefore, isArchived, isFavorite, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -8759,39 +8759,39 @@ export const AssetApiFp = function(configuration?: Configuration) { * * @param {TimeBucketSize} size * @param {string} timeBucket - * @param {string} [userId] * @param {string} [albumId] - * @param {string} [personId] * @param {boolean} [isArchived] * @param {boolean} [isFavorite] * @param {boolean} [isTrashed] - * @param {boolean} [withStacked] - * @param {boolean} [withPartners] * @param {string} [key] + * @param {string} [personId] + * @param {string} [userId] + * @param {boolean} [withPartners] + * @param {boolean} [withStacked] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getTimeBucket(size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, withPartners?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, withPartners, key, options); + async getTimeBucket(size: TimeBucketSize, timeBucket: string, albumId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, key?: string, personId?: string, userId?: string, withPartners?: boolean, withStacked?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getTimeBucket(size, timeBucket, albumId, isArchived, isFavorite, isTrashed, key, personId, userId, withPartners, withStacked, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** * * @param {TimeBucketSize} size - * @param {string} [userId] * @param {string} [albumId] - * @param {string} [personId] * @param {boolean} [isArchived] * @param {boolean} [isFavorite] * @param {boolean} [isTrashed] - * @param {boolean} [withStacked] - * @param {boolean} [withPartners] * @param {string} [key] + * @param {string} [personId] + * @param {string} [userId] + * @param {boolean} [withPartners] + * @param {boolean} [withStacked] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getTimeBuckets(size: TimeBucketSize, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, withPartners?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getTimeBuckets(size, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, withPartners, key, options); + async getTimeBuckets(size: TimeBucketSize, albumId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, key?: string, personId?: string, userId?: string, withPartners?: boolean, withStacked?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getTimeBuckets(size, albumId, isArchived, isFavorite, isTrashed, key, personId, userId, withPartners, withStacked, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -8837,13 +8837,15 @@ export const AssetApiFp = function(configuration?: Configuration) { }, /** * - * @param {string} [id] - * @param {string} [libraryId] - * @param {AssetTypeEnum} [type] - * @param {AssetOrder} [order] + * @param {string} [checksum] + * @param {string} [city] + * @param {string} [country] + * @param {string} [createdAfter] + * @param {string} [createdBefore] * @param {string} [deviceAssetId] * @param {string} [deviceId] - * @param {string} [checksum] + * @param {string} [encodedVideoPath] + * @param {string} [id] * @param {boolean} [isArchived] * @param {boolean} [isEncoded] * @param {boolean} [isExternal] @@ -8852,36 +8854,34 @@ export const AssetApiFp = function(configuration?: Configuration) { * @param {boolean} [isOffline] * @param {boolean} [isReadOnly] * @param {boolean} [isVisible] - * @param {boolean} [withDeleted] - * @param {boolean} [withStacked] - * @param {boolean} [withExif] - * @param {boolean} [withPeople] - * @param {string} [createdBefore] - * @param {string} [createdAfter] - * @param {string} [updatedBefore] - * @param {string} [updatedAfter] - * @param {string} [trashedBefore] - * @param {string} [trashedAfter] - * @param {string} [takenBefore] - * @param {string} [takenAfter] - * @param {string} [originalFileName] - * @param {string} [originalPath] - * @param {string} [resizePath] - * @param {string} [webpPath] - * @param {string} [encodedVideoPath] - * @param {string} [city] - * @param {string} [state] - * @param {string} [country] + * @param {string} [lensModel] + * @param {string} [libraryId] * @param {string} [make] * @param {string} [model] - * @param {string} [lensModel] + * @param {AssetOrder} [order] + * @param {string} [originalFileName] + * @param {string} [originalPath] * @param {number} [page] + * @param {string} [resizePath] * @param {number} [size] + * @param {string} [state] + * @param {string} [takenAfter] + * @param {string} [takenBefore] + * @param {string} [trashedAfter] + * @param {string} [trashedBefore] + * @param {AssetTypeEnum} [type] + * @param {string} [updatedAfter] + * @param {string} [updatedBefore] + * @param {string} [webpPath] + * @param {boolean} [withDeleted] + * @param {boolean} [withExif] + * @param {boolean} [withPeople] + * @param {boolean} [withStacked] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async searchAssets(id?: string, libraryId?: string, type?: AssetTypeEnum, order?: AssetOrder, deviceAssetId?: string, deviceId?: string, checksum?: string, isArchived?: boolean, isEncoded?: boolean, isExternal?: boolean, isFavorite?: boolean, isMotion?: boolean, isOffline?: boolean, isReadOnly?: boolean, isVisible?: boolean, withDeleted?: boolean, withStacked?: boolean, withExif?: boolean, withPeople?: boolean, createdBefore?: string, createdAfter?: string, updatedBefore?: string, updatedAfter?: string, trashedBefore?: string, trashedAfter?: string, takenBefore?: string, takenAfter?: string, originalFileName?: string, originalPath?: string, resizePath?: string, webpPath?: string, encodedVideoPath?: string, city?: string, state?: string, country?: string, make?: string, model?: string, lensModel?: string, page?: number, size?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.searchAssets(id, libraryId, type, order, deviceAssetId, deviceId, checksum, isArchived, isEncoded, isExternal, isFavorite, isMotion, isOffline, isReadOnly, isVisible, withDeleted, withStacked, withExif, withPeople, createdBefore, createdAfter, updatedBefore, updatedAfter, trashedBefore, trashedAfter, takenBefore, takenAfter, originalFileName, originalPath, resizePath, webpPath, encodedVideoPath, city, state, country, make, model, lensModel, page, size, options); + async searchAssets(checksum?: string, city?: string, country?: string, createdAfter?: string, createdBefore?: string, deviceAssetId?: string, deviceId?: string, encodedVideoPath?: string, id?: string, isArchived?: boolean, isEncoded?: boolean, isExternal?: boolean, isFavorite?: boolean, isMotion?: boolean, isOffline?: boolean, isReadOnly?: boolean, isVisible?: boolean, lensModel?: string, libraryId?: string, make?: string, model?: string, order?: AssetOrder, originalFileName?: string, originalPath?: string, page?: number, resizePath?: string, size?: number, state?: string, takenAfter?: string, takenBefore?: string, trashedAfter?: string, trashedBefore?: string, type?: AssetTypeEnum, updatedAfter?: string, updatedBefore?: string, webpPath?: string, withDeleted?: boolean, withExif?: boolean, withPeople?: boolean, withStacked?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.searchAssets(checksum, city, country, createdAfter, createdBefore, deviceAssetId, deviceId, encodedVideoPath, id, isArchived, isEncoded, isExternal, isFavorite, isMotion, isOffline, isReadOnly, isVisible, lensModel, libraryId, make, model, order, originalFileName, originalPath, page, resizePath, size, state, takenAfter, takenBefore, trashedAfter, trashedBefore, type, updatedAfter, updatedBefore, webpPath, withDeleted, withExif, withPeople, withStacked, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -9023,7 +9023,7 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ getAllAssets(requestParameters: AssetApiGetAllAssetsRequest = {}, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getAllAssets(requestParameters.skip, requestParameters.take, requestParameters.userId, requestParameters.isFavorite, requestParameters.isArchived, requestParameters.updatedAfter, requestParameters.updatedBefore, requestParameters.ifNoneMatch, options).then((request) => request(axios, basePath)); + return localVarFp.getAllAssets(requestParameters.ifNoneMatch, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.skip, requestParameters.take, requestParameters.updatedAfter, requestParameters.updatedBefore, requestParameters.userId, options).then((request) => request(axios, basePath)); }, /** * Get all asset of a device that are in the database, ID only. @@ -9101,7 +9101,7 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ getMapMarkers(requestParameters: AssetApiGetMapMarkersRequest = {}, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getMapMarkers(requestParameters.isArchived, requestParameters.isFavorite, requestParameters.fileCreatedAfter, requestParameters.fileCreatedBefore, options).then((request) => request(axios, basePath)); + return localVarFp.getMapMarkers(requestParameters.fileCreatedAfter, requestParameters.fileCreatedBefore, requestParameters.isArchived, requestParameters.isFavorite, options).then((request) => request(axios, basePath)); }, /** * @@ -9128,7 +9128,7 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ getTimeBucket(requestParameters: AssetApiGetTimeBucketRequest, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.withPartners, requestParameters.key, options).then((request) => request(axios, basePath)); + return localVarFp.getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.albumId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.key, requestParameters.personId, requestParameters.userId, requestParameters.withPartners, requestParameters.withStacked, options).then((request) => request(axios, basePath)); }, /** * @@ -9137,7 +9137,7 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ getTimeBuckets(requestParameters: AssetApiGetTimeBucketsRequest, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getTimeBuckets(requestParameters.size, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.withPartners, requestParameters.key, options).then((request) => request(axios, basePath)); + 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)); }, /** * @@ -9183,7 +9183,7 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ searchAssets(requestParameters: AssetApiSearchAssetsRequest = {}, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.searchAssets(requestParameters.id, requestParameters.libraryId, requestParameters.type, requestParameters.order, requestParameters.deviceAssetId, requestParameters.deviceId, requestParameters.checksum, requestParameters.isArchived, requestParameters.isEncoded, requestParameters.isExternal, requestParameters.isFavorite, requestParameters.isMotion, requestParameters.isOffline, requestParameters.isReadOnly, requestParameters.isVisible, requestParameters.withDeleted, requestParameters.withStacked, requestParameters.withExif, requestParameters.withPeople, requestParameters.createdBefore, requestParameters.createdAfter, requestParameters.updatedBefore, requestParameters.updatedAfter, requestParameters.trashedBefore, requestParameters.trashedAfter, requestParameters.takenBefore, requestParameters.takenAfter, requestParameters.originalFileName, requestParameters.originalPath, requestParameters.resizePath, requestParameters.webpPath, requestParameters.encodedVideoPath, requestParameters.city, requestParameters.state, requestParameters.country, requestParameters.make, requestParameters.model, requestParameters.lensModel, requestParameters.page, requestParameters.size, options).then((request) => request(axios, basePath)); + return localVarFp.searchAssets(requestParameters.checksum, requestParameters.city, requestParameters.country, requestParameters.createdAfter, requestParameters.createdBefore, requestParameters.deviceAssetId, requestParameters.deviceId, requestParameters.encodedVideoPath, requestParameters.id, requestParameters.isArchived, requestParameters.isEncoded, requestParameters.isExternal, requestParameters.isFavorite, requestParameters.isMotion, requestParameters.isOffline, requestParameters.isReadOnly, requestParameters.isVisible, requestParameters.lensModel, requestParameters.libraryId, requestParameters.make, requestParameters.model, requestParameters.order, requestParameters.originalFileName, requestParameters.originalPath, requestParameters.page, requestParameters.resizePath, requestParameters.size, requestParameters.state, requestParameters.takenAfter, requestParameters.takenBefore, requestParameters.trashedAfter, requestParameters.trashedBefore, requestParameters.type, requestParameters.updatedAfter, requestParameters.updatedBefore, requestParameters.webpPath, requestParameters.withDeleted, requestParameters.withExif, requestParameters.withPeople, requestParameters.withStacked, options).then((request) => request(axios, basePath)); }, /** * @@ -9323,6 +9323,27 @@ export interface AssetApiDownloadFileRequest { * @interface AssetApiGetAllAssetsRequest */ export interface AssetApiGetAllAssetsRequest { + /** + * ETag of data already cached on the client + * @type {string} + * @memberof AssetApiGetAllAssets + */ + readonly ifNoneMatch?: string + + /** + * + * @type {boolean} + * @memberof AssetApiGetAllAssets + */ + readonly isArchived?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiGetAllAssets + */ + readonly isFavorite?: boolean + /** * * @type {number} @@ -9337,27 +9358,6 @@ export interface AssetApiGetAllAssetsRequest { */ readonly take?: number - /** - * - * @type {string} - * @memberof AssetApiGetAllAssets - */ - readonly userId?: string - - /** - * - * @type {boolean} - * @memberof AssetApiGetAllAssets - */ - readonly isFavorite?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiGetAllAssets - */ - readonly isArchived?: boolean - /** * * @type {string} @@ -9373,11 +9373,11 @@ export interface AssetApiGetAllAssetsRequest { readonly updatedBefore?: string /** - * ETag of data already cached on the client + * * @type {string} * @memberof AssetApiGetAllAssets */ - readonly ifNoneMatch?: string + readonly userId?: string } /** @@ -9498,20 +9498,6 @@ export interface AssetApiGetDownloadInfoRequest { * @interface AssetApiGetMapMarkersRequest */ export interface AssetApiGetMapMarkersRequest { - /** - * - * @type {boolean} - * @memberof AssetApiGetMapMarkers - */ - readonly isArchived?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiGetMapMarkers - */ - readonly isFavorite?: boolean - /** * * @type {string} @@ -9525,6 +9511,20 @@ export interface AssetApiGetMapMarkersRequest { * @memberof AssetApiGetMapMarkers */ readonly fileCreatedBefore?: string + + /** + * + * @type {boolean} + * @memberof AssetApiGetMapMarkers + */ + readonly isArchived?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiGetMapMarkers + */ + readonly isFavorite?: boolean } /** @@ -9582,13 +9582,6 @@ export interface AssetApiGetTimeBucketRequest { */ readonly timeBucket: string - /** - * - * @type {string} - * @memberof AssetApiGetTimeBucket - */ - readonly userId?: string - /** * * @type {string} @@ -9596,13 +9589,6 @@ export interface AssetApiGetTimeBucketRequest { */ readonly albumId?: string - /** - * - * @type {string} - * @memberof AssetApiGetTimeBucket - */ - readonly personId?: string - /** * * @type {boolean} @@ -9626,10 +9612,24 @@ export interface AssetApiGetTimeBucketRequest { /** * - * @type {boolean} + * @type {string} * @memberof AssetApiGetTimeBucket */ - readonly withStacked?: boolean + readonly key?: string + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBucket + */ + readonly personId?: string + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBucket + */ + readonly userId?: string /** * @@ -9640,10 +9640,10 @@ export interface AssetApiGetTimeBucketRequest { /** * - * @type {string} + * @type {boolean} * @memberof AssetApiGetTimeBucket */ - readonly key?: string + readonly withStacked?: boolean } /** @@ -9659,13 +9659,6 @@ export interface AssetApiGetTimeBucketsRequest { */ readonly size: TimeBucketSize - /** - * - * @type {string} - * @memberof AssetApiGetTimeBuckets - */ - readonly userId?: string - /** * * @type {string} @@ -9673,13 +9666,6 @@ export interface AssetApiGetTimeBucketsRequest { */ readonly albumId?: string - /** - * - * @type {string} - * @memberof AssetApiGetTimeBuckets - */ - readonly personId?: string - /** * * @type {boolean} @@ -9703,10 +9689,24 @@ export interface AssetApiGetTimeBucketsRequest { /** * - * @type {boolean} + * @type {string} * @memberof AssetApiGetTimeBuckets */ - readonly withStacked?: boolean + readonly key?: string + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBuckets + */ + readonly personId?: string + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBuckets + */ + readonly userId?: string /** * @@ -9717,10 +9717,10 @@ export interface AssetApiGetTimeBucketsRequest { /** * - * @type {string} + * @type {boolean} * @memberof AssetApiGetTimeBuckets */ - readonly key?: string + readonly withStacked?: boolean } /** @@ -9776,28 +9776,35 @@ export interface AssetApiSearchAssetsRequest { * @type {string} * @memberof AssetApiSearchAssets */ - readonly id?: string + readonly checksum?: string /** * * @type {string} * @memberof AssetApiSearchAssets */ - readonly libraryId?: string + readonly city?: string /** * - * @type {AssetTypeEnum} + * @type {string} * @memberof AssetApiSearchAssets */ - readonly type?: AssetTypeEnum + readonly country?: string /** * - * @type {AssetOrder} + * @type {string} * @memberof AssetApiSearchAssets */ - readonly order?: AssetOrder + readonly createdAfter?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly createdBefore?: string /** * @@ -9818,7 +9825,14 @@ export interface AssetApiSearchAssetsRequest { * @type {string} * @memberof AssetApiSearchAssets */ - readonly checksum?: string + readonly encodedVideoPath?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly id?: string /** * @@ -9878,143 +9892,17 @@ export interface AssetApiSearchAssetsRequest { /** * - * @type {boolean} + * @type {string} * @memberof AssetApiSearchAssets */ - readonly withDeleted?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiSearchAssets - */ - readonly withStacked?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiSearchAssets - */ - readonly withExif?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiSearchAssets - */ - readonly withPeople?: boolean + readonly lensModel?: string /** * * @type {string} * @memberof AssetApiSearchAssets */ - readonly createdBefore?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly createdAfter?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly updatedBefore?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly updatedAfter?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly trashedBefore?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly trashedAfter?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly takenBefore?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly takenAfter?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly originalFileName?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly originalPath?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly resizePath?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly webpPath?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly encodedVideoPath?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly city?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly state?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly country?: string + readonly libraryId?: string /** * @@ -10030,12 +9918,26 @@ export interface AssetApiSearchAssetsRequest { */ readonly model?: string + /** + * + * @type {AssetOrder} + * @memberof AssetApiSearchAssets + */ + readonly order?: AssetOrder + /** * * @type {string} * @memberof AssetApiSearchAssets */ - readonly lensModel?: string + readonly originalFileName?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly originalPath?: string /** * @@ -10044,12 +9946,110 @@ export interface AssetApiSearchAssetsRequest { */ readonly page?: number + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly resizePath?: string + /** * * @type {number} * @memberof AssetApiSearchAssets */ readonly size?: number + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly state?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly takenAfter?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly takenBefore?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly trashedAfter?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly trashedBefore?: string + + /** + * + * @type {AssetTypeEnum} + * @memberof AssetApiSearchAssets + */ + readonly type?: AssetTypeEnum + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly updatedAfter?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly updatedBefore?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly webpPath?: string + + /** + * + * @type {boolean} + * @memberof AssetApiSearchAssets + */ + readonly withDeleted?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiSearchAssets + */ + readonly withExif?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiSearchAssets + */ + readonly withPeople?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiSearchAssets + */ + readonly withStacked?: boolean } /** @@ -10335,7 +10335,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ public getAllAssets(requestParameters: AssetApiGetAllAssetsRequest = {}, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getAllAssets(requestParameters.skip, requestParameters.take, requestParameters.userId, requestParameters.isFavorite, requestParameters.isArchived, requestParameters.updatedAfter, requestParameters.updatedBefore, requestParameters.ifNoneMatch, options).then((request) => request(this.axios, this.basePath)); + return AssetApiFp(this.configuration).getAllAssets(requestParameters.ifNoneMatch, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.skip, requestParameters.take, requestParameters.updatedAfter, requestParameters.updatedBefore, requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); } /** @@ -10431,7 +10431,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ public getMapMarkers(requestParameters: AssetApiGetMapMarkersRequest = {}, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getMapMarkers(requestParameters.isArchived, requestParameters.isFavorite, requestParameters.fileCreatedAfter, requestParameters.fileCreatedBefore, options).then((request) => request(this.axios, this.basePath)); + return AssetApiFp(this.configuration).getMapMarkers(requestParameters.fileCreatedAfter, requestParameters.fileCreatedBefore, requestParameters.isArchived, requestParameters.isFavorite, options).then((request) => request(this.axios, this.basePath)); } /** @@ -10464,7 +10464,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ public getTimeBucket(requestParameters: AssetApiGetTimeBucketRequest, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.withPartners, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); + return AssetApiFp(this.configuration).getTimeBucket(requestParameters.size, requestParameters.timeBucket, 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)); } /** @@ -10475,7 +10475,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ public getTimeBuckets(requestParameters: AssetApiGetTimeBucketsRequest, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getTimeBuckets(requestParameters.size, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.withPartners, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); + 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)); } /** @@ -10531,7 +10531,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ public searchAssets(requestParameters: AssetApiSearchAssetsRequest = {}, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).searchAssets(requestParameters.id, requestParameters.libraryId, requestParameters.type, requestParameters.order, requestParameters.deviceAssetId, requestParameters.deviceId, requestParameters.checksum, requestParameters.isArchived, requestParameters.isEncoded, requestParameters.isExternal, requestParameters.isFavorite, requestParameters.isMotion, requestParameters.isOffline, requestParameters.isReadOnly, requestParameters.isVisible, requestParameters.withDeleted, requestParameters.withStacked, requestParameters.withExif, requestParameters.withPeople, requestParameters.createdBefore, requestParameters.createdAfter, requestParameters.updatedBefore, requestParameters.updatedAfter, requestParameters.trashedBefore, requestParameters.trashedAfter, requestParameters.takenBefore, requestParameters.takenAfter, requestParameters.originalFileName, requestParameters.originalPath, requestParameters.resizePath, requestParameters.webpPath, requestParameters.encodedVideoPath, requestParameters.city, requestParameters.state, requestParameters.country, requestParameters.make, requestParameters.model, requestParameters.lensModel, requestParameters.page, requestParameters.size, options).then((request) => request(this.axios, this.basePath)); + return AssetApiFp(this.configuration).searchAssets(requestParameters.checksum, requestParameters.city, requestParameters.country, requestParameters.createdAfter, requestParameters.createdBefore, requestParameters.deviceAssetId, requestParameters.deviceId, requestParameters.encodedVideoPath, requestParameters.id, requestParameters.isArchived, requestParameters.isEncoded, requestParameters.isExternal, requestParameters.isFavorite, requestParameters.isMotion, requestParameters.isOffline, requestParameters.isReadOnly, requestParameters.isVisible, requestParameters.lensModel, requestParameters.libraryId, requestParameters.make, requestParameters.model, requestParameters.order, requestParameters.originalFileName, requestParameters.originalPath, requestParameters.page, requestParameters.resizePath, requestParameters.size, requestParameters.state, requestParameters.takenAfter, requestParameters.takenBefore, requestParameters.trashedAfter, requestParameters.trashedBefore, requestParameters.type, requestParameters.updatedAfter, requestParameters.updatedBefore, requestParameters.webpPath, requestParameters.withDeleted, requestParameters.withExif, requestParameters.withPeople, requestParameters.withStacked, options).then((request) => request(this.axios, this.basePath)); } /** @@ -10643,17 +10643,17 @@ export const AuditApiAxiosParamCreator = function (configuration?: Configuration }, /** * - * @param {EntityType} entityType * @param {string} after + * @param {EntityType} entityType * @param {string} [userId] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAuditDeletes: async (entityType: EntityType, after: string, userId?: string, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'entityType' is not null or undefined - assertParamExists('getAuditDeletes', 'entityType', entityType) + getAuditDeletes: async (after: string, entityType: EntityType, userId?: string, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'after' is not null or undefined assertParamExists('getAuditDeletes', 'after', after) + // verify required parameter 'entityType' is not null or undefined + assertParamExists('getAuditDeletes', 'entityType', entityType) const localVarPath = `/audit/deletes`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -10675,6 +10675,12 @@ export const AuditApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) + if (after !== undefined) { + localVarQueryParameter['after'] = (after as any instanceof Date) ? + (after as any).toISOString() : + after; + } + if (entityType !== undefined) { localVarQueryParameter['entityType'] = entityType; } @@ -10683,12 +10689,6 @@ export const AuditApiAxiosParamCreator = function (configuration?: Configuration localVarQueryParameter['userId'] = userId; } - if (after !== undefined) { - localVarQueryParameter['after'] = (after as any instanceof Date) ? - (after as any).toISOString() : - after; - } - setSearchParams(localVarUrlObj, localVarQueryParameter); @@ -10804,14 +10804,14 @@ export const AuditApiFp = function(configuration?: Configuration) { }, /** * - * @param {EntityType} entityType * @param {string} after + * @param {EntityType} entityType * @param {string} [userId] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getAuditDeletes(entityType: EntityType, after: string, userId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAuditDeletes(entityType, after, userId, options); + async getAuditDeletes(after: string, entityType: EntityType, userId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getAuditDeletes(after, entityType, userId, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -10859,7 +10859,7 @@ export const AuditApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ getAuditDeletes(requestParameters: AuditApiGetAuditDeletesRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getAuditDeletes(requestParameters.entityType, requestParameters.after, requestParameters.userId, options).then((request) => request(axios, basePath)); + return localVarFp.getAuditDeletes(requestParameters.after, requestParameters.entityType, requestParameters.userId, options).then((request) => request(axios, basePath)); }, /** * @@ -10901,13 +10901,6 @@ export interface AuditApiFixAuditFilesRequest { * @interface AuditApiGetAuditDeletesRequest */ export interface AuditApiGetAuditDeletesRequest { - /** - * - * @type {EntityType} - * @memberof AuditApiGetAuditDeletes - */ - readonly entityType: EntityType - /** * * @type {string} @@ -10915,6 +10908,13 @@ export interface AuditApiGetAuditDeletesRequest { */ readonly after: string + /** + * + * @type {EntityType} + * @memberof AuditApiGetAuditDeletes + */ + readonly entityType: EntityType + /** * * @type {string} @@ -10963,7 +10963,7 @@ export class AuditApi extends BaseAPI { * @memberof AuditApi */ public getAuditDeletes(requestParameters: AuditApiGetAuditDeletesRequest, options?: AxiosRequestConfig) { - return AuditApiFp(this.configuration).getAuditDeletes(requestParameters.entityType, requestParameters.after, requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); + return AuditApiFp(this.configuration).getAuditDeletes(requestParameters.after, requestParameters.entityType, requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); } /** @@ -14639,17 +14639,17 @@ export const SearchApiAxiosParamCreator = function (configuration?: Configuratio }, /** * + * @param {boolean} [clip] + * @param {boolean} [motion] * @param {string} [q] * @param {string} [query] - * @param {boolean} [clip] - * @param {'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER'} [type] * @param {boolean} [recent] - * @param {boolean} [motion] + * @param {'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER'} [type] * @param {boolean} [withArchived] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - search: async (q?: string, query?: string, clip?: boolean, type?: 'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER', recent?: boolean, motion?: boolean, withArchived?: boolean, options: AxiosRequestConfig = {}): Promise => { + search: async (clip?: boolean, motion?: boolean, q?: string, query?: string, recent?: boolean, type?: 'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER', withArchived?: boolean, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/search`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -14671,6 +14671,14 @@ export const SearchApiAxiosParamCreator = function (configuration?: Configuratio // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) + if (clip !== undefined) { + localVarQueryParameter['clip'] = clip; + } + + if (motion !== undefined) { + localVarQueryParameter['motion'] = motion; + } + if (q !== undefined) { localVarQueryParameter['q'] = q; } @@ -14679,20 +14687,12 @@ export const SearchApiAxiosParamCreator = function (configuration?: Configuratio localVarQueryParameter['query'] = query; } - if (clip !== undefined) { - localVarQueryParameter['clip'] = clip; - } - - if (type !== undefined) { - localVarQueryParameter['type'] = type; - } - if (recent !== undefined) { localVarQueryParameter['recent'] = recent; } - if (motion !== undefined) { - localVarQueryParameter['motion'] = motion; + if (type !== undefined) { + localVarQueryParameter['type'] = type; } if (withArchived !== undefined) { @@ -14781,18 +14781,18 @@ export const SearchApiFp = function(configuration?: Configuration) { }, /** * + * @param {boolean} [clip] + * @param {boolean} [motion] * @param {string} [q] * @param {string} [query] - * @param {boolean} [clip] - * @param {'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER'} [type] * @param {boolean} [recent] - * @param {boolean} [motion] + * @param {'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER'} [type] * @param {boolean} [withArchived] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async search(q?: string, query?: string, clip?: boolean, type?: 'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER', recent?: boolean, motion?: boolean, withArchived?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.search(q, query, clip, type, recent, motion, withArchived, options); + async search(clip?: boolean, motion?: boolean, q?: string, query?: string, recent?: boolean, type?: 'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER', withArchived?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.search(clip, motion, q, query, recent, type, withArchived, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -14831,7 +14831,7 @@ export const SearchApiFactory = function (configuration?: Configuration, basePat * @throws {RequiredError} */ search(requestParameters: SearchApiSearchRequest = {}, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.search(requestParameters.q, requestParameters.query, requestParameters.clip, requestParameters.type, requestParameters.recent, requestParameters.motion, requestParameters.withArchived, options).then((request) => request(axios, basePath)); + return localVarFp.search(requestParameters.clip, requestParameters.motion, requestParameters.q, requestParameters.query, requestParameters.recent, requestParameters.type, requestParameters.withArchived, options).then((request) => request(axios, basePath)); }, /** * @@ -14851,6 +14851,20 @@ export const SearchApiFactory = function (configuration?: Configuration, basePat * @interface SearchApiSearchRequest */ export interface SearchApiSearchRequest { + /** + * + * @type {boolean} + * @memberof SearchApiSearch + */ + readonly clip?: boolean + + /** + * + * @type {boolean} + * @memberof SearchApiSearch + */ + readonly motion?: boolean + /** * * @type {string} @@ -14870,7 +14884,7 @@ export interface SearchApiSearchRequest { * @type {boolean} * @memberof SearchApiSearch */ - readonly clip?: boolean + readonly recent?: boolean /** * @@ -14879,20 +14893,6 @@ export interface SearchApiSearchRequest { */ readonly type?: 'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER' - /** - * - * @type {boolean} - * @memberof SearchApiSearch - */ - readonly recent?: boolean - - /** - * - * @type {boolean} - * @memberof SearchApiSearch - */ - readonly motion?: boolean - /** * * @type {boolean} @@ -14947,7 +14947,7 @@ export class SearchApi extends BaseAPI { * @memberof SearchApi */ public search(requestParameters: SearchApiSearchRequest = {}, options?: AxiosRequestConfig) { - return SearchApiFp(this.configuration).search(requestParameters.q, requestParameters.query, requestParameters.clip, requestParameters.type, requestParameters.recent, requestParameters.motion, requestParameters.withArchived, options).then((request) => request(this.axios, this.basePath)); + return SearchApiFp(this.configuration).search(requestParameters.clip, requestParameters.motion, requestParameters.q, requestParameters.query, requestParameters.recent, requestParameters.type, requestParameters.withArchived, options).then((request) => request(this.axios, this.basePath)); } /** @@ -15675,13 +15675,13 @@ export const SharedLinkApiAxiosParamCreator = function (configuration?: Configur }, /** * + * @param {string} [key] * @param {string} [password] * @param {string} [token] - * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getMySharedLink: async (password?: string, token?: string, key?: string, options: AxiosRequestConfig = {}): Promise => { + getMySharedLink: async (key?: string, password?: string, token?: string, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/shared-link/me`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -15703,6 +15703,10 @@ export const SharedLinkApiAxiosParamCreator = function (configuration?: Configur // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) + if (key !== undefined) { + localVarQueryParameter['key'] = key; + } + if (password !== undefined) { localVarQueryParameter['password'] = password; } @@ -15711,10 +15715,6 @@ export const SharedLinkApiAxiosParamCreator = function (configuration?: Configur localVarQueryParameter['token'] = token; } - if (key !== undefined) { - localVarQueryParameter['key'] = key; - } - setSearchParams(localVarUrlObj, localVarQueryParameter); @@ -15954,14 +15954,14 @@ export const SharedLinkApiFp = function(configuration?: Configuration) { }, /** * + * @param {string} [key] * @param {string} [password] * @param {string} [token] - * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getMySharedLink(password?: string, token?: string, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getMySharedLink(password, token, key, options); + async getMySharedLink(key?: string, password?: string, token?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getMySharedLink(key, password, token, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -16050,7 +16050,7 @@ export const SharedLinkApiFactory = function (configuration?: Configuration, bas * @throws {RequiredError} */ getMySharedLink(requestParameters: SharedLinkApiGetMySharedLinkRequest = {}, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getMySharedLink(requestParameters.password, requestParameters.token, requestParameters.key, options).then((request) => request(axios, basePath)); + return localVarFp.getMySharedLink(requestParameters.key, requestParameters.password, requestParameters.token, options).then((request) => request(axios, basePath)); }, /** * @@ -16139,6 +16139,13 @@ export interface SharedLinkApiCreateSharedLinkRequest { * @interface SharedLinkApiGetMySharedLinkRequest */ export interface SharedLinkApiGetMySharedLinkRequest { + /** + * + * @type {string} + * @memberof SharedLinkApiGetMySharedLink + */ + readonly key?: string + /** * * @type {string} @@ -16152,13 +16159,6 @@ export interface SharedLinkApiGetMySharedLinkRequest { * @memberof SharedLinkApiGetMySharedLink */ readonly token?: string - - /** - * - * @type {string} - * @memberof SharedLinkApiGetMySharedLink - */ - readonly key?: string } /** @@ -16285,7 +16285,7 @@ export class SharedLinkApi extends BaseAPI { * @memberof SharedLinkApi */ public getMySharedLink(requestParameters: SharedLinkApiGetMySharedLinkRequest = {}, options?: AxiosRequestConfig) { - return SharedLinkApiFp(this.configuration).getMySharedLink(requestParameters.password, requestParameters.token, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); + return SharedLinkApiFp(this.configuration).getMySharedLink(requestParameters.key, requestParameters.password, requestParameters.token, options).then((request) => request(this.axios, this.basePath)); } /** diff --git a/server/src/immich/app.utils.ts b/server/src/immich/app.utils.ts index 4eeba8cc4f..0dd984a02d 100644 --- a/server/src/immich/app.utils.ts +++ b/server/src/immich/app.utils.ts @@ -20,10 +20,12 @@ import { import { NextFunction, Response } from 'express'; import { writeFileSync } from 'fs'; import { access, constants } from 'fs/promises'; +import _ from 'lodash'; import path, { isAbsolute } from 'path'; import { promisify } from 'util'; import { applyDecorators, UsePipes, ValidationPipe } from '@nestjs/common'; +import { SchemaObject } from '@nestjs/swagger/dist/interfaces/open-api-spec.interface'; import { Metadata } from './app.guard'; export function UseValidation() { @@ -110,8 +112,21 @@ export const routeToErrorMessage = (methodName: string) => const patchOpenAPI = (document: OpenAPIObject) => { document.paths = sortKeys(document.paths); + if (document.components?.schemas) { - document.components.schemas = sortKeys(document.components.schemas); + const schemas = document.components.schemas as Record; + + document.components.schemas = sortKeys(schemas); + + for (const schema of Object.values(schemas)) { + if (schema.properties) { + schema.properties = sortKeys(schema.properties); + } + + if (schema.required) { + schema.required = schema.required.sort(); + } + } } for (const [key, value] of Object.entries(document.paths)) { @@ -152,6 +167,10 @@ const patchOpenAPI = (document: OpenAPIObject) => { if (operation.description === '') { delete operation.description; } + + if (operation.parameters) { + operation.parameters = _.orderBy(operation.parameters, 'name'); + } } }