Skip to content

Commit 76740ab

Browse files
Gid733Gid733
authored
Merge pull request #47 from microting/master
Updates
2 parents 38189cb + 299671c commit 76740ab

File tree

57 files changed

+1430
-428
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1430
-428
lines changed

‎eFormAPI/Installation/CustomActions/CustomAction.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,12 @@ public static ActionResult UpdateCA(Session session)
444444
DeleteDirectory(Path.Combine(uiIisDir, "dist"));
445445
}
446446
catch { }
447+
448+
try
449+
{
450+
DeleteDirectory(Path.Combine("c:\\", "MicrotingTemp"));
451+
}
452+
catch { }
447453
try
448454
{
449455
BackupPluginSettings(session, uiIisDir);

‎eFormAPI/eFormAPI.Web.Integration.Tests/eFormAPI.Web.Integration.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
10-
<PackageReference Include="Microting.eForm" Version="3.0.151" />
10+
<PackageReference Include="Microting.eForm" Version="3.0.155" />
1111
<PackageReference Include="NUnit" Version="3.11.0" />
1212
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
1313
</ItemGroup>

‎eFormAPI/eFormAPI.Web.Tests/eFormAPI.Web.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
10-
<PackageReference Include="Microting.eForm" Version="3.0.151" />
10+
<PackageReference Include="Microting.eForm" Version="3.0.155" />
1111
<PackageReference Include="NUnit" Version="3.11.0" />
1212
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
13-
<PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.93" />
13+
<PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.94" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎eFormAPI/eFormAPI.Web/Controllers/Eforms/AudioController.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.IO;
22
using eFormAPI.Web.Infrastructure;
3+
using Microsoft.AspNetCore.Authentication.Cookies;
34
using Microsoft.AspNetCore.Authorization;
45
using Microsoft.AspNetCore.Mvc;
56
using Microting.eFormApi.BasePn.Infrastructure.Helpers;
@@ -11,7 +12,8 @@ public class AudioController : Controller
1112
{
1213
[HttpGet]
1314
[Route("api/audio/eform-audio")]
14-
[Authorize(Policy = AuthConsts.EformPolicies.Cases.CaseRead)]
15+
[Authorize(AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme,
16+
Policy = AuthConsts.EformPolicies.Cases.CasesRead)]
1517
public IActionResult GetAudio(string fileName)
1618
{
1719
var filePath = PathHelper.GetAudioPath(fileName);

‎eFormAPI/eFormAPI.Web/Controllers/Eforms/TemplateFilesController.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,11 @@ public async Task<IActionResult> Csv(int id)
5454
return File(fileStream, "application/octet-stream", fileName);
5555
}
5656

57-
[HttpGet]
57+
[HttpGet]
58+
[AllowAnonymous]
5859
[Route("api/template-files/get-image/{fileName}.{ext}")]
59-
[Authorize(AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme,
60-
Policy = AuthConsts.EformPolicies.Cases.CasesRead)]
60+
// [Authorize(AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme,
61+
// Policy = AuthConsts.EformPolicies.Cases.CasesRead)]
6162
public IActionResult GetImage(string fileName, string ext, string noCache = "noCache")
6263
{
6364
var core = _coreHelper.GetCore();

‎eFormAPI/eFormAPI.Web/Controllers/ImagesController.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ public IActionResult GetLoginPageImage(string fileName)
6060
return File(fileStream, $"image/{extention}");
6161
}
6262

63-
[HttpPost]
64-
[Authorize(Roles = EformRole.Admin, AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)]
63+
[HttpPost]
64+
[AllowAnonymous]
65+
// [Authorize(Roles = EformRole.Admin, AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)]
6566
[Route("api/images/login-page-images")]
6667
public async Task<IActionResult> PostLoginPageImages(IFormFile file)
6768
{
@@ -97,8 +98,9 @@ public async Task<IActionResult> PostLoginPageImages(IFormFile file)
9798
return BadRequest(_localizationService.GetString("InvalidRequest"));
9899
}
99100

100-
[HttpPost]
101-
[Authorize(Roles = EformRole.Admin, AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)]
101+
[HttpPost]
102+
[AllowAnonymous]
103+
// [Authorize(Roles = EformRole.Admin, AuthenticationSchemes = CookieAuthenticationDefaults.AuthenticationScheme)]
102104
[Route("api/images/eform-images")]
103105
public async Task<IActionResult> PostEformImages(IFormFile file)
104106
{

‎eFormAPI/eFormAPI.Web/Hosting/Helpers/PluginHelper.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ public static List<IEformPlugin> GetPlugins(IConfiguration configuration)
4747
{
4848
var connectionString = dbContext.Database.GetDbConnection().ConnectionString;
4949

50-
var connectionStringMatch = Regex.Match(connectionString, @"Database=(.*)_(.*);");//.Groups[1].Value;
51-
if (connectionStringMatch.Groups.Count != 3)
52-
{
53-
throw new Exception("Error while parsing connection-string database name");
54-
}
50+
// var connectionStringMatch = Regex.Match(connectionString, @"(Database=\w*;)");//.Groups[1].Value;
51+
// if (connectionStringMatch.Groups.Count != 3)
52+
// {
53+
// throw new Exception("Error while parsing connection-string database name");
54+
// }
5555

56-
var dbNameSection = connectionStringMatch.Groups[0].Value;
57-
var dbPrefix = connectionStringMatch.Groups[1].Value;
56+
var dbNameSection = Regex.Match(connectionString, @"(Database=\w*;)").Groups[0].Value;
57+
var dbPrefix = Regex.Match(connectionString, @"Database=(\d*)_").Groups[1].Value;
5858

5959
foreach (var plugin in GetAllPlugins())
6060
{
@@ -74,7 +74,7 @@ public static List<IEformPlugin> GetPlugins(IConfiguration configuration)
7474
{
7575
PluginId = plugin.PluginId,
7676
ConnectionString = pluginConnectionString,
77-
Status = (int) PluginStatus.Enabled
77+
Status = (int) PluginStatus.Disabled
7878
};
7979
dbContext.EformPlugins.Add(newPlugin);
8080
dbContext.SaveChanges();

0 commit comments

Comments
 (0)