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

Merge pull request #2590 from sbwalker/dev

Browse Source 
optimize Split() statements for consistency
This commit is contained in:
Shaun Walker 2023-02-08 16:50:23 -05:00 committed by GitHub
commit 0db297d1cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,7 +315,7 @@ else
_urls = Regex.Replace(_urls, @"\r\n?|\n", ","); _urls = Regex.Replace(_urls, @"\r\n?|\n", ",");
var duplicates = new List<string>(); var duplicates = new List<string>();
var aliases = await AliasService.GetAliasesAsync(); var aliases = await AliasService.GetAliasesAsync();
foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) foreach (string name in _urls.Split(',', StringSplitOptions.RemoveEmptyEntries))
{ {
if (aliases.Exists(item => item.Name == name)) if (aliases.Exists(item => item.Name == name))
{ {

6
Oqtane.Client/UI/SiteRouter.razor
View File

@ -299,7 +299,7 @@
{ {
query = query.Substring(1); // ignore "?" query = query.Substring(1); // ignore "?"
} }
foreach (string kvp in query.Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries)) foreach (string kvp in query.Split('&', StringSplitOptions.RemoveEmptyEntries))
{ {
if (kvp != "") if (kvp != "")
{ {
@ -358,7 +358,7 @@
} }
if (!string.IsNullOrEmpty(panes)) if (!string.IsNullOrEmpty(panes))
{ {
page.Panes = panes.Replace(";", ",").Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); page.Panes = panes.Replace(";", ",").Split(',', StringSplitOptions.RemoveEmptyEntries).ToList();
if (!page.Panes.Contains(PaneNames.Default) && !page.Panes.Contains(PaneNames.Admin)) if (!page.Panes.Contains(PaneNames.Default) && !page.Panes.Contains(PaneNames.Admin))
{ {
_error = "The Current Theme Does Not Contain A Default Or Admin Pane"; _error = "The Current Theme Does Not Contain A Default Or Admin Pane";
@ -407,7 +407,7 @@
// check if the module defines custom action routes // check if the module defines custom action routes
if (module.ModuleDefinition.ControlTypeRoutes != "") if (module.ModuleDefinition.ControlTypeRoutes != "")
{ {
foreach (string route in module.ModuleDefinition.ControlTypeRoutes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) foreach (string route in module.ModuleDefinition.ControlTypeRoutes.Split(';', StringSplitOptions.RemoveEmptyEntries))
{ {
if (route.StartsWith(action + "=")) if (route.StartsWith(action + "="))
{ {

8
Oqtane.Server/Infrastructure/DatabaseManager.cs
View File

@ -370,7 +370,7 @@ namespace Oqtane.Infrastructure
tenant = db.Tenant.FirstOrDefault(item => item.Name == install.TenantName); tenant = db.Tenant.FirstOrDefault(item => item.Name == install.TenantName);
} }
var aliasNames = install.Aliases.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray(); var aliasNames = install.Aliases.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray();
var firstAlias = aliasNames[0]; var firstAlias = aliasNames[0];
foreach (var aliasName in aliasNames) foreach (var aliasName in aliasNames)
{ {
@ -406,7 +406,7 @@ namespace Oqtane.Infrastructure
{ {
var result = new Installation { Success = false, Message = string.Empty }; var result = new Installation { Success = false, Message = string.Empty };
var versions = Constants.ReleaseVersions.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); var versions = Constants.ReleaseVersions.Split(',', StringSplitOptions.RemoveEmptyEntries);
using (var scope = _serviceScopeFactory.CreateScope()) using (var scope = _serviceScopeFactory.CreateScope())
{ {
@ -486,7 +486,7 @@ namespace Oqtane.Infrastructure
{ {
if (!string.IsNullOrEmpty(moduleDefinition.ReleaseVersions)) if (!string.IsNullOrEmpty(moduleDefinition.ReleaseVersions))
{ {
var versions = moduleDefinition.ReleaseVersions.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); var versions = moduleDefinition.ReleaseVersions.Split(',', StringSplitOptions.RemoveEmptyEntries);
using (var db = GetInstallationContext()) using (var db = GetInstallationContext())
{ {
if (!string.IsNullOrEmpty(moduleDefinition.ServerManagerType)) if (!string.IsNullOrEmpty(moduleDefinition.ServerManagerType))
@ -575,7 +575,7 @@ namespace Oqtane.Infrastructure
{ {
// set the alias explicitly so the tenant can be resolved // set the alias explicitly so the tenant can be resolved
var aliases = scope.ServiceProvider.GetRequiredService<IAliasRepository>(); var aliases = scope.ServiceProvider.GetRequiredService<IAliasRepository>();
var aliasNames = install.Aliases.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray(); var aliasNames = install.Aliases.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray();
var firstAlias = aliasNames[0]; var firstAlias = aliasNames[0];
var alias = aliases.GetAliases().FirstOrDefault(item => item.Name == firstAlias); var alias = aliases.GetAliases().FirstOrDefault(item => item.Name == firstAlias);
var tenantManager = scope.ServiceProvider.GetRequiredService<ITenantManager>(); var tenantManager = scope.ServiceProvider.GetRequiredService<ITenantManager>();

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

@ -37,7 +37,7 @@ namespace Oqtane.Infrastructure
{ {
// legacy support for client api requests which would include the alias as a path prefix ( ie. {alias}/api/[controller] ) // legacy support for client api requests which would include the alias as a path prefix ( ie. {alias}/api/[controller] )
int aliasId; int aliasId;
string[] segments = httpcontext.Request.Path.Value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); string[] segments = httpcontext.Request.Path.Value.Split('/', StringSplitOptions.RemoveEmptyEntries);
if (segments.Length > 1 && Shared.Constants.ReservedRoutes.Contains(segments[1]) && int.TryParse(segments[0], out aliasId)) if (segments.Length > 1 && Shared.Constants.ReservedRoutes.Contains(segments[1]) && int.TryParse(segments[0], out aliasId))
{ {
alias = _aliasRepository.GetAliases().ToList().FirstOrDefault(item => item.AliasId == aliasId); alias = _aliasRepository.GetAliases().ToList().FirstOrDefault(item => item.AliasId == aliasId);

2
Oqtane.Server/Repository/AliasRepository.cs
View File

@ -67,7 +67,7 @@ namespace Oqtane.Repository
Alias alias = null; Alias alias = null;
List<Alias> aliases = GetAliases().ToList(); List<Alias> aliases = GetAliases().ToList();
var segments = url.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); var segments = url.Split('/', StringSplitOptions.RemoveEmptyEntries);
// iterate segments to find keywords // iterate segments to find keywords
int start = segments.Length; int start = segments.Length;

2
Oqtane.Server/Repository/PermissionRepository.cs
View File

@ -225,7 +225,7 @@ namespace Oqtane.Repository
string securityid = ""; string securityid = "";
foreach (PermissionString permissionstring in JsonSerializer.Deserialize<List<PermissionString>>(permissionStrings)) foreach (PermissionString permissionstring in JsonSerializer.Deserialize<List<PermissionString>>(permissionStrings))
{ {
foreach (string id in permissionstring.Permissions.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) foreach (string id in permissionstring.Permissions.Split(';', StringSplitOptions.RemoveEmptyEntries))
{ {
securityid = id; securityid = id;
Permission permission = new Permission(); Permission permission = new Permission();

4
Oqtane.Shared/Security/UserSecurity.cs
View File

@ -62,7 +62,7 @@ namespace Oqtane.Security
if (permissions != null) if (permissions != null)
{ {
foreach (string permission in permissions.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) foreach (string permission in permissions.Split(';', StringSplitOptions.RemoveEmptyEntries))
{ {
bool? allowed = VerifyPermission(userId, roles, permission); bool? allowed = VerifyPermission(userId, roles, permission);
if (allowed.HasValue) if (allowed.HasValue)
@ -155,7 +155,7 @@ namespace Oqtane.Security
identity.AddClaim(new Claim(ClaimTypes.Role, RoleNames.Admin)); identity.AddClaim(new Claim(ClaimTypes.Role, RoleNames.Admin));
identity.AddClaim(new Claim(ClaimTypes.Role, RoleNames.Registered)); identity.AddClaim(new Claim(ClaimTypes.Role, RoleNames.Registered));
} }
foreach (string role in user.Roles.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) foreach (string role in user.Roles.Split(';', StringSplitOptions.RemoveEmptyEntries))
{ {
if (!identity.Claims.Any(item => item.Type == ClaimTypes.Role && item.Value == role)) if (!identity.Claims.Any(item => item.Type == ClaimTypes.Role && item.Value == role))
{ {