Skip to content

Commit f45b432

Browse files
renemadsenrenemadsen
committed
Adding changes to support CORS.
1 parent 1369eff commit f45b432

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

‎eFormAPI/eFormAPI/Controllers/EntitySelectController.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using eFormApi.BasePn.Infrastructure.Helpers;
1111
using eFormApi.BasePn.Infrastructure.Models.API;
1212
using eFormAPI.Web.Infrastructure.Helpers.ExchangeTokenValidation;
13+
using System.Web.Http.Cors;
1314

1415
namespace eFormAPI.Web.Controllers
1516
{
@@ -131,6 +132,7 @@ public OperationDataResult<EntityGroup> GetEntityGroup(string entityGroupUid)
131132
[HttpGet]
132133
[AllowAnonymous]
133134
[Route("api/selectable-groups/get/exchange/{entityGroupUid}")]
135+
[EnableCors(origins: "*", headers: "*", methods: "*")]
134136
public OperationDataResult<EntityGroup> GetEntityGroupExternally(string entityGroupUid, string token, string callerURL)
135137
{
136138
// Do some validation of the token. For now token is not valid

‎eFormAPI/eFormAPI/eFormAPI.Web.csproj‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,18 +180,27 @@
180180
</Reference>
181181
<Reference Include="System.IO.Compression" />
182182
<Reference Include="System.IO.Compression.FileSystem" />
183+
<Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
184+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
185+
</Reference>
183186
<Reference Include="System.Runtime.Remoting" />
184187
<Reference Include="System.Security" />
185188
<Reference Include="System.ServiceModel" />
186189
<Reference Include="System.Transactions" />
187-
<Reference Include="System.Web.Cors, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
188-
<HintPath>..\packages\Microsoft.AspNet.Cors.5.0.0\lib\net45\System.Web.Cors.dll</HintPath>
190+
<Reference Include="System.Web.Cors, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
191+
<HintPath>..\packages\Microsoft.AspNet.Cors.5.2.6\lib\net45\System.Web.Cors.dll</HintPath>
189192
</Reference>
190193
<Reference Include="System.Web.DynamicData" />
191194
<Reference Include="System.Web.Entity" />
192195
<Reference Include="System.Web.ApplicationServices" />
193196
<Reference Include="System.ComponentModel.DataAnnotations" />
194197
<Reference Include="System.Web.Extensions" />
198+
<Reference Include="System.Web.Http, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
199+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.6\lib\net45\System.Web.Http.dll</HintPath>
200+
</Reference>
201+
<Reference Include="System.Web.Http.Cors, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
202+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Cors.5.2.6\lib\net45\System.Web.Http.Cors.dll</HintPath>
203+
</Reference>
195204
<Reference Include="System.Web.Http.Owin, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
196205
<HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.3\lib\net45\System.Web.Http.Owin.dll</HintPath>
197206
</Reference>
@@ -207,18 +216,12 @@
207216
</Reference>
208217
<Reference Include="System.Net.Http">
209218
</Reference>
210-
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
211-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
212-
</Reference>
213219
<Reference Include="System.Net.Http.WebRequest">
214220
</Reference>
215221
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
216222
<Private>True</Private>
217223
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
218224
</Reference>
219-
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
220-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
221-
</Reference>
222225
<Reference Include="System.Web.Http.WebHost, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
223226
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
224227
</Reference>

‎eFormAPI/eFormAPI/packages.config‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@
1212
<package id="DotNetZip" version="1.11.0" targetFramework="net461" />
1313
<package id="EntityFramework" version="6.2.0" targetFramework="net461" />
1414
<package id="EPPlus" version="4.5.2.1" targetFramework="net461" />
15-
<package id="Microsoft.AspNet.Cors" version="5.0.0" targetFramework="net46" />
15+
<package id="Microsoft.AspNet.Cors" version="5.2.6" targetFramework="net461" />
1616
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net46" />
1717
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net46" />
1818
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net46" />
1919
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net46" />
2020
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net46" />
2121
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net46" />
2222
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net46" />
23-
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net46" />
24-
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net46" />
23+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net461" />
24+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.6" targetFramework="net461" />
25+
<package id="Microsoft.AspNet.WebApi.Cors" version="5.2.6" targetFramework="net461" />
2526
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net46" />
2627
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net46" />
2728
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net46" />

0 commit comments

Comments
 (0)