Skip to content

#3212: Permissions update #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
goransmit merged 1 commit into from
Feb 21, 2025
Merged

#3212: Permissions update #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 5 additions & 46 deletions src/DotNetEd.CoreAdmin/Controllers/AccountController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,56 +135,15 @@ private async Task<Tuple<bool, string>> GetMasterUser(string token)

var masterUserJson = await masterUserResponse.Content.ReadAsStringAsync();
var masterUser = JsonConvert.DeserializeObject<JObject>(masterUserJson);
string mfaCode = (string)masterUser["mfaCode"];

var masterUserId = (long)masterUser["id"];
if (masterUserId == options.SuperAdminId)
long seat = (long)masterUser["seat"];
long adminSeat = (long)masterUser["adminSeat"];
if (adminSeat == 1 && seat == 2) // Check if user is amplifi admin
{
return Tuple.Create(true, mfaCode);
return Tuple.Create(true, (string)masterUser["mfaCode"]);
}

var tenants = masterUser["tenants"];
string tenantId = "";
if (tenants.Any())
{
foreach (var tenant in tenants)
{
if ((bool)tenant["isDefault"])
{
tenantId = (string)tenant["id"];
}
}
}

if (tenantId == "")
{
logger.Log(LogLevel.Information, "User doesn't have default tenant.");
return Tuple.Create(false, "");
}

//Get user role
client.DefaultRequestHeaders.Add("TenantId", tenantId);
var permissionResponse = await client.GetAsync("/api/v1/login/permission_details");
if (!permissionResponse.IsSuccessStatusCode)
{
logger.Log(LogLevel.Warning, "/api/v1/login/permission_details hasn't returned successfull status code.");
return Tuple.Create(false, "");
}

var permissionResponseJson = await permissionResponse.Content.ReadAsStringAsync();
var permissionsAndRoles = JsonConvert.DeserializeObject<JObject>(permissionResponseJson);
var roles = permissionsAndRoles["roles"];
if (roles.Any())
{
var roleName = roles[0]["name"].ToString();
if (roleName.Equals(options.AllowedRole, StringComparison.InvariantCultureIgnoreCase))
{
return Tuple.Create(true, mfaCode);
}
}

logger.Log(LogLevel.Information, "User doesn't have products.allaccess permission to access admin panel.");

logger.Log(LogLevel.Information, "User must be amplifi admin to access admin panel.");
return Tuple.Create(false, "");
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/DotNetEd.CoreAdmin/CoreAdminSecurityOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ public class CoreAdminOptions
public string FirebaseApiKey { get; set; }
public Dictionary<string, List<Func<string>>> Context2ConnectionStrings { get; set; }
public string ApiUrl { get; set; }
public string AllowedRole { get; set; }
public long SuperAdminId { get; set; }

public CoreAdminOptions()
{
Expand Down
2 changes: 1 addition & 1 deletion src/DotNetEd.CoreAdmin/DotNetEd.CoreAdmin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<PreserveCompilationContext>false</PreserveCompilationContext>
<SuppressDependenciesWhenPacking>false</SuppressDependenciesWhenPacking>
<PackageId>AmplifiAdminPortal</PackageId>
<PackageVersion>3.0.3</PackageVersion>
<PackageVersion>3.0.4</PackageVersion>
<Description>Automagically add an Admin Panel to your .NET 8 web app.</Description>
<Title>Core Admin Panel for ASP.NET Core</Title>
<Authors>amplifi</Authors>
Expand Down