Browse Source
Merge pull request #13 from dotnet-architecture/dev
PR to merge into skynode dev branchpull/391/head
Dexter Valkyrie
7 years ago
committed by
GitHub
GitHub
95 changed files with 1374 additions and 1509 deletions
Unified View
Diff Options
-
+55 -1eShopOnContainers-ServicesAndWebApps.sln
-
+60 -54eShopOnContainers.sln
-
BINimg/sf/cloud-config-idsrv.PNG
-
BINimg/sf/cloud-config-mvc.PNG
-
BINimg/sf/cloud-config-spa.PNG
-
BINimg/sf/cloud-config.PNG
-
BINimg/sf/explorer-apps-status.PNG
-
BINimg/sf/explorer-deployment-status.PNG
-
BINimg/sf/publish-button.PNG
-
BINimg/sf/publish-window.PNG
-
BINimg/sf/sf-directory.PNG
-
+11 -0src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj
-
+40 -0src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs
-
+0 -0src/Services/Basket/Basket.API/Model/CustomerBasket.cs
-
+1 -0src/Services/Catalog/Catalog.API/Catalog.API.csproj
-
+13 -0src/Services/Catalog/Catalog.API/Infrastructure/CatalogContext.cs
-
+62 -60src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
-
+18 -2src/Services/Catalog/Catalog.API/Program.cs
-
+7 -42src/Services/Catalog/Catalog.API/Startup.cs
-
+2 -6src/Services/Identity/Identity.API/AppSettings.cs
-
+2 -5src/Services/Identity/Identity.API/Certificate/Certificate.cs
-
+1 -1src/Services/Identity/Identity.API/Configuration/Config.cs
-
+28 -24src/Services/Identity/Identity.API/Controllers/AccountController.cs
-
+4 -10src/Services/Identity/Identity.API/Controllers/ConsentController.cs
-
+4 -8src/Services/Identity/Identity.API/Controllers/HomeController.cs
-
+3 -7src/Services/Identity/Identity.API/Data/ApplicationDbContext.cs
-
+37 -52src/Services/Identity/Identity.API/Data/ApplicationDbContextSeed.cs
-
+56 -0src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs
-
+0 -242src/Services/Identity/Identity.API/Data/Migrations/20161019122215_Init_Scheme.Designer.cs
-
+0 -33src/Services/Identity/Identity.API/Data/Migrations/20161020101725_extendProfile.cs
-
+1 -1src/Services/Identity/Identity.API/Dockerfile
-
+1 -1src/Services/Identity/Identity.API/Extensions/LinqSelectExtensions.cs
-
+10 -32src/Services/Identity/Identity.API/Identity.API.csproj
-
+0 -40src/Services/Identity/Identity.API/Migrations/20170604151240_Init-persisted-grant.cs
-
+130 -113src/Services/Identity/Identity.API/Migrations/20170912114036_Initial.Designer.cs
-
+78 -72src/Services/Identity/Identity.API/Migrations/20170912114036_Initial.cs
-
+128 -111src/Services/Identity/Identity.API/Migrations/ApplicationDbContextModelSnapshot.cs
-
+55 -8src/Services/Identity/Identity.API/Migrations/ConfigurationDb/20170912114152_Initial.Designer.cs
-
+146 -112src/Services/Identity/Identity.API/Migrations/ConfigurationDb/20170912114152_Initial.cs
-
+53 -6src/Services/Identity/Identity.API/Migrations/ConfigurationDb/ConfigurationDbContextModelSnapshot.cs
-
+10 -6src/Services/Identity/Identity.API/Migrations/PersistedGrantDb/20170912114120_Initial.Designer.cs
-
+40 -0src/Services/Identity/Identity.API/Migrations/PersistedGrantDb/20170912114120_Initial.cs
-
+8 -4src/Services/Identity/Identity.API/Migrations/PersistedGrantDb/PersistedGrantDbContextModelSnapshot.cs
-
+2 -6src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentInputModel.cs
-
+2 -4src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentViewModel.cs
-
+2 -6src/Services/Identity/Identity.API/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs
-
+2 -6src/Services/Identity/Identity.API/Models/AccountViewModels/ForgotPasswordViewModel.cs
-
+1 -5src/Services/Identity/Identity.API/Models/AccountViewModels/LoggedOutViewModel.cs
-
+2 -6src/Services/Identity/Identity.API/Models/AccountViewModels/LoginViewModel.cs
-
+1 -5src/Services/Identity/Identity.API/Models/AccountViewModels/LogoutViewModel.cs
-
+2 -6src/Services/Identity/Identity.API/Models/AccountViewModels/RegisterViewModel.cs
-
+2 -6src/Services/Identity/Identity.API/Models/AccountViewModels/ResetPasswordViewModel.cs
-
+2 -5src/Services/Identity/Identity.API/Models/AccountViewModels/SendCodeViewModel.cs
-
+2 -6src/Services/Identity/Identity.API/Models/AccountViewModels/VerifyCodeViewModel.cs
-
+0 -20src/Services/Identity/Identity.API/Models/AccountViewModels/_LoginViewModel.cs
-
+2 -6src/Services/Identity/Identity.API/Models/ApplicationUser.cs
-
+1 -1src/Services/Identity/Identity.API/Models/ErrorViewModel.cs
-
+2 -6src/Services/Identity/Identity.API/Models/ManageViewModels/AddPhoneNumberViewModel.cs
-
+2 -6src/Services/Identity/Identity.API/Models/ManageViewModels/ChangePasswordViewModel.cs
-
+2 -5src/Services/Identity/Identity.API/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs
-
+1 -6src/Services/Identity/Identity.API/Models/ManageViewModels/FactorViewModel.cs
-
+2 -5src/Services/Identity/Identity.API/Models/ManageViewModels/IndexViewModel.cs
-
+3 -6src/Services/Identity/Identity.API/Models/ManageViewModels/ManageLoginsViewModel.cs
-
+1 -7src/Services/Identity/Identity.API/Models/ManageViewModels/RemoveLoginViewModel.cs
-
+2 -6src/Services/Identity/Identity.API/Models/ManageViewModels/SetPasswordViewModel.cs
-
+2 -6src/Services/Identity/Identity.API/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs
-
+40 -6src/Services/Identity/Identity.API/Program.cs
-
+3 -6src/Services/Identity/Identity.API/Services/EFLoginService.cs
-
+2 -5src/Services/Identity/Identity.API/Services/IEmailSender.cs
-
+2 -5src/Services/Identity/Identity.API/Services/ILoginService.cs
-
+1 -6src/Services/Identity/Identity.API/Services/IRedirectService.cs
-
+2 -5src/Services/Identity/Identity.API/Services/ISmsSender.cs
-
+2 -5src/Services/Identity/Identity.API/Services/MessageServices.cs
-
+7 -7src/Services/Identity/Identity.API/Services/ProfileService.cs
-
+2 -6src/Services/Identity/Identity.API/Services/RedirectService.cs
-
+22 -92src/Services/Identity/Identity.API/Startup.cs
-
+1 -1src/Services/Identity/Identity.API/Views/Account/LoggedOut.cshtml
-
+1 -1src/Services/Identity/Identity.API/Views/Account/Login.cshtml
-
+1 -1src/Services/Identity/Identity.API/Views/Account/Logout.cshtml
-
+1 -2src/Services/Identity/Identity.API/Views/Account/Register.cshtml
-
+1 -1src/Services/Identity/Identity.API/Views/Consent/Index.cshtml
-
+1 -1src/Services/Identity/Identity.API/Views/Consent/_ScopeListItem.cshtml
-
+1 -1src/Services/Identity/Identity.API/Views/Shared/Error.cshtml
-
+12 -0src/Services/Marketing/Marketing.API/Infrastructure/MarketingContext.cs
-
+27 -14src/Services/Marketing/Marketing.API/Infrastructure/MarketingContextSeed.cs
-
+3 -0src/Services/Marketing/Marketing.API/Infrastructure/MarketingReadDataContext.cs
-
+1 -0src/Services/Marketing/Marketing.API/Marketing.API.csproj
-
+12 -1src/Services/Marketing/Marketing.API/Program.cs
-
+8 -32src/Services/Marketing/Marketing.API/Startup.cs
-
+57 -43src/Services/Ordering/Ordering.API/Infrastructure/OrderingContextSeed.cs
-
+0 -29src/Services/Ordering/Ordering.API/Infrastructure/OrderingDbContextDesigner.cs
-
+1 -0src/Services/Ordering/Ordering.API/Ordering.API.csproj
-
+18 -1src/Services/Ordering/Ordering.API/Program.cs
-
+9 -36src/Services/Ordering/Ordering.API/Startup.cs
-
+32 -8src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs
+ 55
- 1
eShopOnContainers-ServicesAndWebApps.sln
View File
+ 60
- 54
eShopOnContainers.sln
View File
BIN
img/sf/cloud-config-idsrv.PNG
View File
| Before | After |
|---|---|
|
|
| Width: 1140 | Height: 315 | Size: 46 KiB |
BIN
img/sf/cloud-config-mvc.PNG
View File
| Before | After |
|---|---|
|
|
| Width: 1138 | Height: 328 | Size: 31 KiB |
BIN
img/sf/cloud-config-spa.PNG
View File
| Before | After |
|---|---|
|
|
| Width: 1136 | Height: 351 | Size: 43 KiB |
BIN
img/sf/cloud-config.PNG
View File
| Before | After |
|---|---|
|
|
| Width: 1154 | Height: 428 | Size: 53 KiB |
BIN
img/sf/explorer-apps-status.PNG
View File
| Before | After |
|---|---|
|
|
| Width: 1786 | Height: 406 | Size: 45 KiB |
BIN
img/sf/explorer-deployment-status.PNG
View File
| Before | After |
|---|---|
|
|
| Width: 1772 | Height: 940 | Size: 101 KiB |
BIN
img/sf/publish-button.PNG
View File
| Before | After |
|---|---|
|
|
| Width: 343 | Height: 319 | Size: 12 KiB |
BIN
img/sf/publish-window.PNG
View File
| Before | After |
|---|---|
|
|
| Width: 630 | Height: 428 | Size: 16 KiB |
BIN
img/sf/sf-directory.PNG
View File
| Before | After |
|---|---|
|
|
| Width: 371 | Height: 239 | Size: 8.4 KiB |
+ 11
- 0
src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj
View File
| @ -0,0 +1,11 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk"> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.0</TargetFramework> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" /> | |||||
| </ItemGroup> | |||||
| </Project> | |||||
+ 40
- 0
src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs
View File
| @ -0,0 +1,40 @@ | |||||
| using Microsoft.EntityFrameworkCore; | |||||
| using Microsoft.Extensions.DependencyInjection; | |||||
| using Microsoft.Extensions.Logging; | |||||
| using System; | |||||
| namespace Microsoft.AspNetCore.Hosting | |||||
| { | |||||
| public static class IWebHostExtensions | |||||
| { | |||||
| public static IWebHost MigrateDbContext<TContext>(this IWebHost webHost, Action<TContext,IServiceProvider> seeder) where TContext : DbContext | |||||
| { | |||||
| using (var scope = webHost.Services.CreateScope()) | |||||
| { | |||||
| var services = scope.ServiceProvider; | |||||
| var logger = services.GetRequiredService<ILogger<TContext>>(); | |||||
| var context = services.GetService<TContext>(); | |||||
| try | |||||
| { | |||||
| logger.LogInformation($"Migrating database associated with context {typeof(TContext).Name}"); | |||||
| context.Database | |||||
| .Migrate(); | |||||
| seeder(context,services); | |||||
| logger.LogInformation($"Migrated database associated with context {typeof(TContext).Name}"); | |||||
| } | |||||
| catch (Exception ex) | |||||
| { | |||||
| logger.LogError(ex, $"An error occurred while migrating the database used on context {typeof(TContext).Name}"); | |||||
| } | |||||
| } | |||||
| return webHost; | |||||
| } | |||||
| } | |||||
| } | |||||
src/Services/Basket/Basket.API/Model/Basket.cs → src/Services/Basket/Basket.API/Model/CustomerBasket.cs
View File
+ 1
- 0
src/Services/Catalog/Catalog.API/Catalog.API.csproj
View File
+ 13
- 0
src/Services/Catalog/Catalog.API/Infrastructure/CatalogContext.cs
View File
+ 62
- 60
src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
View File
+ 18
- 2
src/Services/Catalog/Catalog.API/Program.cs
View File
+ 7
- 42
src/Services/Catalog/Catalog.API/Startup.cs
View File
+ 2
- 6
src/Services/Identity/Identity.API/AppSettings.cs
View File
| @ -1,13 +1,9 @@ | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using System.Linq; | |||||
| using System.Threading.Tasks; | |||||
| namespace eShopOnContainers.Identity | |||||
| namespace Microsoft.eShopOnContainers.Services.Identity.API | |||||
| { | { | ||||
| public class AppSettings | public class AppSettings | ||||
| { | { | ||||
| public string MvcClient { get; set; } | public string MvcClient { get; set; } | ||||
| public bool UseCustomizationData { get; set; } | public bool UseCustomizationData { get; set; } | ||||
| } | } | ||||
| } | } | ||||
+ 2
- 5
src/Services/Identity/Identity.API/Certificate/Certificate.cs
View File
+ 1
- 1
src/Services/Identity/Identity.API/Configuration/Config.cs
View File
+ 28
- 24
src/Services/Identity/Identity.API/Controllers/AccountController.cs
View File
+ 4
- 10
src/Services/Identity/Identity.API/Controllers/ConsentController.cs
View File
+ 4
- 8
src/Services/Identity/Identity.API/Controllers/HomeController.cs
View File
+ 3
- 7
src/Services/Identity/Identity.API/Data/ApplicationDbContext.cs
View File
src/Services/Identity/Identity.API/Data/ApplicationContextSeed.cs → src/Services/Identity/Identity.API/Data/ApplicationDbContextSeed.cs
View File
+ 56
- 0
src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs
View File
| @ -0,0 +1,56 @@ | |||||
| using IdentityServer4.EntityFramework.DbContexts; | |||||
| using IdentityServer4.EntityFramework.Mappers; | |||||
| using Microsoft.eShopOnContainers.Services.Identity.API.Configuration; | |||||
| using Microsoft.Extensions.Configuration; | |||||
| using System.Collections.Generic; | |||||
| using System.Linq; | |||||
| using System.Threading.Tasks; | |||||
| namespace Microsoft.eShopOnContainers.Services.Identity.API.Data | |||||
| { | |||||
| public class ConfigurationDbContextSeed | |||||
| { | |||||
| public async Task SeedAsync(ConfigurationDbContext context,IConfiguration configuration) | |||||
| { | |||||
| //callbacks urls from config: | |||||
| var clientUrls = new Dictionary<string, string>(); | |||||
| clientUrls.Add("Mvc", configuration.GetValue<string>("MvcClient")); | |||||
| clientUrls.Add("Spa", configuration.GetValue<string>("SpaClient")); | |||||
| clientUrls.Add("Xamarin", configuration.GetValue<string>("XamarinCallback")); | |||||
| clientUrls.Add("LocationsApi", configuration.GetValue<string>("LocationApiClient")); | |||||
| clientUrls.Add("MarketingApi", configuration.GetValue<string>("MarketingApiClient")); | |||||
| clientUrls.Add("BasketApi", configuration.GetValue<string>("BasketApiClient")); | |||||
| clientUrls.Add("OrderingApi", configuration.GetValue<string>("OrderingApiClient")); | |||||
| if (!context.Clients.Any()) | |||||
| { | |||||
| foreach (var client in Config.GetClients(clientUrls)) | |||||
| { | |||||
| await context.Clients.AddAsync(client.ToEntity()); | |||||
| } | |||||
| await context.SaveChangesAsync(); | |||||
| } | |||||
| if (!context.IdentityResources.Any()) | |||||
| { | |||||
| foreach (var resource in Config.GetResources()) | |||||
| { | |||||
| await context.IdentityResources.AddAsync(resource.ToEntity()); | |||||
| } | |||||
| await context.SaveChangesAsync(); | |||||
| } | |||||
| if (!context.ApiResources.Any()) | |||||
| { | |||||
| foreach (var api in Config.GetApis()) | |||||
| { | |||||
| await context.ApiResources.AddAsync(api.ToEntity()); | |||||
| } | |||||
| await context.SaveChangesAsync(); | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
+ 0
- 242
src/Services/Identity/Identity.API/Data/Migrations/20161019122215_Init_Scheme.Designer.cs
View File
| @ -1,242 +0,0 @@ | |||||
| using System; | |||||
| using Microsoft.EntityFrameworkCore; | |||||
| using Microsoft.EntityFrameworkCore.Infrastructure; | |||||
| using Microsoft.EntityFrameworkCore.Metadata; | |||||
| using Microsoft.EntityFrameworkCore.Migrations; | |||||
| using Identity.API.Data; | |||||
| namespace WebMVC.Migrations | |||||
| { | |||||
| [DbContext(typeof(ApplicationDbContext))] | |||||
| [Migration("20161019122215_Init_Scheme")] | |||||
| partial class Init_Scheme | |||||
| { | |||||
| protected override void BuildTargetModel(ModelBuilder modelBuilder) | |||||
| { | |||||
| modelBuilder | |||||
| .HasAnnotation("ProductVersion", "1.0.0-rtm-21431") | |||||
| .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); | |||||
| modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole", b => | |||||
| { | |||||
| b.Property<string>("Id"); | |||||
| b.Property<string>("ConcurrencyStamp") | |||||
| .IsConcurrencyToken(); | |||||
| b.Property<string>("Name") | |||||
| .HasAnnotation("MaxLength", 256); | |||||
| b.Property<string>("NormalizedName") | |||||
| .HasAnnotation("MaxLength", 256); | |||||
| b.HasKey("Id"); | |||||
| b.HasIndex("NormalizedName") | |||||
| .HasName("RoleNameIndex"); | |||||
| b.ToTable("AspNetRoles"); | |||||
| }); | |||||
| modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim<string>", b => | |||||
| { | |||||
| b.Property<int>("Id") | |||||
| .ValueGeneratedOnAdd(); | |||||
| b.Property<string>("ClaimType"); | |||||
| b.Property<string>("ClaimValue"); | |||||
| b.Property<string>("RoleId") | |||||
| .IsRequired(); | |||||
| b.HasKey("Id"); | |||||
| b.HasIndex("RoleId"); | |||||
| b.ToTable("AspNetRoleClaims"); | |||||
| }); | |||||
| modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<string>", b => | |||||
| { | |||||
| b.Property<int>("Id") | |||||
| .ValueGeneratedOnAdd(); | |||||
| b.Property<string>("ClaimType"); | |||||
| b.Property<string>("ClaimValue"); | |||||
| b.Property<string>("UserId") | |||||
| .IsRequired(); | |||||
| b.HasKey("Id"); | |||||
| b.HasIndex("UserId"); | |||||
| b.ToTable("AspNetUserClaims"); | |||||
| }); | |||||
| modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<string>", b => | |||||
| { | |||||
| b.Property<string>("LoginProvider"); | |||||
| b.Property<string>("ProviderKey"); | |||||
| b.Property<string>("ProviderDisplayName"); | |||||
| b.Property<string>("UserId") | |||||
| .IsRequired(); | |||||
| b.HasKey("LoginProvider", "ProviderKey"); | |||||
| b.HasIndex("UserId"); | |||||
| b.ToTable("AspNetUserLogins"); | |||||
| }); | |||||
| modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<string>", b => | |||||
| { | |||||
| b.Property<string>("UserId"); | |||||
| b.Property<string>("RoleId"); | |||||
| b.HasKey("UserId", "RoleId"); | |||||
| b.HasIndex("RoleId"); | |||||
| b.HasIndex("UserId"); | |||||
| b.ToTable("AspNetUserRoles"); | |||||
| }); | |||||
| modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserToken<string>", b => | |||||
| { | |||||
| b.Property<string>("UserId"); | |||||
| b.Property<string>("LoginProvider"); | |||||
| b.Property<string>("Name"); | |||||
| b.Property<string>("Value"); | |||||
| b.HasKey("UserId", "LoginProvider", "Name"); | |||||
| b.ToTable("AspNetUserTokens"); | |||||
| }); | |||||
| modelBuilder.Entity("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser", b => | |||||
| { | |||||
| b.Property<string>("Id"); | |||||
| b.Property<int>("AccessFailedCount"); | |||||
| b.Property<string>("CardHolderName"); | |||||
| b.Property<string>("CardNumber"); | |||||
| b.Property<int>("CardType"); | |||||
| b.Property<string>("City"); | |||||
| b.Property<string>("ConcurrencyStamp") | |||||
| .IsConcurrencyToken(); | |||||
| b.Property<string>("Country"); | |||||
| b.Property<string>("CountryCode"); | |||||
| b.Property<string>("Email") | |||||
| .HasAnnotation("MaxLength", 256); | |||||
| b.Property<bool>("EmailConfirmed"); | |||||
| b.Property<string>("Expiration"); | |||||
| b.Property<double>("Latitude"); | |||||
| b.Property<bool>("LockoutEnabled"); | |||||
| b.Property<DateTimeOffset?>("LockoutEnd"); | |||||
| b.Property<double>("Longitude"); | |||||
| b.Property<string>("NormalizedEmail") | |||||
| .HasAnnotation("MaxLength", 256); | |||||
| b.Property<string>("NormalizedUserName") | |||||
| .HasAnnotation("MaxLength", 256); | |||||
| b.Property<string>("PasswordHash"); | |||||
| b.Property<string>("PhoneNumber"); | |||||
| b.Property<bool>("PhoneNumberConfirmed"); | |||||
| b.Property<string>("SecurityNumber"); | |||||
| b.Property<string>("SecurityStamp"); | |||||
| b.Property<string>("State"); | |||||
| b.Property<string>("StateCode"); | |||||
| b.Property<string>("Street"); | |||||
| b.Property<bool>("TwoFactorEnabled"); | |||||
| b.Property<string>("UserName") | |||||
| .HasAnnotation("MaxLength", 256); | |||||
| b.Property<string>("ZipCode"); | |||||
| b.HasKey("Id"); | |||||
| b.HasIndex("NormalizedEmail") | |||||
| .HasName("EmailIndex"); | |||||
| b.HasIndex("NormalizedUserName") | |||||
| .IsUnique() | |||||
| .HasName("UserNameIndex"); | |||||
| b.ToTable("AspNetUsers"); | |||||
| }); | |||||
| modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim<string>", b => | |||||
| { | |||||
| b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") | |||||
| .WithMany("Claims") | |||||
| .HasForeignKey("RoleId") | |||||
| .OnDelete(DeleteBehavior.Cascade); | |||||
| }); | |||||
| modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<string>", b => | |||||
| { | |||||
| b.HasOne("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser") | |||||
| .WithMany("Claims") | |||||
| .HasForeignKey("UserId") | |||||
| .OnDelete(DeleteBehavior.Cascade); | |||||
| }); | |||||
| modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<string>", b => | |||||
| { | |||||
| b.HasOne("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser") | |||||
| .WithMany("Logins") | |||||
| .HasForeignKey("UserId") | |||||
| .OnDelete(DeleteBehavior.Cascade); | |||||
| }); | |||||
| modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<string>", b => | |||||
| { | |||||
| b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") | |||||
| .WithMany("Users") | |||||
| .HasForeignKey("RoleId") | |||||
| .OnDelete(DeleteBehavior.Cascade); | |||||
| b.HasOne("Microsoft.eShopOnContainers.WebMVC.ViewModels.ApplicationUser") | |||||
| .WithMany("Roles") | |||||
| .HasForeignKey("UserId") | |||||
| .OnDelete(DeleteBehavior.Cascade); | |||||
| }); | |||||
| } | |||||
| } | |||||
| } | |||||
+ 0
- 33
src/Services/Identity/Identity.API/Data/Migrations/20161020101725_extendProfile.cs
View File
| @ -1,33 +0,0 @@ | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using Microsoft.EntityFrameworkCore.Migrations; | |||||
| namespace WebMVC.Migrations | |||||
| { | |||||
| public partial class extendProfile : Migration | |||||
| { | |||||
| protected override void Up(MigrationBuilder migrationBuilder) | |||||
| { | |||||
| migrationBuilder.AddColumn<string>( | |||||
| name: "LastName", | |||||
| table: "AspNetUsers", | |||||
| nullable: true); | |||||
| migrationBuilder.AddColumn<string>( | |||||
| name: "Name", | |||||
| table: "AspNetUsers", | |||||
| nullable: true); | |||||
| } | |||||
| protected override void Down(MigrationBuilder migrationBuilder) | |||||
| { | |||||
| migrationBuilder.DropColumn( | |||||
| name: "LastName", | |||||
| table: "AspNetUsers"); | |||||
| migrationBuilder.DropColumn( | |||||
| name: "Name", | |||||
| table: "AspNetUsers"); | |||||
| } | |||||
| } | |||||
| } | |||||
+ 1
- 1
src/Services/Identity/Identity.API/Dockerfile
View File
+ 1
- 1
src/Services/Identity/Identity.API/Extensions/LinqSelectExtensions.cs
View File
+ 10
- 32
src/Services/Identity/Identity.API/Identity.API.csproj
View File
+ 0
- 40
src/Services/Identity/Identity.API/Migrations/20170604151240_Init-persisted-grant.cs
View File
| @ -1,40 +0,0 @@ | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using Microsoft.EntityFrameworkCore.Migrations; | |||||
| namespace Identity.API.Migrations | |||||
| { | |||||
| public partial class Initpersistedgrant : Migration | |||||
| { | |||||
| protected override void Up(MigrationBuilder migrationBuilder) | |||||
| { | |||||
| migrationBuilder.CreateTable( | |||||
| name: "PersistedGrants", | |||||
| columns: table => new | |||||
| { | |||||
| Key = table.Column<string>(maxLength: 200, nullable: false), | |||||
| ClientId = table.Column<string>(maxLength: 200, nullable: false), | |||||
| CreationTime = table.Column<DateTime>(nullable: false), | |||||
| Data = table.Column<string>(maxLength: 50000, nullable: false), | |||||
| Expiration = table.Column<DateTime>(nullable: true), | |||||
| SubjectId = table.Column<string>(maxLength: 200, nullable: true), | |||||
| Type = table.Column<string>(maxLength: 50, nullable: false) | |||||
| }, | |||||
| constraints: table => | |||||
| { | |||||
| table.PrimaryKey("PK_PersistedGrants", x => x.Key); | |||||
| }); | |||||
| migrationBuilder.CreateIndex( | |||||
| name: "IX_PersistedGrants_SubjectId_ClientId_Type", | |||||
| table: "PersistedGrants", | |||||
| columns: new[] { "SubjectId", "ClientId", "Type" }); | |||||
| } | |||||
| protected override void Down(MigrationBuilder migrationBuilder) | |||||
| { | |||||
| migrationBuilder.DropTable( | |||||
| name: "PersistedGrants"); | |||||
| } | |||||
| } | |||||
| } | |||||
src/Services/Identity/Identity.API/Data/Migrations/20161020101725_extendProfile.Designer.cs → src/Services/Identity/Identity.API/Migrations/20170912114036_Initial.Designer.cs
View File
src/Services/Identity/Identity.API/Data/Migrations/20161019122215_Init_Scheme.cs → src/Services/Identity/Identity.API/Migrations/20170912114036_Initial.cs
View File
src/Services/Identity/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs → src/Services/Identity/Identity.API/Migrations/ApplicationDbContextModelSnapshot.cs
View File
src/Services/Identity/Identity.API/Migrations/ConfigurationDb/20170604151338_Init-configuration.Designer.cs → src/Services/Identity/Identity.API/Migrations/ConfigurationDb/20170912114152_Initial.Designer.cs
View File
src/Services/Identity/Identity.API/Migrations/ConfigurationDb/20170604151338_Init-configuration.cs → src/Services/Identity/Identity.API/Migrations/ConfigurationDb/20170912114152_Initial.cs
View File
+ 53
- 6
src/Services/Identity/Identity.API/Migrations/ConfigurationDb/ConfigurationDbContextModelSnapshot.cs
View File
src/Services/Identity/Identity.API/Migrations/20170604151240_Init-persisted-grant.Designer.cs → src/Services/Identity/Identity.API/Migrations/PersistedGrantDb/20170912114120_Initial.Designer.cs
View File
+ 40
- 0
src/Services/Identity/Identity.API/Migrations/PersistedGrantDb/20170912114120_Initial.cs
View File
| @ -0,0 +1,40 @@ | |||||
| using Microsoft.EntityFrameworkCore.Migrations; | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| namespace Identity.API.Migrations.PersistedGrantDb | |||||
| { | |||||
| public partial class Initial : Migration | |||||
| { | |||||
| protected override void Up(MigrationBuilder migrationBuilder) | |||||
| { | |||||
| migrationBuilder.CreateTable( | |||||
| name: "PersistedGrants", | |||||
| columns: table => new | |||||
| { | |||||
| Key = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: false), | |||||
| ClientId = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: false), | |||||
| CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false), | |||||
| Data = table.Column<string>(type: "nvarchar(max)", maxLength: 50000, nullable: false), | |||||
| Expiration = table.Column<DateTime>(type: "datetime2", nullable: true), | |||||
| SubjectId = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true), | |||||
| Type = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false) | |||||
| }, | |||||
| constraints: table => | |||||
| { | |||||
| table.PrimaryKey("PK_PersistedGrants", x => x.Key); | |||||
| }); | |||||
| migrationBuilder.CreateIndex( | |||||
| name: "IX_PersistedGrants_SubjectId_ClientId_Type", | |||||
| table: "PersistedGrants", | |||||
| columns: new[] { "SubjectId", "ClientId", "Type" }); | |||||
| } | |||||
| protected override void Down(MigrationBuilder migrationBuilder) | |||||
| { | |||||
| migrationBuilder.DropTable( | |||||
| name: "PersistedGrants"); | |||||
| } | |||||
| } | |||||
| } | |||||
src/Services/Identity/Identity.API/Migrations/PersistedGrantDbContextModelSnapshot.cs → src/Services/Identity/Identity.API/Migrations/PersistedGrantDb/PersistedGrantDbContextModelSnapshot.cs
View File
+ 2
- 6
src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentInputModel.cs
View File
+ 2
- 4
src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentViewModel.cs
View File
+ 2
- 6
src/Services/Identity/Identity.API/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs
View File
+ 2
- 6
src/Services/Identity/Identity.API/Models/AccountViewModels/ForgotPasswordViewModel.cs
View File
+ 1
- 5
src/Services/Identity/Identity.API/Models/AccountViewModels/LoggedOutViewModel.cs
View File
+ 2
- 6
src/Services/Identity/Identity.API/Models/AccountViewModels/LoginViewModel.cs
View File
+ 1
- 5
src/Services/Identity/Identity.API/Models/AccountViewModels/LogoutViewModel.cs
View File
+ 2
- 6
src/Services/Identity/Identity.API/Models/AccountViewModels/RegisterViewModel.cs
View File
+ 2
- 6
src/Services/Identity/Identity.API/Models/AccountViewModels/ResetPasswordViewModel.cs
View File
+ 2
- 5
src/Services/Identity/Identity.API/Models/AccountViewModels/SendCodeViewModel.cs
View File
+ 2
- 6
src/Services/Identity/Identity.API/Models/AccountViewModels/VerifyCodeViewModel.cs
View File
+ 0
- 20
src/Services/Identity/Identity.API/Models/AccountViewModels/_LoginViewModel.cs
View File
| @ -1,20 +0,0 @@ | |||||
| // Copyright (c) Brock Allen & Dominick Baier. All rights reserved. | |||||
| // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. | |||||
| using System.Collections.Generic; | |||||
| namespace Identity.API.Models.AccountViewModels | |||||
| { | |||||
| //public class _LoginViewModel : LoginViewModel | |||||
| //{ | |||||
| // public bool EnableLocalLogin { get; set; } | |||||
| // public IEnumerable<ExternalProvider> ExternalProviders { get; set; } | |||||
| //} | |||||
| //public class ExternalProvider | |||||
| //{ | |||||
| // public string DisplayName { get; set; } | |||||
| // public string AuthenticationScheme { get; set; } | |||||
| //} | |||||
| } | |||||
+ 2
- 6
src/Services/Identity/Identity.API/Models/ApplicationUser.cs
View File
+ 1
- 1
src/Services/Identity/Identity.API/Models/ErrorViewModel.cs
View File
+ 2
- 6
src/Services/Identity/Identity.API/Models/ManageViewModels/AddPhoneNumberViewModel.cs
View File
+ 2
- 6
src/Services/Identity/Identity.API/Models/ManageViewModels/ChangePasswordViewModel.cs
View File
+ 2
- 5
src/Services/Identity/Identity.API/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs
View File
+ 1
- 6
src/Services/Identity/Identity.API/Models/ManageViewModels/FactorViewModel.cs
View File
+ 2
- 5
src/Services/Identity/Identity.API/Models/ManageViewModels/IndexViewModel.cs
View File
+ 3
- 6
src/Services/Identity/Identity.API/Models/ManageViewModels/ManageLoginsViewModel.cs
View File
+ 1
- 7
src/Services/Identity/Identity.API/Models/ManageViewModels/RemoveLoginViewModel.cs
View File
+ 2
- 6
src/Services/Identity/Identity.API/Models/ManageViewModels/SetPasswordViewModel.cs
View File
+ 2
- 6
src/Services/Identity/Identity.API/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs
View File
+ 40
- 6
src/Services/Identity/Identity.API/Program.cs
View File
| @ -1,21 +1,55 @@ | |||||
| using Microsoft.AspNetCore.Hosting; | |||||
| using IdentityServer4.EntityFramework.DbContexts; | |||||
| using Microsoft.AspNetCore; | |||||
| using Microsoft.AspNetCore.Hosting; | |||||
| using Microsoft.eShopOnContainers.Services.Identity.API.Data; | |||||
| using Microsoft.Extensions.Configuration; | |||||
| using Microsoft.Extensions.DependencyInjection; | |||||
| using Microsoft.Extensions.Logging; | |||||
| using Microsoft.Extensions.Options; | |||||
| using System.IO; | using System.IO; | ||||
| namespace eShopOnContainers.Identity | |||||
| namespace Microsoft.eShopOnContainers.Services.Identity.API | |||||
| { | { | ||||
| public class Program | public class Program | ||||
| { | { | ||||
| public static void Main(string[] args) | public static void Main(string[] args) | ||||
| { | { | ||||
| var host = new WebHostBuilder() | |||||
| BuildWebHost(args) | |||||
| .MigrateDbContext<PersistedGrantDbContext>((_, __) => { }) | |||||
| .MigrateDbContext<ApplicationDbContext>((context, services) => | |||||
| { | |||||
| var env = services.GetService<IHostingEnvironment>(); | |||||
| var logger = services.GetService<ILogger<ApplicationDbContextSeed>>(); | |||||
| var settings = services.GetService<IOptions<AppSettings>>(); | |||||
| new ApplicationDbContextSeed() | |||||
| .SeedAsync(context, env, logger, settings) | |||||
| .Wait(); | |||||
| }) | |||||
| .MigrateDbContext<ConfigurationDbContext>((context,services)=> | |||||
| { | |||||
| var configuration = services.GetService<IConfiguration>(); | |||||
| new ConfigurationDbContextSeed() | |||||
| .SeedAsync(context, configuration) | |||||
| .Wait(); | |||||
| }).Run(); | |||||
| } | |||||
| public static IWebHost BuildWebHost(string[] args) => | |||||
| WebHost.CreateDefaultBuilder(args) | |||||
| .UseKestrel() | .UseKestrel() | ||||
| .UseHealthChecks("/hc") | .UseHealthChecks("/hc") | ||||
| .UseContentRoot(Directory.GetCurrentDirectory()) | .UseContentRoot(Directory.GetCurrentDirectory()) | ||||
| .UseIISIntegration() | .UseIISIntegration() | ||||
| .UseStartup<Startup>() | .UseStartup<Startup>() | ||||
| .ConfigureLogging((hostingContext, builder) => | |||||
| { | |||||
| builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); | |||||
| builder.AddConsole(); | |||||
| builder.AddDebug(); | |||||
| }) | |||||
| .Build(); | .Build(); | ||||
| host.Run(); | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
+ 3
- 6
src/Services/Identity/Identity.API/Services/EFLoginService.cs
View File
+ 2
- 5
src/Services/Identity/Identity.API/Services/IEmailSender.cs
View File
+ 2
- 5
src/Services/Identity/Identity.API/Services/ILoginService.cs
View File
+ 1
- 6
src/Services/Identity/Identity.API/Services/IRedirectService.cs
View File
+ 2
- 5
src/Services/Identity/Identity.API/Services/ISmsSender.cs
View File
+ 2
- 5
src/Services/Identity/Identity.API/Services/MessageServices.cs
View File
+ 7
- 7
src/Services/Identity/Identity.API/Services/ProfileService.cs
View File
+ 2
- 6
src/Services/Identity/Identity.API/Services/RedirectService.cs
View File
+ 22
- 92
src/Services/Identity/Identity.API/Startup.cs
View File
+ 1
- 1
src/Services/Identity/Identity.API/Views/Account/LoggedOut.cshtml
View File
+ 1
- 1
src/Services/Identity/Identity.API/Views/Account/Login.cshtml
View File
+ 1
- 1
src/Services/Identity/Identity.API/Views/Account/Logout.cshtml
View File
+ 1
- 2
src/Services/Identity/Identity.API/Views/Account/Register.cshtml
View File
+ 1
- 1
src/Services/Identity/Identity.API/Views/Consent/Index.cshtml
View File
+ 1
- 1
src/Services/Identity/Identity.API/Views/Consent/_ScopeListItem.cshtml
View File
+ 1
- 1
src/Services/Identity/Identity.API/Views/Shared/Error.cshtml
View File
+ 12
- 0
src/Services/Marketing/Marketing.API/Infrastructure/MarketingContext.cs
View File
+ 27
- 14
src/Services/Marketing/Marketing.API/Infrastructure/MarketingContextSeed.cs
View File
+ 3
- 0
src/Services/Marketing/Marketing.API/Infrastructure/MarketingReadDataContext.cs
View File
+ 1
- 0
src/Services/Marketing/Marketing.API/Marketing.API.csproj
View File
+ 12
- 1
src/Services/Marketing/Marketing.API/Program.cs
View File
+ 8
- 32
src/Services/Marketing/Marketing.API/Startup.cs
View File
+ 57
- 43
src/Services/Ordering/Ordering.API/Infrastructure/OrderingContextSeed.cs
View File
+ 0
- 29
src/Services/Ordering/Ordering.API/Infrastructure/OrderingDbContextDesigner.cs
View File
| @ -1,29 +0,0 @@ | |||||
| using MediatR; | |||||
| using Microsoft.EntityFrameworkCore; | |||||
| using Microsoft.EntityFrameworkCore.Design; | |||||
| using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure; | |||||
| using Microsoft.Extensions.Configuration; | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using System.Reflection; | |||||
| using System.Text; | |||||
| namespace Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure | |||||
| { | |||||
| public class OrderingDbContextDesigner : IDesignTimeDbContextFactory<OrderingContext> | |||||
| { | |||||
| public OrderingContext CreateDbContext(string[] args) | |||||
| { | |||||
| var options = new DbContextOptionsBuilder<OrderingContext>(); | |||||
| options.UseSqlServer("Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;", | |||||
| sqlServerOptionsAction: sqlOptions => | |||||
| { | |||||
| sqlOptions.MigrationsAssembly(typeof(Startup).GetTypeInfo().Assembly.GetName().Name); | |||||
| }); | |||||
| return OrderingContext.CreateForEFDesignTools(options.Options); | |||||
| } | |||||
| } | |||||
| } | |||||