MVC: Finish Orders integration (detail), validations, some refactor ...

Orders: Detail Query, new field in OrderDetail..
Identity: Validations in Register View, ensure all claims are returned in user end point..

Author: Carlos Cañizares Estévez

docker-compose.override.yml

@@ -9,15 +9,15 @@ version: '2'
 
 services:
 
-  webmvc:
-    environment:
-      - CatalogUrl=http://catalog.api
-      - OrderingUrl=http://ordering.api:5102
+#  webmvc:
+#    environment:
+#      - CatalogUrl=http://catalog.api
+#      - OrderingUrl=http://ordering.api:5102
       #- IdentityUrl=http://104.40.62.65:5105           #Remote: VM Needs to have public access at 5105. 
-      - IdentityUrl=http://identity.service:5105        #Local: You need a entry in windows host file to run identity in local docker. 
-      - BasketUrl=http://basket.api:5103
-    ports:
-      - "5100:5100"
+#      - IdentityUrl=http://identity.service:5105        #Local: You need a entry in windows host file to run identity in local docker. 
+#      - BasketUrl=http://basket.api:5103
+#    ports:
+#      - "5100:5100"
 
   webspa:
     environment:
@@ -39,38 +39,31 @@ services:
 
   catalog.api:
     environment:
-      - ConnectionString=Server=business.data;Database=CatalogDB;User Id=sa;Password=Pass@word
+      - ConnectionString=Server=sql.data;Database=CatalogDB;User Id=sa;Password=Pass@word
     ports:
       - "5101:80"
 
-  ordering.api:
-    environment:
-      - ConnectionString=Server=business.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
-      - identityUrl=http://identity.service:5105    #local
+#  ordering.api:
+#    environment:
+#      - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
+#      - identityUrl=http://identity.service:5105    #local
       #- identityUrl=http://104.40.62.65:5105       #remote
-    ports:
-      - "5102:5102"
+#    ports:
+#      - "5102:5102"
 
   identity.service:
     environment:
       - SpaClient=http://localhost:5104
-      - ConnectionStrings__DefaultConnection=Server=identity.data;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word
+      - ConnectionStrings__DefaultConnection=Server=sql.data;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word
       #- MvcClient=http://104.40.62.65:5100             #Remote: VM Needs to have public access at 5105. 
       - MvcClient=http://localhost:5100                 #Local: You need a entry in windows host file to run identity in local docker. 
                                                         #10.0.75.1:5105 CCE/TODO: try to avoid host entry. 
     ports:
       - "5105:5105"
 
-  identity.data:
+  sql.data:
     environment:
       - SA_PASSWORD=Pass@word
       - ACCEPT_EULA=Y
     ports:
       - "5433:1433"
-
-  business.data:
-    environment:
-      - SA_PASSWORD=Pass@word
-      - ACCEPT_EULA=Y
-    ports:
-      - "5434:1433"

docker-compose.yml

@@ -7,11 +7,11 @@
 version: '2'
 
 services:
-  webmvc:
-    image: eshop/web
-    depends_on:
-      - identity.service
-      - basket.api
+#  webmvc:
+#    image: eshop/web
+#    depends_on:
+#      - identity.service
+#      - basket.api
 
   webspa:
     image: eshop/webspa
@@ -28,22 +28,19 @@ services:
   catalog.api:
     image: eshop/catalog.api
     depends_on:
-      - business.data
+      - sql.data
 
-  ordering.api:
-    image: eshop/ordering.api
-    depends_on:
-      - business.data
+#  ordering.api:
+#    image: eshop/ordering.api
+#    depends_on:
+#      - sql.data
 
   identity.service:
     image: eshop/identity
     depends_on:
-      - identity.data
-
-  identity.data:
-    image: microsoft/mssql-server-linux
+      - sql.data
 
-  business.data:
+  sql.data:
     image: microsoft/mssql-server-linux
 
   basket.data:

src/Services/Basket/Basket.API/appsettings.json

@@ -1,4 +1,4 @@
-{
+{
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
@@ -7,6 +7,6 @@
       "Microsoft": "Information"
     }
   },
-  "IdentityUrl": "http://localhost:5000",
+  "IdentityUrl": "http://identity.service:5105",
   "ConnectionString": "127.0.0.1"
 }

src/Services/Catalog/Catalog.API/settings.json

@@ -1,5 +1,5 @@
 {
-  "ConnectionString": "Server=tcp:127.0.0.1,5434;Initial Catalog=CatalogDB;User Id=sa;Password=Pass@word",
+  "ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=CatalogDB;User Id=sa;Password=Pass@word",
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {

src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs

@@ -99,7 +99,7 @@ public async Task<IActionResult> Login(LoginViewModel model)
                         props = new AuthenticationProperties
                         {
                             IsPersistent = true,
-                            ExpiresUtc = DateTimeOffset.UtcNow.AddMonths(1)
+                            ExpiresUtc = DateTimeOffset.UtcNow.AddYears(10)
                         };
                     };
 

src/Services/Identity/eShopOnContainers.Identity/Data/ApplicationContextSeed.cs

@@ -61,7 +61,6 @@ private ApplicationUser GetDefaultUser()
                 CardType = 1,
                 City = "Redmond",
                 Country = "U.S.",
-                CountryCode = "91",
                 Email = "demouser@microsoft.com",
                 Expiration = "12/20",
                 Id = Guid.NewGuid().ToString(), 

src/Services/Identity/eShopOnContainers.Identity/Data/Migrations/20161019122215_Init_Scheme.cs

@@ -49,14 +49,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     City = table.Column<string>(nullable: true),
                     ConcurrencyStamp = table.Column<string>(nullable: true),
                     Country = table.Column<string>(nullable: true),
-                    CountryCode = table.Column<string>(nullable: true),
                     Email = table.Column<string>(maxLength: 256, nullable: true),
                     EmailConfirmed = table.Column<bool>(nullable: false),
                     Expiration = table.Column<string>(nullable: true),
-                    Latitude = table.Column<double>(nullable: false),
                     LockoutEnabled = table.Column<bool>(nullable: false),
                     LockoutEnd = table.Column<DateTimeOffset>(nullable: true),
-                    Longitude = table.Column<double>(nullable: false),
                     NormalizedEmail = table.Column<string>(maxLength: 256, nullable: true),
                     NormalizedUserName = table.Column<string>(maxLength: 256, nullable: true),
                     PasswordHash = table.Column<string>(nullable: true),
@@ -65,7 +62,6 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     SecurityNumber = table.Column<string>(nullable: true),
                     SecurityStamp = table.Column<string>(nullable: true),
                     State = table.Column<string>(nullable: true),
-                    StateCode = table.Column<string>(nullable: true),
                     Street = table.Column<string>(nullable: true),
                     TwoFactorEnabled = table.Column<bool>(nullable: false),
                     UserName = table.Column<string>(maxLength: 256, nullable: true),

src/Services/Identity/eShopOnContainers.Identity/Extensions/PrincipalExtensions.cs

@@ -10,21 +10,29 @@ namespace eShopOnContainers.Identity.Models
     // Add profile data for application users by adding properties to the ApplicationUser class
     public class ApplicationUser : IdentityUser
     {
+        [Required]
         public string CardNumber { get; set; }
+        [Required]
         public string SecurityNumber { get; set; }
+        [Required]
+        [RegularExpression(@"(0[1-9]|1[0-2])\/[0-9]{2}", ErrorMessage = "Expiration should match a valid MM/YY value")]
         public string Expiration { get; set; }
+        [Required]
         public string CardHolderName { get; set; }
         public int CardType { get; set; }
+        [Required]
         public string Street { get; set; }
+        [Required]
         public string City { get; set; }
+        [Required]
         public string State { get; set; }
-        public string StateCode { get; set; }
+        [Required]
         public string Country { get; set; }
-        public string CountryCode { get; set; }
+        [Required]
         public string ZipCode { get; set; }
-        public double Latitude { get; set; }
-        public double Longitude { get; set; }
+        [Required]
         public string Name { get; set; }
+        [Required]
         public string LastName { get; set; }
     }
 }

src/Services/Identity/eShopOnContainers.Identity/Models/ApplicationUser.cs

@@ -11,7 +11,7 @@
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
-      "launchUrl": "http://localhost:5000",
+      "launchUrl": "http://localhost:5105",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }