Merge pull request #10516 from abpframework/maliming/IOptionsSnapshot

Replace `IOptionsSnapshot` with `IOptions` and `IOptionsMonitor`
pull/10534/head
Halil İbrahim Kalkan 4 years ago committed by GitHub
commit 3c05a89561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -53,7 +53,7 @@ namespace Microsoft.Extensions.DependencyInjection
private static void SetAbpTenantId(AuthorizationCodeReceivedContext receivedContext)
{
var tenantKey = receivedContext.HttpContext.RequestServices
.GetRequiredService<IOptionsSnapshot<AbpAspNetCoreMultiTenancyOptions>>().Value.TenantKey;
.GetRequiredService<IOptions<AbpAspNetCoreMultiTenancyOptions>>().Value.TenantKey;
if (receivedContext.Request.Cookies.ContainsKey(tenantKey))
{

@ -8,7 +8,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
{
public static AbpAspNetCoreMultiTenancyOptions GetAbpAspNetCoreMultiTenancyOptions(this ITenantResolveContext context)
{
return context.ServiceProvider.GetRequiredService<IOptionsSnapshot<AbpAspNetCoreMultiTenancyOptions>>().Value;
return context.ServiceProvider.GetRequiredService<IOptions<AbpAspNetCoreMultiTenancyOptions>>().Value;
}
}
}
}

@ -6,11 +6,11 @@ namespace Volo.Abp.AspNetCore.Mvc.AntiForgery
{
public class AbpAntiForgeryCookieNameProvider : ITransientDependency
{
private readonly IOptionsSnapshot<CookieAuthenticationOptions> _namedOptionsAccessor;
private readonly IOptionsMonitor<CookieAuthenticationOptions> _namedOptionsAccessor;
private readonly AbpAntiForgeryOptions _abpAntiForgeryOptions;
public AbpAntiForgeryCookieNameProvider(
IOptionsSnapshot<CookieAuthenticationOptions> namedOptionsAccessor,
IOptionsMonitor<CookieAuthenticationOptions> namedOptionsAccessor,
IOptions<AbpAntiForgeryOptions> abpAntiForgeryOptions)
{
_namedOptionsAccessor = namedOptionsAccessor;

@ -10,9 +10,9 @@ namespace Volo.Abp.Data
protected AbpDbConnectionOptions Options { get; }
public DefaultConnectionStringResolver(
IOptionsSnapshot<AbpDbConnectionOptions> options)
IOptionsMonitor<AbpDbConnectionOptions> options)
{
Options = options.Value;
Options = options.CurrentValue;
}
[Obsolete("Use ResolveAsync method.")]
@ -32,9 +32,9 @@ namespace Volo.Abp.Data
{
return Options.ConnectionStrings.Default;
}
var connectionString = Options.GetConnectionStringOrNull(connectionStringName);
if (!connectionString.IsNullOrEmpty())
{
return connectionString;
@ -43,4 +43,4 @@ namespace Volo.Abp.Data
return null;
}
}
}
}

@ -8,9 +8,9 @@ namespace Volo.Abp.Http.Client
{
protected AbpRemoteServiceOptions Options { get; }
public RemoteServiceConfigurationProvider(IOptionsSnapshot<AbpRemoteServiceOptions> options)
public RemoteServiceConfigurationProvider(IOptionsMonitor<AbpRemoteServiceOptions> options)
{
Options = options.Value;
Options = options.CurrentValue;
}
public Task<RemoteServiceConfiguration> GetConfigurationOrDefaultAsync(string name)
@ -23,4 +23,4 @@ namespace Volo.Abp.Http.Client
return Task.FromResult(Options.RemoteServices.GetConfigurationOrDefaultOrNull(name));
}
}
}
}

@ -11,9 +11,9 @@ namespace Volo.Abp.MultiTenancy.ConfigurationStore
{
private readonly AbpDefaultTenantStoreOptions _options;
public DefaultTenantStore(IOptionsSnapshot<AbpDefaultTenantStoreOptions> options)
public DefaultTenantStore(IOptionsMonitor<AbpDefaultTenantStoreOptions> options)
{
_options = options.Value;
_options = options.CurrentValue;
}
public Task<TenantConfiguration> FindAsync(string name)
@ -36,4 +36,4 @@ namespace Volo.Abp.MultiTenancy.ConfigurationStore
return _options.Tenants?.FirstOrDefault(t => t.Id == id);
}
}
}
}

@ -15,7 +15,7 @@ namespace Volo.Abp.MultiTenancy
private readonly IServiceProvider _serviceProvider;
public MultiTenantConnectionStringResolver(
IOptionsSnapshot<AbpDbConnectionOptions> options,
IOptionsMonitor<AbpDbConnectionOptions> options,
ICurrentTenant currentTenant,
IServiceProvider serviceProvider)
: base(options)

@ -12,9 +12,9 @@ namespace Volo.Abp.Sms.Aliyun
{
protected AbpAliyunSmsOptions Options { get; }
public AliyunSmsSender(IOptionsSnapshot<AbpAliyunSmsOptions> options)
public AliyunSmsSender(IOptionsMonitor<AbpAliyunSmsOptions> options)
{
Options = options.Value;
Options = options.CurrentValue;
}
public async Task SendAsync(SmsMessage smsMessage)
@ -40,4 +40,4 @@ namespace Volo.Abp.Sms.Aliyun
});
}
}
}
}

Loading…
Cancel
Save