Small refactoring.

pull/5849/head
maliming 5 years ago
parent 4d69ddbc92
commit 373586960e

@ -12,18 +12,9 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
protected override Task<string> GetTenantIdOrNameFromHttpContextOrNullAsync(ITenantResolveContext context, HttpContext httpContext)
{
var tenantKey = context.GetAbpAspNetCoreMultiTenancyOptions().TenantKey;
if (!httpContext.Request.QueryString.HasValue)
{
return null;
}
if (httpContext.Request.Query.TryGetValue(tenantKey, out var tenant))
{
Task.FromResult(tenant);
}
return null;
return httpContext.Request.QueryString.HasValue
? Task.FromResult(httpContext.Request.Query[context.GetAbpAspNetCoreMultiTenancyOptions().TenantKey].ToString())
: null;
}
}
}

@ -15,7 +15,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
protected override Task<string> GetTenantIdOrNameFromHttpContextOrNullAsync(ITenantResolveContext context, HttpContext httpContext)
{
var tenantId = httpContext.GetRouteValue(context.GetAbpAspNetCoreMultiTenancyOptions().TenantKey);
return tenantId == null ? null : Task.FromResult(Convert.ToString(tenantId));
return tenantId != null ? Task.FromResult(Convert.ToString(tenantId)) : null;
}
}
}

Loading…
Cancel
Save