admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Merge branch 'Feature_Task_management' of https://git.marcoaiot.com/admin/marco.pms.api into Feature_Task_management

Browse Source
This commit is contained in:
ashutosh.nehete 2025-04-09 10:41:14 +05:30
commit 15e83346e2
2 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marco.Pms.Services/Controllers/AttendanceController.cs
View File

@ -10,7 +10,6 @@ using MarcoBMS.Services.Helpers;
using Microsoft.AspNetCore.Mvc;
using Microsoft.CodeAnalysis;
using Microsoft.EntityFrameworkCore;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace MarcoBMS.Services.Controllers
{

70
Marco.Pms.Services/Program.cs
View File

@ -15,7 +15,6 @@ using System.Text;
var builder = WebApplication.CreateBuilder(args);
// Add Serilog Configuration
builder.Host.UseSerilog((context, config) =>
{
@ -24,34 +23,49 @@ builder.Host.UseSerilog((context, config) =>
})
;
#region CORS Settings
// Add services
builder.Services.AddCors(options =>
{
options.AddPolicy("DevCorsPolicy", policy =>
{
policy.AllowAnyOrigin()
.AllowAnyMethod()
.AllowAnyHeader();
});
});
//var corsSettings = builder.Configuration.GetSection("Cors");
//var allowedOrigins = corsSettings.GetValue<string>("AllowedOrigins")?.Split(',');
//var allowedMethods = corsSettings.GetValue<string>("AllowedMethods")?.Split(',');
//var allowedHeaders = corsSettings.GetValue<string>("AllowedHeaders")?.Split(',');
//builder.Services.AddCors(options =>
//{
// options.AddPolicy("DevCorsPolicy", policy =>
// options.AddPolicy("Policy", policy =>
// {
// if (allowedOrigins != null)
// {
// policy.WithOrigins(allowedOrigins)
// .WithMethods(allowedMethods)
// .WithHeaders(allowedHeaders);
// }
// });
// options.AddPolicy("AllowAll", policy =>
// {
// if (allowedOrigins != null)
// {
// policy.AllowAnyOrigin()
// .AllowAnyMethod()
// .AllowAnyHeader();
// }
// });
//});
var corsSettings = builder.Configuration.GetSection("Cors");
var allowedOrigins = corsSettings.GetValue<string>("AllowedOrigins")?.Split(',');
var allowedMethods = corsSettings.GetValue<string>("AllowedMethods")?.Split(',');
var allowedHeaders = corsSettings.GetValue<string>("AllowedHeaders")?.Split(',');
builder.Services.AddCors(options =>
{
options.AddPolicy("Policy", policy =>
{
if (allowedOrigins != null)
{
policy.WithOrigins(allowedOrigins)
.WithMethods(allowedMethods)
.WithHeaders(allowedHeaders);
}
});
});
#endregion
// Add services to the container.
builder.Services.AddControllers();
@ -154,16 +168,18 @@ if (app.Environment.IsDevelopment())
app.UseSwagger();
app.UseSwaggerUI();
// Use CORS in the pipeline
//app.UseCors("DevCorsPolicy");
app.UseCors("DevCorsPolicy");
}else
{
//if (app.Environment.IsProduction())
//{
// app.UseCors("ProdCorsPolicy");
//}
//app.UseCors("AllowAll");
app.UseCors("DevCorsPolicy");
}
//if (app.Environment.IsProduction())
//{
// app.UseCors("ProdCorsPolicy");
//}
app.UseCors("Policy");
app.UseStaticFiles(); // Enables serving static files
//app.UseSerilogRequestLogging(); // This is Default Serilog Logging Middleware we are not using this because we're using custom logging middleware