Nell/eShopOnWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some invalid changes

Browse Source
This commit is contained in:
zedy
2022-12-15 14:29:40 +08:00
parent 9e821608a1
commit d4950760f2
4 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Infrastructure/Dependencies.cs
View File

@@ -3,9 +3,6 @@ using Microsoft.eShopWeb.Infrastructure.Data;
using Microsoft.eShopWeb.Infrastructure.Identity;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Azure.Security.KeyVault.Secrets;
using Azure.Identity;
using System;
namespace Microsoft.eShopWeb.Infrastructure;
@@ -14,11 +11,6 @@ public static class Dependencies
public static void ConfigureServices(IConfiguration configuration, IServiceCollection services)
{
var useOnlyInMemoryDatabase = false;
string keyVaultUri = configuration["AZURE_KEY_VAULT_ENDPOINT"];
string catalogConnectionStringKey = configuration["AZURE_CATALOG_CONNECTION_STRING_KEY"];
string identityConnectionStringKey = configuration["AZURE_IDENTITY_CONNECTION_STRING_KEY"];
string catalogConnectionStringValue = GetSqlConnectString(keyVaultUri, catalogConnectionStringKey);
string identityConnectionStringValue = GetSqlConnectString(keyVaultUri, identityConnectionStringKey);
if (configuration["UseOnlyInMemoryDatabase"] != null)
{
@@ -39,24 +31,11 @@ public static class Dependencies
// Requires LocalDB which can be installed with SQL Server Express 2016
// https://www.microsoft.com/en-us/download/details.aspx?id=54284
services.AddDbContext<CatalogContext>(c =>
c.UseSqlServer(catalogConnectionStringValue));
c.UseSqlServer(configuration.GetConnectionString("CatalogConnection")));
// Add Identity DbContext
services.AddDbContext<AppIdentityDbContext>(options =>
options.UseSqlServer(identityConnectionStringValue));
options.UseSqlServer(configuration.GetConnectionString("IdentityConnection")));
}
}
public static string GetSqlConnectString(string keyVaultUri, string connectionStringKey)
{
if (connectionStringKey == null)
{
return "";
}
var secretClient = new SecretClient(new Uri(keyVaultUri), new ClientSecretCredential("<tenant_id>","<client_id>","<client_secret>"));
KeyVaultSecret secret = secretClient.GetSecret(connectionStringKey);
string secretValue = secret.Value;
return secretValue;
}
}

2
src/Infrastructure/Infrastructure.csproj
View File

@@ -8,8 +8,6 @@
<ItemGroup>
<PackageReference Include="Ardalis.Specification.EntityFrameworkCore" Version="6.1.0" />
<PackageReference Include="Azure.Identity" Version="1.5.0" />
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.4.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.8" />