paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

about to cleanup

Browse Source
This commit is contained in:
Paul Schneider
2021-01-03 21:54:10 +00:00
parent 37263c12f3
commit a66ecdbd26
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Yavsc/Startup/Startup.DataProtection.cs
View File

@ -24,7 +24,7 @@ namespace Yavsc
new DirectoryInfo(Configuration["DataProtection:Keys:Dir"])); new DirectoryInfo(Configuration["DataProtection:Keys:Dir"]));
}); });
} }
private sealed class SystemWebApplicationDiscriminator : IApplicationDiscriminator public sealed class SystemWebApplicationDiscriminator : IApplicationDiscriminator
{ {
private readonly Lazy<string> _lazyDiscriminator = new Lazy<string>(GetAppDiscriminatorCore); private readonly Lazy<string> _lazyDiscriminator = new Lazy<string>(GetAppDiscriminatorCore);

12
src/Yavsc/Startup/Startup.cs
View File

@ -56,8 +56,6 @@ namespace Yavsc
public static PayPalSettings PayPalSettings { get; private set; } public static PayPalSettings PayPalSettings { get; private set; }
private static ILogger _logger; private static ILogger _logger;
static ILiveProcessor _liveProcessor;
/// <summary> /// <summary>
/// generating reset password and confirmation tokens /// generating reset password and confirmation tokens
/// </summary> /// </summary>
@ -144,7 +142,6 @@ namespace Yavsc
services.Add(ServiceDescriptor.Singleton(typeof(IOptions<GoogleAuthSettings>), typeof(OptionsManager<GoogleAuthSettings>))); services.Add(ServiceDescriptor.Singleton(typeof(IOptions<GoogleAuthSettings>), typeof(OptionsManager<GoogleAuthSettings>)));
services.Add(ServiceDescriptor.Singleton(typeof(IOptions<CompanyInfoSettings>), typeof(OptionsManager<CompanyInfoSettings>))); services.Add(ServiceDescriptor.Singleton(typeof(IOptions<CompanyInfoSettings>), typeof(OptionsManager<CompanyInfoSettings>)));
services.Add(ServiceDescriptor.Singleton(typeof(IOptions<RequestLocalizationOptions>), typeof(OptionsManager<RequestLocalizationOptions>))); services.Add(ServiceDescriptor.Singleton(typeof(IOptions<RequestLocalizationOptions>), typeof(OptionsManager<RequestLocalizationOptions>)));
services.Add(ServiceDescriptor.Singleton(typeof(IDiskUsageTracker), typeof(DiskUsageTracker))); services.Add(ServiceDescriptor.Singleton(typeof(IDiskUsageTracker), typeof(DiskUsageTracker)));
services.Configure<RequestLocalizationOptions>(options => services.Configure<RequestLocalizationOptions>(options =>
@ -296,14 +293,11 @@ namespace Yavsc
IOptions<GoogleAuthSettings> googleSettings, IOptions<GoogleAuthSettings> googleSettings,
IStringLocalizer<Yavsc.YavscLocalisation> localizer, IStringLocalizer<Yavsc.YavscLocalisation> localizer,
UserManager<ApplicationUser> usermanager, UserManager<ApplicationUser> usermanager,
ILiveProcessor liveProcessor,
ILoggerFactory loggerFactory) ILoggerFactory loggerFactory)
{ {
Services = app.ApplicationServices; Services = app.ApplicationServices;
_dbContext = dbContext; _dbContext = dbContext;
_usermanager = usermanager; _usermanager = usermanager;
_liveProcessor = liveProcessor;
GoogleSettings = googleSettings.Value; GoogleSettings = googleSettings.Value;
ResourcesHelpers.GlobalLocalizer = localizer; ResourcesHelpers.GlobalLocalizer = localizer;
SiteSetup = siteSettings.Value; SiteSetup = siteSettings.Value;
@ -433,6 +427,9 @@ namespace Yavsc
template: "{controller=Home}/{action=Index}/{id?}"); template: "{controller=Home}/{action=Index}/{id?}");
}); });
_logger.LogInformation("LocalApplicationData: " + Environment.GetFolderPath(SpecialFolder.LocalApplicationData, SpecialFolderOption.DoNotVerify)); _logger.LogInformation("LocalApplicationData: " + Environment.GetFolderPath(SpecialFolder.LocalApplicationData, SpecialFolderOption.DoNotVerify));
#if EXPERIMENTAL
app.Use(async (context, next) => app.Use(async (context, next) =>
{ {
const string livePath = "live"; const string livePath = "live";
@ -499,6 +496,9 @@ namespace Yavsc
} }
}); });
#endif
// FIXME // FIXME
app.UseStatusCodePages(); app.UseStatusCodePages();