Merge pull request #11 from openimis/v1.0.0

V1.0.0
openimis · Nov 26, 2018 · 4ef8774 · 4ef8774
2 parents b32d737 + e3c5bb6
commit 4ef8774
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 1 deletion.
diff --git a/OpenImis.RestApi/Controllers/FamilyControllerV1.cs b/OpenImis.RestApi/Controllers/FamilyControllerV1.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using OpenImis.Modules;
@@ -16,6 +17,7 @@ namespace OpenImis.RestApi.Controllers
     [Authorize(Roles = "IMISAdmin, EnrollmentOfficer")]
     [Route("api/family")]
 	[ApiController]
+	[EnableCors("AllowSpecificOrigin")]
 	public class FamilyControllerV1 : Controller
     {
 		private readonly IImisModules _imisModules;

diff --git a/OpenImis.RestApi/Controllers/LocationController.cs b/OpenImis.RestApi/Controllers/LocationController.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using OpenImis.Modules;
@@ -16,6 +17,7 @@ namespace OpenImis.RestApi.Controllers
 	[Authorize(Roles = "IMISAdmin, EnrollmentOfficer")]
 	[Route("api/location")]
 	[ApiController]
+	[EnableCors("AllowSpecificOrigin")]
 	public class LocationController : Controller
 	{
 		private readonly IImisModules _imisModules;

diff --git a/OpenImis.RestApi/Controllers/LoginControllerV1.cs b/OpenImis.RestApi/Controllers/LoginControllerV1.cs
@@ -16,13 +16,16 @@
 using OpenImis.Modules;
 using System.ComponentModel.DataAnnotations;
 using OpenImis.Modules.UserModule.Entities;
+using Microsoft.AspNetCore.Cors;
 
 namespace OpenImis.RestApi.Controllers
 {
     [ApiVersion("1")]
     [Route("api/login")]
     [ApiController]
-    public class LoginControllerV1 : ControllerBase
+	[EnableCors("AllowSpecificOrigin")]
+
+	public class LoginControllerV1 : ControllerBase
     {
         private readonly IConfiguration _configuration;
         private readonly IImisModules _imisModules;

diff --git a/OpenImis.RestApi/Controllers/MasterDataController.cs b/OpenImis.RestApi/Controllers/MasterDataController.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using OpenImis.Modules;
@@ -14,6 +15,7 @@ namespace OpenImis.RestApi.Controllers
 	[Authorize(Roles = "IMISAdmin, EnrollmentOfficer")]
 	[Route("api/master")]
 	[ApiController]
+	[EnableCors("AllowSpecificOrigin")]
 	public class MasterDataController : Controller
     {
 		private readonly IImisModules _imisModules;

diff --git a/OpenImis.RestApi/Controllers/ValuesControllerV1.cs b/OpenImis.RestApi/Controllers/ValuesControllerV1.cs
@@ -3,13 +3,15 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 
 namespace OpenImis.RestApi.Controllers
 {
     [ApiVersion("1")]
     [Route("api/values")]
 	[ApiController]
+	[EnableCors("AllowSpecificOrigin")]
 	public class ValuesControllerV1 : Controller
     {
         // GET api/values

diff --git a/OpenImis.RestApi/Startup.cs b/OpenImis.RestApi/Startup.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -66,6 +67,11 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddSwaggerGen(SwaggerHelper.ConfigureSwaggerGen);
 
+			services.AddCors(options =>
+			{
+				options.AddPolicy("AllowSpecificOrigin",
+					builder => builder.AllowAnyOrigin().AllowAnyMethod().AllowCredentials().AllowAnyHeader());
+			});
         }
 
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
@@ -86,6 +92,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             app.UseAuthentication();
             app.UseMvc();
 
+			app.UseCors("AllowSpecificOrigin");
+
 
             // ===== Create tables ======
             //imisContext.Database.EnsureCreated();