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

Merge pull request #1408 from sbwalker/dev

Browse Source 
moved Packages folder to secure location
This commit is contained in:
Shaun Walker 2021-05-27 21:35:57 -04:00 committed by GitHub
commit 01716099d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
View File

@ -36,7 +36,7 @@
<Label HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Module: </Label> <Label HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Module: </Label>
</td> </td>
<td> <td>
<FileManager Filter="nupkg" ShowFiles="false" Folder="Modules" UploadMultiple="true" /> <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="true" />
</td> </td>
</tr> </tr>
</table> </table>

2
Oqtane.Client/Modules/Admin/Themes/Add.razor
View File

@ -36,7 +36,7 @@
<Label HelpText="Upload one or more theme packages. Once they are uploaded click Install to complete the installation." ResourceKey="Theme">Theme: </Label> <Label HelpText="Upload one or more theme packages. Once they are uploaded click Install to complete the installation." ResourceKey="Theme">Theme: </Label>
</td> </td>
<td> <td>
<FileManager Filter="nupkg" ShowFiles="false" Folder="Themes" UploadMultiple="@true" /> <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="@true" />
</td> </td>
</tr> </tr>
</table> </table>

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\wwwroot\Packages\$(PackageName).bak" /> <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\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\wwwroot\Packages\$(PackageName).bak" /> <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\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\wwwroot\Packages\$(PackageName).bak" /> <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\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\wwwroot\Packages\$(PackageName).bak" /> <Copy SourceFiles="$(OutputPath)..\$(PackageName)" DestinationFiles="..\Oqtane.Server\Packages\$(PackageName).bak" />
</Target> </Target>
</Project> </Project>

2
Oqtane.Server/Controllers/FileController.cs
View File

@ -499,7 +499,7 @@ namespace Oqtane.Controllers
private string GetFolderPath(string folder) private string GetFolderPath(string folder)
{ {
return Utilities.PathCombine(_environment.WebRootPath, folder); return Utilities.PathCombine(_environment.ContentRootPath, folder);
} }
private void CreateDirectory(string folderpath) private void CreateDirectory(string folderpath)

2
Oqtane.Server/Controllers/PackageController.cs
View File

@ -65,7 +65,7 @@ namespace Oqtane.Controllers
{ {
using (var httpClient = new HttpClient()) using (var httpClient = new HttpClient())
{ {
folder = Path.Combine(_environment.WebRootPath, folder); folder = Path.Combine(_environment.ContentRootPath, folder);
var response = await httpClient.GetAsync("https://www.nuget.org/api/v2/package/" + packageid.ToLower() + "/" + version).ConfigureAwait(false); var response = await httpClient.GetAsync("https://www.nuget.org/api/v2/package/" + packageid.ToLower() + "/" + version).ConfigureAwait(false);
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
string filename = packageid + "." + version + ".nupkg"; string filename = packageid + "." + version + ".nupkg";

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

@ -38,7 +38,7 @@ namespace Oqtane.Infrastructure
bool install = false; bool install = false;
string binPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location); string binPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
string sourceFolder = Path.Combine(webRootPath, "Packages"); string sourceFolder = Path.Combine(contentRootPath, "Packages");
if (!Directory.Exists(sourceFolder)) if (!Directory.Exists(sourceFolder))
{ {
Directory.CreateDirectory(sourceFolder); Directory.CreateDirectory(sourceFolder);

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

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

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

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

20
Oqtane.Test/Oqtane.Test.csproj
View File

@ -29,29 +29,41 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Oqtane.Database.MySQL\Oqtane.Database.MySQL.csproj" />
<ProjectReference Include="..\Oqtane.Database.PostgreSQL\Oqtane.Database.PostgreSQL.csproj" />
<ProjectReference Include="..\Oqtane.Database.Sqlite\Oqtane.Database.Sqlite.csproj" />
<ProjectReference Include="..\Oqtane.Database.SqlServer\Oqtane.Database.SqlServer.csproj" />
<ProjectReference Include="..\Oqtane.Shared\Oqtane.Shared.csproj" /> <ProjectReference Include="..\Oqtane.Shared\Oqtane.Shared.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="Oqtane.Database.MySQL\**" />
<Compile Remove="Oqtane.Database.PostgreSQL\**" />
<Compile Remove="Oqtane.Database.Sqlite\**" />
<Compile Remove="Oqtane.Database.SqlServer\**" />
<Compile Remove="Repository\**" /> <Compile Remove="Repository\**" />
<Compile Remove="Security\**" /> <Compile Remove="Security\**" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Remove="Oqtane.Database.MySQL\**" />
<EmbeddedResource Remove="Oqtane.Database.PostgreSQL\**" />
<EmbeddedResource Remove="Oqtane.Database.Sqlite\**" />
<EmbeddedResource Remove="Oqtane.Database.SqlServer\**" />
<EmbeddedResource Remove="Repository\**" /> <EmbeddedResource Remove="Repository\**" />
<EmbeddedResource Remove="Security\**" /> <EmbeddedResource Remove="Security\**" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Remove="Oqtane.Database.MySQL\**" />
<None Remove="Oqtane.Database.PostgreSQL\**" />
<None Remove="Oqtane.Database.Sqlite\**" />
<None Remove="Oqtane.Database.SqlServer\**" />
<None Remove="Repository\**" /> <None Remove="Repository\**" />
<None Remove="Security\**" /> <None Remove="Security\**" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Remove="Oqtane.Database.MySQL\**" />
<Content Remove="Oqtane.Database.PostgreSQL\**" />
<Content Remove="Oqtane.Database.Sqlite\**" />
<Content Remove="Oqtane.Database.SqlServer\**" />
<Content Remove="Repository\**" /> <Content Remove="Repository\**" />
<Content Remove="Security\**" /> <Content Remove="Security\**" />
</ItemGroup> </ItemGroup>