diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..261eeb9e --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/src/BE/Chats.BE.csproj b/src/BE/Chats.BE.csproj index ea27d80b..f9771798 100644 --- a/src/BE/Chats.BE.csproj +++ b/src/BE/Chats.BE.csproj @@ -11,7 +11,8 @@ - + + all diff --git a/src/BE/Controllers/Admin/ModelKeys/Dtos/PossibleModelDto.cs b/src/BE/Controllers/Admin/ModelKeys/Dtos/PossibleModelDto.cs index 9fe97ea1..4413ad59 100644 --- a/src/BE/Controllers/Admin/ModelKeys/Dtos/PossibleModelDto.cs +++ b/src/BE/Controllers/Admin/ModelKeys/Dtos/PossibleModelDto.cs @@ -13,6 +13,9 @@ public record PossibleModelDto [JsonPropertyName("isExists")] public required bool IsExists { get; init; } + [JsonPropertyName("deploymentName")] + public required string? DeploymentName { get; init; } + [JsonPropertyName("isLegacy")] public required bool IsLegacy { get; init; } } diff --git a/src/BE/Controllers/Admin/ModelKeys/ModelKeysController.cs b/src/BE/Controllers/Admin/ModelKeys/ModelKeysController.cs index 2b2ab0b8..7671d926 100644 --- a/src/BE/Controllers/Admin/ModelKeys/ModelKeysController.cs +++ b/src/BE/Controllers/Admin/ModelKeys/ModelKeysController.cs @@ -195,20 +195,19 @@ public async Task> ListModelKeyPossibleModels(s return NotFound(); } - HashSet existingModelRefIds = modelKey.Models - .Select(x => x.ModelReferenceId) - .ToHashSet(); - PossibleModelDto[] readyRefs = await db.ModelReferences .Where(x => x.ProviderId == modelKey.ModelProviderId) .OrderBy(x => x.Name) .Select(x => new PossibleModelDto() { - IsExists = x.Models.Any(m => m.ModelKeyId == modelKeyId), + DeploymentName = x.Models.FirstOrDefault(m => m.ModelKeyId == modelKeyId)!.DeploymentName, ReferenceId = x.Id, ReferenceName = x.Name, IsLegacy = x.IsLegacy, + IsExists = x.Models.Any(m => m.ModelKeyId == modelKeyId), }) + .OrderBy(x => (x.IsLegacy ? 1 : 0) + (x.IsExists ? 2 : 0)) + .ThenByDescending(x => x.ReferenceId) .ToArrayAsync(cancellationToken); return Ok(readyRefs); diff --git a/src/BE/DB/Init/BasicData.cs b/src/BE/DB/Init/BasicData.cs index f7de55cb..3b5763f7 100644 --- a/src/BE/DB/Init/BasicData.cs +++ b/src/BE/DB/Init/BasicData.cs @@ -20,30 +20,31 @@ public static void InsertAll(ChatsDB db) private static void InsertFileContentTypes(ChatsDB db) { - // Generated from data, hash: 00da6e3e68293772044e11ac14d834ed6b065e0b3d4df85afbb29a4811ea3a56 + // Generated from data, hash: 6a885ff7888729f8a2c3e3928fd9bc5c1785bc3d8567efd842ff182902eab893 db.FileContentTypes.AddRange( [ - new(){ Id=1, ContentType="image/jpeg", }, - new(){ Id=2, ContentType="image/png", }, - new(){ Id=3, ContentType="image/gif", }, - new(){ Id=4, ContentType="image/bmp", }, - new(){ Id=5, ContentType="image/svg+xml", }, - new(){ Id=6, ContentType="image/webp", }, - new(){ Id=7, ContentType="image/tiff", }, - new(){ Id=8, ContentType="image/heic", } + new(){ Id=1, ContentType="image/jpeg", }, + new(){ Id=2, ContentType="image/png", }, + new(){ Id=3, ContentType="image/gif", }, + new(){ Id=4, ContentType="image/bmp", }, + new(){ Id=5, ContentType="image/svg+xml", }, + new(){ Id=6, ContentType="image/webp", }, + new(){ Id=7, ContentType="image/tiff", }, + new(){ Id=8, ContentType="image/heic", }, + new(){ Id=9, ContentType="application/pdf", } ]); } private static void InsertFileServiceTypes(ChatsDB db) { - // Generated from data, hash: 9187cf7c6622d5341c31b350377cb545d1fef17d3ecd43401bad0be964e8b043 + // Generated from data, hash: 639406aab3eda8539e3adcc6be70809c19a4e7e557a309c7d4fcaadb0281a486 db.FileServiceTypes.AddRange( [ - new(){ Id=0, Name="Local", InitialConfig="./AppData/Files", }, - new(){ Id=1, Name="Minio", InitialConfig="""{"endpoint": "https://minio.example.com", "accessKey": "your-access-key", "secretKey": "your-secret-key", "bucket": "your-bucket", "region": null}""", }, - new(){ Id=2, Name="AWS S3", InitialConfig="""{"region": "ap-southeast-1", "accessKeyId": "your-access-key-id", "secretAccessKey": "your-secret-access-key", "bucket": "your-bucket"}""", }, - new(){ Id=3, Name="Aliyun OSS", InitialConfig="""{"endpoint": "oss-cn-hangzhou.aliyuncs.com", "accessKeyId": "your-access-key-id", "accessKeySecret": "your-access-key-secret", "bucket": "your-bucket"}""", }, - new(){ Id=4, Name="Azure Blob Storage", InitialConfig="DefaultEndpointsProtocol=https;AccountName=your-account-name;AccountKey=your-account-key;EndpointSuffix=core.windows.net", } + new(){ Id=0, Name="Local", InitialConfig="./AppData/Files", }, + new(){ Id=1, Name="Minio", InitialConfig="""{"endpoint": "https://minio.example.com", "accessKey": "your-access-key", "secretKey": "your-secret-key", "bucket": "your-bucket", "region": null}""", }, + new(){ Id=2, Name="AWS S3", InitialConfig="""{"region": "ap-southeast-1", "accessKeyId": "your-access-key-id", "secretAccessKey": "your-secret-access-key", "bucket": "your-bucket"}""", }, + new(){ Id=3, Name="Aliyun OSS", InitialConfig="""{"endpoint": "oss-cn-hangzhou.aliyuncs.com", "accessKeyId": "your-access-key-id", "accessKeySecret": "your-access-key-secret", "bucket": "your-bucket"}""", }, + new(){ Id=4, Name="Azure Blob Storage", InitialConfig="""{"connectionString": "DefaultEndpointsProtocol=https;AccountName=your-account-name;AccountKey=your-account-key;EndpointSuffix=core.windows.net", "containerName": "YourContainerName"}""", } ]); } diff --git a/src/BE/Services/FileServices/FileServiceFactory.cs b/src/BE/Services/FileServices/FileServiceFactory.cs index e35474a2..a710f20d 100644 --- a/src/BE/Services/FileServices/FileServiceFactory.cs +++ b/src/BE/Services/FileServices/FileServiceFactory.cs @@ -34,7 +34,7 @@ private IFileService CreateNoCache(DBFileServiceType fileServiceType, string con DBFileServiceType.Minio => new MinioFileService(JsonSerializer.Deserialize(config)!), DBFileServiceType.AwsS3 => new AwsS3FileService(JsonSerializer.Deserialize(config)!), DBFileServiceType.AliyunOSS => new AliyunOSSFileService(JsonSerializer.Deserialize(config)!), - DBFileServiceType.AzureBlobStorage => new AzureBlobStorageFileService(config), + DBFileServiceType.AzureBlobStorage => new AzureBlobStorageFileService(JsonSerializer.Deserialize(config)!), _ => throw new ArgumentException($"Unsupported file service type: {fileServiceType}") }; } diff --git a/src/BE/Services/FileServices/FileUploadRequest.cs b/src/BE/Services/FileServices/FileUploadRequest.cs index 20e23a5b..59b8ff62 100644 --- a/src/BE/Services/FileServices/FileUploadRequest.cs +++ b/src/BE/Services/FileServices/FileUploadRequest.cs @@ -34,7 +34,7 @@ public record CreateDownloadUrlRequest public required int FileId { get; init; } public required string StorageKey { get; init; } public TimeSpan ValidPeriod { get; init; } = TimeSpan.FromHours(2); - public DateTime ValidEnd => DateTime.UtcNow + ValidPeriod; + public DateTimeOffset ValidEnd => DateTimeOffset.UtcNow + ValidPeriod; public static CreateDownloadUrlRequest FromFile(DB.File file) { diff --git a/src/BE/Services/FileServices/Implementations/AliyunOSS/AliyunOSSFileService.cs b/src/BE/Services/FileServices/Implementations/AliyunOSS/AliyunOSSFileService.cs index 81e090cd..6cc0e5f1 100644 --- a/src/BE/Services/FileServices/Implementations/AliyunOSS/AliyunOSSFileService.cs +++ b/src/BE/Services/FileServices/Implementations/AliyunOSS/AliyunOSSFileService.cs @@ -8,7 +8,7 @@ public class AliyunOSSFileService(AliyunOssConfig config) : IFileService public Uri CreateDownloadUrl(CreateDownloadUrlRequest req) { - return _oss.GeneratePresignedUri(config.Bucket, req.StorageKey, req.ValidEnd, SignHttpMethod.Get); + return _oss.GeneratePresignedUri(config.Bucket, req.StorageKey, req.ValidEnd.UtcDateTime, SignHttpMethod.Get); } public Task Download(string storageKey, CancellationToken cancellationToken) diff --git a/src/BE/Services/FileServices/Implementations/AwsS3/AwsS3Config.cs b/src/BE/Services/FileServices/Implementations/AwsS3/AwsS3Config.cs index 790aaa48..0f504c55 100644 --- a/src/BE/Services/FileServices/Implementations/AwsS3/AwsS3Config.cs +++ b/src/BE/Services/FileServices/Implementations/AwsS3/AwsS3Config.cs @@ -1,8 +1,10 @@ -using System.Text.Json.Serialization; +using Amazon; +using Amazon.S3; +using System.Text.Json.Serialization; namespace Chats.BE.Services.FileServices.Implementations.AwsS3; -public record AwsS3Config : IHaveBucket +public record AwsS3Config { [JsonPropertyName("region")] public string? Region { get; init; } @@ -13,11 +15,35 @@ public record AwsS3Config : IHaveBucket [JsonPropertyName("secretAccessKey")] public string? SecretAccessKey { get; init; } + [JsonPropertyName("sessionToken")] + public string? SessionToken { get; init; } + [JsonPropertyName("bucket")] public required string Bucket { get; init; } -} -public interface IHaveBucket -{ - string Bucket { get; } + public AmazonS3Client CreateS3() + { + if (SecretAccessKey != null) + { + if (SessionToken != null) + { + // for developers temporary credentials + return new(AccessKeyId, SecretAccessKey, SessionToken, new AmazonS3Config + { + RegionEndpoint = RegionEndpoint.GetBySystemName(Region) + }); + } + else + { + // for server permanent credentials + return new(AccessKeyId, SecretAccessKey, new AmazonS3Config + { + RegionEndpoint = RegionEndpoint.GetBySystemName(Region) + }); + } + } + + // if it's null, then auto load from default environment profile + return new(); + } } \ No newline at end of file diff --git a/src/BE/Services/FileServices/Implementations/AwsS3/AwsS3FileService.cs b/src/BE/Services/FileServices/Implementations/AwsS3/AwsS3FileService.cs index ab700c18..47f2fc63 100644 --- a/src/BE/Services/FileServices/Implementations/AwsS3/AwsS3FileService.cs +++ b/src/BE/Services/FileServices/Implementations/AwsS3/AwsS3FileService.cs @@ -1,34 +1,22 @@ -using Amazon; -using Amazon.S3; +using Amazon.S3; using Amazon.S3.Model; namespace Chats.BE.Services.FileServices.Implementations.AwsS3; public class AwsS3FileService : IFileService { - private readonly IHaveBucket _config; + private readonly string _bucketName; private readonly AmazonS3Client _s3; public AwsS3FileService(AwsS3Config config) { - _config = config; - if (config.AccessKeyId == null) - { - // auto load from default environment profile - _s3 = new(); - } - else - { - _s3 = new(config.AccessKeyId, config.SecretAccessKey, new AmazonS3Config - { - RegionEndpoint = RegionEndpoint.GetBySystemName(config.Region) - }); - } + _bucketName = config.Bucket; + _s3 = config.CreateS3(); } - public AwsS3FileService(IHaveBucket config, AmazonS3Client s3) + public AwsS3FileService(string bucketName, AmazonS3Client s3) { - _config = config; + _bucketName = bucketName; _s3 = s3; } @@ -36,9 +24,9 @@ public Uri CreateDownloadUrl(CreateDownloadUrlRequest req) { string url = _s3.GetPreSignedURL(new GetPreSignedUrlRequest { - BucketName = _config.Bucket, + BucketName = _bucketName, Key = req.StorageKey, - Expires = req.ValidEnd, + Expires = req.ValidEnd.UtcDateTime, Verb = HttpVerb.GET }); return new Uri(url); @@ -48,7 +36,7 @@ public async Task Download(string storageKey, CancellationToken cancella { GetObjectResponse resp = await _s3.GetObjectAsync(new GetObjectRequest { - BucketName = _config.Bucket, + BucketName = _bucketName, Key = storageKey }, cancellationToken); return resp.ResponseStream; @@ -59,7 +47,7 @@ public async Task Upload(FileUploadRequest request, CancellationToken ca SuggestedStorageInfo ssi = SuggestedStorageInfo.FromFileName(request.FileName); _ = await _s3.PutObjectAsync(new PutObjectRequest() { - BucketName = _config.Bucket, + BucketName = _bucketName, Key = ssi.StorageKey, InputStream = request.Stream, ContentType = request.ContentType diff --git a/src/BE/Services/FileServices/Implementations/AzureBlobStorage/AzureBlobStorageConfig.cs b/src/BE/Services/FileServices/Implementations/AzureBlobStorage/AzureBlobStorageConfig.cs new file mode 100644 index 00000000..d5cb7447 --- /dev/null +++ b/src/BE/Services/FileServices/Implementations/AzureBlobStorage/AzureBlobStorageConfig.cs @@ -0,0 +1,12 @@ +using System.Text.Json.Serialization; + +namespace Chats.BE.Services.FileServices.Implementations.AzureBlobStorage; + +public record AzureBlobStorageConfig +{ + [JsonPropertyName("connectionString")] + public required string ConnectionString { get; init; } + + [JsonPropertyName("containerName")] + public required string ContainerName { get; init; } +} diff --git a/src/BE/Services/FileServices/Implementations/AzureBlobStorage/AzureBlobStorageFileService.cs b/src/BE/Services/FileServices/Implementations/AzureBlobStorage/AzureBlobStorageFileService.cs index e3c567cd..43abb9ac 100644 --- a/src/BE/Services/FileServices/Implementations/AzureBlobStorage/AzureBlobStorageFileService.cs +++ b/src/BE/Services/FileServices/Implementations/AzureBlobStorage/AzureBlobStorageFileService.cs @@ -1,21 +1,33 @@ - +using Azure.Storage.Blobs; +using Azure.Storage.Blobs.Models; +using Azure.Storage.Sas; namespace Chats.BE.Services.FileServices.Implementations.AzureBlobStorage; -public class AzureBlobStorageFileService(string azureStorageConnectionString) : IFileService +public class AzureBlobStorageFileService(AzureBlobStorageConfig config) : IFileService { + private readonly BlobContainerClient _containerClient = new(config.ConnectionString, config.ContainerName); + public Uri CreateDownloadUrl(CreateDownloadUrlRequest req) { - throw new NotImplementedException(); + BlobClient blobClient = _containerClient.GetBlobClient(req.StorageKey); + return blobClient.GenerateSasUri(BlobSasPermissions.Read, req.ValidEnd); } public Task Download(string storageKey, CancellationToken cancellationToken) { - throw new NotImplementedException(); + BlobClient blobClient = _containerClient.GetBlobClient(storageKey); + return blobClient.OpenReadAsync(new BlobOpenReadOptions(allowModifications: false), cancellationToken); } - public Task Upload(FileUploadRequest request, CancellationToken cancellationToken) + public async Task Upload(FileUploadRequest request, CancellationToken cancellationToken) { - throw new NotImplementedException(); + SuggestedStorageInfo suggestedStorageInfo = SuggestedStorageInfo.FromFileName(request.FileName); + BlobClient blobClient = _containerClient.GetBlobClient(suggestedStorageInfo.StorageKey); + _ = await blobClient.UploadAsync(request.Stream, new BlobUploadOptions + { + HttpHeaders = new BlobHttpHeaders { ContentType = request.ContentType }, + }, cancellationToken); + return suggestedStorageInfo.StorageKey; } } diff --git a/src/BE/Services/FileServices/Implementations/Minio/MinioConfig.cs b/src/BE/Services/FileServices/Implementations/Minio/MinioConfig.cs index ac65fc9c..1ec1c2dc 100644 --- a/src/BE/Services/FileServices/Implementations/Minio/MinioConfig.cs +++ b/src/BE/Services/FileServices/Implementations/Minio/MinioConfig.cs @@ -1,9 +1,11 @@ -using Chats.BE.Services.FileServices.Implementations.AwsS3; +using Amazon; +using Amazon.S3; +using Chats.BE.Services.FileServices.Implementations.AwsS3; using System.Text.Json.Serialization; namespace Chats.BE.Services.FileServices.Implementations.Minio; -public record MinioConfig : IHaveBucket +public record MinioConfig { [JsonPropertyName("endpoint")] public required string Endpoint { get; init; } @@ -19,4 +21,19 @@ public record MinioConfig : IHaveBucket [JsonPropertyName("region")] public string? Region { get; init; } // Nullable for the default null value. + + public AmazonS3Client CreateS3() + { + AmazonS3Config s3Config = new() + { + ForcePathStyle = true, + ServiceURL = Endpoint, + }; + if (Region != null) + { + s3Config.RegionEndpoint = RegionEndpoint.GetBySystemName(Region); + } + AmazonS3Client s3 = new(AccessKey, SecretKey, s3Config); + return s3; + } } \ No newline at end of file diff --git a/src/BE/Services/FileServices/Implementations/Minio/MinioFileService.cs b/src/BE/Services/FileServices/Implementations/Minio/MinioFileService.cs index b1204151..d542e8bd 100644 --- a/src/BE/Services/FileServices/Implementations/Minio/MinioFileService.cs +++ b/src/BE/Services/FileServices/Implementations/Minio/MinioFileService.cs @@ -1,23 +1,7 @@ -using Amazon; -using Amazon.S3; -using Chats.BE.Services.FileServices.Implementations.AwsS3; +using Chats.BE.Services.FileServices.Implementations.AwsS3; namespace Chats.BE.Services.FileServices.Implementations.Minio; -public class MinioFileService(MinioConfig config) : AwsS3FileService(config, CreateS3(config)) +public class MinioFileService(MinioConfig config) : AwsS3FileService(config.Bucket, config.CreateS3()) { - private static AmazonS3Client CreateS3(MinioConfig config) - { - AmazonS3Config s3Config = new() - { - ForcePathStyle = true, - ServiceURL = config.Endpoint, - }; - if (config.Region != null) - { - s3Config.RegionEndpoint = RegionEndpoint.GetBySystemName(config.Region); - } - AmazonS3Client s3 = new(config.AccessKey, config.SecretKey, s3Config); - return s3; - } }