nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-04 01:22:50 -05:00
Code Activity

upgrade to aspnet core 3.1

Browse Source
This commit is contained in:
Kyle Spearrin
2020-01-10 08:33:13 -05:00
parent 8026912eeb
commit 29580684a3
60 changed files with 429 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Utilities/CoreHelpers.cs
View File

@ -16,7 +16,8 @@ using System.Web;
using Microsoft.AspNetCore.DataProtection;
using Bit.Core.Enums;
using System.Threading.Tasks;
using Microsoft.WindowsAzure.Storage;
using Microsoft.Azure.Storage;
using Microsoft.Azure.Storage.Blob;
namespace Bit.Core.Utilities
{

5
src/Core/Utilities/LoggerFactoryExtensions.cs
View File

@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Serilog;
using Serilog.Events;
@ -12,8 +13,8 @@ namespace Bit.Core.Utilities
{
public static void UseSerilog(
this IApplicationBuilder appBuilder,
IHostingEnvironment env,
IApplicationLifetime applicationLifetime,
IWebHostEnvironment env,
IHostApplicationLifetime applicationLifetime,
GlobalSettings globalSettings)
{
if(env.IsDevelopment())

36
src/Core/Utilities/ServiceCollectionExtensions.cs
View File

@ -15,7 +15,6 @@ using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.AspNetCore.Http;
using Microsoft.WindowsAzure.Storage;
using System;
using System.IO;
using SqlServerRepos = Bit.Core.Repositories.SqlServer;
@ -34,6 +33,9 @@ using System.Security.Cryptography.X509Certificates;
using Bit.Core.Utilities;
using Serilog.Context;
using AutoMapper;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Hosting;
using Microsoft.Azure.Storage;
namespace Bit.Core.Utilities
{
@ -41,11 +43,22 @@ namespace Bit.Core.Utilities
{
public static void AddSqlServerRepositories(this IServiceCollection services, GlobalSettings globalSettings)
{
if(!string.IsNullOrWhiteSpace(globalSettings.PostgreSql?.ConnectionString))
var usePostgreSql = !string.IsNullOrWhiteSpace(globalSettings.PostgreSql?.ConnectionString);
var useEf = usePostgreSql;
if(useEf)
{
services.AddAutoMapper(typeof(EntityFrameworkRepos.UserRepository));
services.AddDbContext<EntityFrameworkRepos.DatabaseContext>();
services.AddDbContext<EntityFrameworkRepos.DatabaseContext>(options =>
{
if(usePostgreSql)
{
options.UseNpgsql(globalSettings.PostgreSql.ConnectionString);
}
});
services.AddSingleton<IUserRepository, EntityFrameworkRepos.UserRepository>();
//services.AddSingleton<ICipherRepository, EntityFrameworkRepos.CipherRepository>();
//services.AddSingleton<IOrganizationRepository, EntityFrameworkRepos.OrganizationRepository>();
}
else
{
@ -67,7 +80,14 @@ namespace Bit.Core.Utilities
if(globalSettings.SelfHosted)
{
services.AddSingleton<IEventRepository, SqlServerRepos.EventRepository>();
if(useEf)
{
// TODO
}
else
{
services.AddSingleton<IEventRepository, SqlServerRepos.EventRepository>();
}
services.AddSingleton<IInstallationDeviceRepository, NoopRepos.InstallationDeviceRepository>();
services.AddSingleton<IMetaDataRepository, NoopRepos.MetaDataRepository>();
}
@ -283,7 +303,7 @@ namespace Bit.Core.Utilities
}
public static void AddIdentityAuthenticationServices(
this IServiceCollection services, GlobalSettings globalSettings, IHostingEnvironment environment,
this IServiceCollection services, GlobalSettings globalSettings, IWebHostEnvironment environment,
Action<AuthorizationOptions> addAuthorization)
{
services
@ -313,7 +333,7 @@ namespace Bit.Core.Utilities
}
public static IIdentityServerBuilder AddCustomIdentityServerServices(
this IServiceCollection services, IHostingEnvironment env, GlobalSettings globalSettings)
this IServiceCollection services, IWebHostEnvironment env, GlobalSettings globalSettings)
{
var issuerUri = new Uri(globalSettings.BaseServiceUri.InternalIdentity);
var identityServerBuilder = services
@ -373,7 +393,7 @@ namespace Bit.Core.Utilities
}
public static void AddCustomDataProtectionServices(
this IServiceCollection services, IHostingEnvironment env, GlobalSettings globalSettings)
this IServiceCollection services, IWebHostEnvironment env, GlobalSettings globalSettings)
{
if(env.IsDevelopment())
{
@ -417,7 +437,7 @@ namespace Bit.Core.Utilities
}
public static void UseDefaultMiddleware(this IApplicationBuilder app,
IHostingEnvironment env, GlobalSettings globalSettings)
IWebHostEnvironment env, GlobalSettings globalSettings)
{
string GetHeaderValue(HttpContext httpContext, string header)
{