forked from MDCPS/DamageAssessment_Backend
merged azure and user access changes to docker azure branch
This commit is contained in:
@ -1,6 +1,7 @@
|
||||
using Azure;
|
||||
using DamageAssesment.Api.Attachments.Interfaces;
|
||||
using DamageAssesment.Api.Attachments.Models;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using System.Net.Http.Headers;
|
||||
@ -12,16 +13,17 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
||||
{
|
||||
private IAttachmentsProvider AttachmentProvider;
|
||||
private IUploadService UploadService;
|
||||
private IAzureBlobService azureBlobService;
|
||||
|
||||
public AttachmentsController(IAttachmentsProvider AttachmentsProvider, IUploadService uploadService)
|
||||
public AttachmentsController(IAttachmentsProvider AttachmentsProvider, IAzureBlobService azureBlobService)
|
||||
{
|
||||
this.AttachmentProvider = AttachmentsProvider;
|
||||
this.UploadService = uploadService;
|
||||
this.azureBlobService = azureBlobService;
|
||||
}
|
||||
/// <summary>
|
||||
/// Get all attachments.
|
||||
/// </summary>
|
||||
|
||||
[Authorize(Roles = "admin")]
|
||||
[HttpGet("attachments")]
|
||||
public async Task<ActionResult> GetAttachmentsAsync()
|
||||
{
|
||||
@ -37,6 +39,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
||||
/// <summary>
|
||||
/// Get all attachments by attachmentId.
|
||||
/// </summary>
|
||||
[Authorize(Roles = "admin")]
|
||||
[HttpGet("attachments/{id}")]
|
||||
public async Task<ActionResult> GetAttachmentbyIdAsync(int id)
|
||||
{
|
||||
@ -80,7 +83,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
||||
/// <summary>
|
||||
/// Save new Attachment(s)
|
||||
/// </summary>
|
||||
|
||||
[Authorize(Roles = "admin")]
|
||||
[HttpPost("attachments"), DisableRequestSizeLimit]
|
||||
public async Task<IActionResult> UploadAttachmentAsync(AttachmentInfo attachmentInfo)
|
||||
{
|
||||
@ -89,7 +92,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
||||
if (attachmentInfo.Answers.Count > 0)
|
||||
{
|
||||
var Attachments = await this.AttachmentProvider.GetAttachmentCounter();
|
||||
List<Models.Attachment> attachments = UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
|
||||
List<Models.Attachment> attachments = await azureBlobService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
|
||||
var result = await this.AttachmentProvider.PostAttachmentAsync(attachments);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
@ -107,7 +110,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
||||
/// <summary>
|
||||
/// Modify an new attachment.
|
||||
/// </summary>
|
||||
|
||||
[Authorize(Roles = "admin")]
|
||||
[HttpPut("attachments"), DisableRequestSizeLimit]
|
||||
public async Task<IActionResult> UpdateAttachmentAsync(AttachmentInfo attachmentInfo)
|
||||
{
|
||||
@ -118,7 +121,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
||||
var res = await this.AttachmentProvider.GetAttachmentInfo(attachmentInfo.Answers);
|
||||
if (res.IsSuccess)
|
||||
{
|
||||
List<Models.Attachment> attachments = UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
|
||||
List<Models.Attachment> attachments = await azureBlobService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
|
||||
var result = await this.AttachmentProvider.PutAttachmentAsync(attachments);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
@ -138,6 +141,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
||||
/// <summary>
|
||||
/// Delete an existing attachment.
|
||||
/// </summary>
|
||||
[Authorize(Roles = "admin")]
|
||||
[HttpDelete("attachments/{id}")]
|
||||
public async Task<IActionResult> DeleteAttachment(int id)
|
||||
{
|
||||
@ -146,7 +150,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
// deleting file from folder
|
||||
UploadService.Movefile(result.Attachment.URI);
|
||||
azureBlobService.Movefile(result.Attachment.URI);
|
||||
return Ok(result.Attachment);
|
||||
}
|
||||
return NotFound();
|
||||
|
@ -1,10 +1,15 @@
|
||||
using Azure.Storage.Blobs.Models;
|
||||
using DamageAssesment.Api.Attachments.Models;
|
||||
|
||||
namespace DamageAssesment.Api.Attachments.Interfaces
|
||||
{
|
||||
public interface IAzureBlobService
|
||||
{
|
||||
Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files);
|
||||
void DeleteFile(string path);
|
||||
Task<List<Attachment>> UploadAttachment(int responseId, int answerId, int counter, List<IFormFile> postedFile);
|
||||
Task<List<Attachment>> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
|
||||
Task<List<Attachment>> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
|
||||
void Deletefile(string path);
|
||||
void Movefile(string path);
|
||||
}
|
||||
}
|
||||
|
@ -1,25 +1,75 @@
|
||||
using DamageAssesment.Api.Attachments.Db;
|
||||
using DamageAssesment.Api.Attachments.Interfaces;
|
||||
using DamageAssesment.Api.Attachments.Providers;
|
||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||
using Microsoft.AspNetCore.Http.Features;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.FileProviders;
|
||||
using Microsoft.IdentityModel.Tokens;
|
||||
using Microsoft.OpenApi.Models;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
|
||||
builder.Services.AddAuthentication(item =>
|
||||
{
|
||||
item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
|
||||
item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
|
||||
}).AddJwtBearer(item =>
|
||||
{
|
||||
item.RequireHttpsMetadata = true;
|
||||
item.SaveToken = true;
|
||||
item.TokenValidationParameters = new TokenValidationParameters()
|
||||
{
|
||||
ValidateIssuerSigningKey = true,
|
||||
IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)),
|
||||
ValidateIssuer = false,
|
||||
ValidateAudience = false,
|
||||
ClockSkew = TimeSpan.Zero
|
||||
};
|
||||
});
|
||||
// Add services to the container.
|
||||
|
||||
builder.Services.AddControllers();
|
||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
//builder.Services.AddSwaggerGen();
|
||||
builder.Services.AddSwaggerGen(c =>
|
||||
builder.Services.AddSwaggerGen(options =>
|
||||
{
|
||||
// Include XML comments from your assembly
|
||||
var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
|
||||
var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
|
||||
c.IncludeXmlComments(xmlPath);
|
||||
options.IncludeXmlComments(xmlPath);
|
||||
|
||||
OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
|
||||
{
|
||||
Name = "Bearer",
|
||||
BearerFormat = "JWT",
|
||||
Scheme = "bearer",
|
||||
Description = "Specify the authorization token.",
|
||||
In = ParameterLocation.Header,
|
||||
Type = SecuritySchemeType.Http,
|
||||
};
|
||||
|
||||
options.AddSecurityDefinition("jwt_auth", securityDefinition);
|
||||
|
||||
// Make sure swagger UI requires a Bearer token specified
|
||||
OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
|
||||
{
|
||||
Reference = new OpenApiReference()
|
||||
{
|
||||
Id = "jwt_auth",
|
||||
Type = ReferenceType.SecurityScheme
|
||||
}
|
||||
};
|
||||
|
||||
OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
|
||||
{
|
||||
{securityScheme, new string[] { }},
|
||||
};
|
||||
|
||||
options.AddSecurityRequirement(securityRequirements);
|
||||
});
|
||||
builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
|
||||
builder.Services.AddScoped<IUploadService, UploadService>();
|
||||
@ -45,6 +95,7 @@ if (app.Environment.IsDevelopment())
|
||||
app.UseSwaggerUI();
|
||||
}
|
||||
|
||||
app.UseAuthentication();
|
||||
app.UseAuthorization();
|
||||
app.UseHttpsRedirection();
|
||||
|
||||
|
@ -3,6 +3,9 @@ using Azure.Storage.Blobs;
|
||||
using Azure.Storage.Blobs.Models;
|
||||
using Azure.Storage.Blobs.Specialized;
|
||||
using DamageAssesment.Api.Attachments.Interfaces;
|
||||
using DamageAssesment.Api.Attachments.Models;
|
||||
using System.Diagnostics.Metrics;
|
||||
using System.Text;
|
||||
|
||||
namespace DamageAssesment.Api.Attachments.Providers
|
||||
{
|
||||
@ -10,11 +13,95 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
{
|
||||
BlobServiceClient _blobClient;
|
||||
BlobContainerClient _containerClient;
|
||||
string azureConnectionString = "<Primary Connection String>";
|
||||
public AzureBlobService()
|
||||
string azureConnectionString;
|
||||
private string uploadpath = "";
|
||||
private string Deletepath = "";
|
||||
public AzureBlobService(IConfiguration configuration)
|
||||
{
|
||||
_blobClient = new BlobServiceClient(azureConnectionString);
|
||||
_containerClient = _blobClient.GetBlobContainerClient("apiimages");
|
||||
uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
|
||||
Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
|
||||
_blobClient = new BlobServiceClient(configuration.GetValue<string>("Fileupload:BlobConnectionString"));
|
||||
_containerClient = _blobClient.GetBlobContainerClient(configuration.GetValue<string>("Fileupload:BlobContainerName"));
|
||||
}
|
||||
public async Task<List<Attachment>> UploadAttachment(int responseId, int answerId, int counter, List<IFormFile> postedFile)
|
||||
{
|
||||
var pathToSave = Path.Combine(uploadpath, "Response-" + responseId);
|
||||
String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId);
|
||||
List<Models.Attachment> attachments = new List<Models.Attachment>();
|
||||
foreach (IFormFile item in postedFile)
|
||||
{
|
||||
|
||||
counter++;
|
||||
var UserfileName = Path.GetFileName(item.FileName);
|
||||
var extension = System.IO.Path.GetExtension(UserfileName);
|
||||
var fileName = String.Format("Attachment_{0}{1}", counter, extension);
|
||||
var stream = item.OpenReadStream();
|
||||
BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName);
|
||||
string dbPath = fullDirectoryPath + "/" + fileName;
|
||||
var result = await client.UploadAsync(stream, true);
|
||||
attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
|
||||
}
|
||||
return attachments;
|
||||
}
|
||||
public async Task<List<Attachment>> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers)
|
||||
{
|
||||
List<Models.Attachment> attachments = new List<Models.Attachment>();
|
||||
try
|
||||
{
|
||||
foreach (var item in answers)
|
||||
{
|
||||
int answerId = item.AnswerId;
|
||||
var pathToSave = Path.Combine(uploadpath, "Response-" + responseId);
|
||||
String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId);
|
||||
foreach (var file in item.postedFiles)
|
||||
{
|
||||
counter++;
|
||||
|
||||
var UserfileName = Path.GetFileName(file.FileName);
|
||||
var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension);
|
||||
byte[] byteArray = Convert.FromBase64String(file.FileContent);
|
||||
MemoryStream stream = new MemoryStream(byteArray);
|
||||
BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName);
|
||||
string dbPath = fullDirectoryPath + "/" + fileName;
|
||||
var result = await client.UploadAsync(stream, true);
|
||||
attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
|
||||
}
|
||||
}
|
||||
return attachments;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return new List<Models.Attachment>();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
public async Task<List<Attachment>> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments)
|
||||
{
|
||||
List<Models.Attachment> Dbattachments = new List<Models.Attachment>();
|
||||
foreach (Models.Attachment searchFile in attachments)
|
||||
{
|
||||
Movefile(searchFile.URI);
|
||||
}
|
||||
foreach (var item in answers)
|
||||
{
|
||||
int answerId = item.AnswerId;
|
||||
var pathToSave = Path.Combine(uploadpath, "Response-" + responseId);
|
||||
String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId);
|
||||
foreach (var file in item.postedFiles)
|
||||
{
|
||||
Models.Attachment attachment = attachments.Where(a => a.Id == file.AttachmentId).FirstOrDefault();
|
||||
var UserfileName = Path.GetFileName(file.FileName);
|
||||
var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension);
|
||||
byte[] byteArray = Convert.FromBase64String(file.FileContent);
|
||||
MemoryStream stream = new MemoryStream(byteArray);
|
||||
BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName);
|
||||
string dbPath = fullDirectoryPath + "/" + fileName;
|
||||
var result = await client.UploadAsync(stream, true);
|
||||
Dbattachments.Add(new Models.Attachment { Id = attachment.Id, AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
|
||||
}
|
||||
}
|
||||
return Dbattachments;
|
||||
}
|
||||
|
||||
public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files)
|
||||
@ -35,10 +122,52 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
|
||||
return azureResponse;
|
||||
}
|
||||
public void DeleteFile(string url)
|
||||
public string getMovefilename(string movefilename)
|
||||
{
|
||||
var blob = _containerClient.GetBlockBlobClient(url);
|
||||
blob.DeleteIfExists();
|
||||
var list = movefilename.Split('.');
|
||||
if (list.Length > 0)
|
||||
list[list.Length - 1] = DateTime.Now.ToShortDateString().Replace("/", "_") + "_" + DateTime.Now.ToShortTimeString().Replace("/", "_") + "." + list[list.Length - 1];
|
||||
return string.Join("_", list);
|
||||
}
|
||||
public void Movefile(string path)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (path != "")
|
||||
{
|
||||
string MovePath = getMovefilename(path.Replace(uploadpath, Deletepath));
|
||||
// Get references to the source and destination blobs
|
||||
BlobClient sourceBlobClient = _containerClient.GetBlobClient(path);
|
||||
BlobClient destinationBlobClient = _containerClient.GetBlobClient(MovePath);
|
||||
// Start the copy operation from the source to the destination
|
||||
destinationBlobClient.StartCopyFromUri(sourceBlobClient.Uri);
|
||||
|
||||
// Check if the copy operation completed successfully
|
||||
WaitForCopyToComplete(destinationBlobClient);
|
||||
|
||||
// Delete the source blob after a successful copy
|
||||
sourceBlobClient.DeleteIfExists();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
static void WaitForCopyToComplete(BlobClient blobClient)
|
||||
{
|
||||
BlobProperties properties = blobClient.GetProperties();
|
||||
|
||||
while (properties.CopyStatus == CopyStatus.Pending)
|
||||
{
|
||||
Task.Delay(TimeSpan.FromSeconds(1));
|
||||
properties = blobClient.GetProperties();
|
||||
}
|
||||
}
|
||||
public void Deletefile(string url)
|
||||
{
|
||||
BlobClient sourceBlobClient = _containerClient.GetBlobClient(url);
|
||||
sourceBlobClient.DeleteIfExists();
|
||||
}
|
||||
}
|
||||
}
|
@ -11,12 +11,14 @@
|
||||
"AllowedHosts": "*",
|
||||
"Fileupload": {
|
||||
"folderpath": "DMS_Attachments/Active",
|
||||
"Deletepath": "DMS_Attachments/Deleted"
|
||||
"Deletepath": "DMS_Attachments/Deleted",
|
||||
"BlobConnectionString": "DefaultEndpointsProtocol=https;AccountName=damagedoculink;AccountKey=blynpwrAQtthEneXC5f4vFewJ3tPV+QZUt1AX3nefZScPPjkr5hMoC18B9ni6/ZYdhRiERPQw+hB+AStonf+iw==;EndpointSuffix=core.windows.net",
|
||||
"BlobContainerName": "doculinks"
|
||||
},
|
||||
"ConnectionStrings": {
|
||||
//"AttachmentConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
|
||||
// "AttachmentConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
|
||||
"AttachmentConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
"AttachmentConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
|
||||
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user