Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Prevent deleting master tenant (#319)

Browse Source 
* Prevent deleting master tenant

* Prevent deletion in APIS level

* Address feedback
This commit is contained in:
Hisham Bin Ateya
2020-04-02 15:08:55 +03:00
committed by GitHub
parent 0b302c6e26
commit c2a29831c4
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Oqtane.Client/Modules/Admin/Tenants/Edit.razor
View File

@ -9,7 +9,14 @@
<label class="control-label">Name: </label> <label class="control-label">Name: </label>
</td> </td>
<td> <td>
<input class="form-control" @bind="@name" /> @if (name == Constants.MasterTenant)
{
<input class="form-control" @bind="@name" readonly />
}
else
{
<input class="form-control" @bind="@name" />
}
</td> </td>
</tr> </tr>
<tr> <tr>

2
Oqtane.Client/Modules/Admin/Tenants/Index.razor
View File

@ -18,7 +18,7 @@ else
</Header> </Header>
<Row> <Row>
<td><ActionLink Action="Edit" Parameters="@($"id=" + context.TenantId.ToString())" /></td> <td><ActionLink Action="Edit" Parameters="@($"id=" + context.TenantId.ToString())" /></td>
<td><ActionDialog Header="Delete Tenant" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Tenant?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTenant(context))" /></td> <td><ActionDialog Header="Delete Tenant" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Tenant?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTenant(context))" Disabled="@(context.Name == Constants.MasterTenant)" /></td>
<td>@context.Name</td> <td>@context.Name</td>
</Row> </Row>
</Pager> </Pager>

12
Oqtane.Server/Repository/TenantRepository.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Caching.Memory;
using Oqtane.Models; using Oqtane.Models;
using Oqtane.Shared;
namespace Oqtane.Repository namespace Oqtane.Repository
{ {
@ -37,6 +38,13 @@ namespace Oqtane.Repository
public Tenant UpdateTenant(Tenant tenant) public Tenant UpdateTenant(Tenant tenant)
{ {
var oldTenant = GetTenant(tenant.TenantId);
if (oldTenant.Name.Equals(Constants.MasterTenant, StringComparison.OrdinalIgnoreCase) && !oldTenant.Name.Equals(tenant.Name))
{
throw new InvalidOperationException("Unable to rename the master tenant.");
}
_db.Entry(tenant).State = EntityState.Modified; _db.Entry(tenant).State = EntityState.Modified;
_db.SaveChanges(); _db.SaveChanges();
_cache.Remove("tenants"); _cache.Remove("tenants");
@ -50,8 +58,8 @@ namespace Oqtane.Repository
public void DeleteTenant(int tenantId) public void DeleteTenant(int tenantId)
{ {
Tenant tenant = _db.Tenant.Find(tenantId); var tenant = GetTenant(tenantId);
if (tenant != null) if (tenant != null && !tenant.Name.Equals(Constants.MasterTenant, StringComparison.OrdinalIgnoreCase))
{ {
_db.Tenant.Remove(tenant); _db.Tenant.Remove(tenant);
_db.SaveChanges(); _db.SaveChanges();

2
Oqtane.Shared/Shared/Constants.cs
View File

@ -32,6 +32,8 @@
public const string HostUser = "host"; public const string HostUser = "host";
public const string MasterTenant = "Master";
public const string AllUsersRole = "All Users"; public const string AllUsersRole = "All Users";
public const string HostRole = "Host Users"; public const string HostRole = "Host Users";
public const string AdminRole = "Administrators"; public const string AdminRole = "Administrators";