kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring in preparation for release

Browse Source
This commit is contained in:
Shaun Walker 2021-05-28 07:53:49 -04:00
parent 4108c07862
commit e0c2763c9f
10 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
View File

@ -27,6 +27,6 @@
</ItemGroup> </ItemGroup>
<Target Name="CopyPackage" AfterTargets="Pack"> <Target Name="CopyPackage" AfterTargets="Pack">
<Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\Packages\$(PackageName).bak" /> <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\wwwroot\Packages\$(PackageName).bak" />
</Target> </Target>
</Project> </Project>

2
Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
View File

@ -29,6 +29,6 @@
</ItemGroup> </ItemGroup>
<Target Name="CopyPackage" AfterTargets="Pack"> <Target Name="CopyPackage" AfterTargets="Pack">
<Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\Packages\$(PackageName).bak" /> <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\wwwroot\Packages\$(PackageName).bak" />
</Target> </Target>
</Project> </Project>

2
Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
View File

@ -27,7 +27,7 @@
</ItemGroup> </ItemGroup>
<Target Name="CopyPackage" AfterTargets="Pack"> <Target Name="CopyPackage" AfterTargets="Pack">
<Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\Packages\$(PackageName).bak" /> <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\wwwroot\Packages\$(PackageName).bak" />
</Target> </Target>
</Project> </Project>

2
Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
View File

@ -27,7 +27,7 @@
</ItemGroup> </ItemGroup>
<Target Name="CopyPackage" AfterTargets="Pack"> <Target Name="CopyPackage" AfterTargets="Pack">
<Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\Packages\$(PackageName).bak" /> <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\wwwroot\Packages\$(PackageName).bak" />
</Target> </Target>
</Project> </Project>

4
Oqtane.Server/Infrastructure/InstallationManager.cs
View File

@ -44,8 +44,8 @@ namespace Oqtane.Infrastructure
Directory.CreateDirectory(sourceFolder); Directory.CreateDirectory(sourceFolder);
} }
// support for legacy folder locations // move packages to secure location
foreach (var folder in "Modules,Themes".Split(",")) foreach (var folder in "Modules,Themes,Packages".Split(","))
{ {
foreach(var file in Directory.GetFiles(Path.Combine(webRootPath, folder), "*.nupkg")) foreach(var file in Directory.GetFiles(Path.Combine(webRootPath, folder), "*.nupkg"))
{ {

4
Oqtane.Server/Security/PermissionHandler.cs
View File

@ -31,10 +31,6 @@ namespace Oqtane.Security
{ {
entityId = int.Parse(ctx.Request.Query["auth" + requirement.EntityName.ToLower() + "id"]); entityId = int.Parse(ctx.Request.Query["auth" + requirement.EntityName.ToLower() + "id"]);
} }
if (entityId == -1 && ctx.Request.Query.ContainsKey("entityid"))
{
entityId = int.Parse(ctx.Request.Query["entityid"]);
}
if (_userPermissions.IsAuthorized(context.User, requirement.EntityName, entityId, requirement.PermissionName)) if (_userPermissions.IsAuthorized(context.User, requirement.EntityName, entityId, requirement.PermissionName))
{ {
context.Succeed(requirement); context.Succeed(requirement);

0
Oqtane.Server/Packages/Oqtane.Database.MySQL.1.0.0.nupkg.bak → Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.1.0.0.nupkg.bak
View File

0
Oqtane.Server/Packages/Oqtane.Database.PostgreSQL.1.0.0.nupkg.bak → Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.1.0.0.nupkg.bak
View File

0
Oqtane.Server/Packages/Oqtane.Database.SqlServer.1.0.0.nupkg.bak → Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.1.0.0.nupkg.bak
View File

0
Oqtane.Server/Packages/Oqtane.Database.Sqlite.1.0.0.nupkg.bak → Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.1.0.0.nupkg.bak
View File