Add Swagger to Basket Api

SQL databases with the same prefix for services
Move application tier to api tier in ordering api

Author: Carlos Cañizares Estévez

docker-compose.override.yml

@@ -9,21 +9,22 @@ version: '2'
 
 services:
 
-#  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"
+  webmvc:
+    environment:
+      - CatalogUrl=http://catalog.api
+      - OrderingUrl=http://ordering.api:5102
+      #- IdentityUrl=http://13.88.8.119:5105           #Remote: VM Needs to have public access at 5105. 
+      #- IdentityUrl=http://10.0.75.1:5105              #Local: You need to open windows firewall at range 5100-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"
 
   webspa:
     environment:
       - CatalogUrl=http://catalog.api
       - OrderingUrl=http://ordering.api
-      #- IdentityUrl=http://104.40.62.65:5105           #Remote: VM Needs to have public access at 5105. 
+      #- IdentityUrl=http://13.88.8.119: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:
@@ -32,30 +33,30 @@ services:
   basket.api:
     environment:
       - ConnectionString=basket.data
-      #- identityUrl=http://104.40.62.65:5105           #Remote: VM Needs to have public access at 5105. 
+      #- identityUrl=http://13.88.8.119:5105             #Remote
       - identityUrl=http://identity.service:5105        #Local: You need a entry in windows host file to run identity in local docker. 
     ports:
       - "5103:5103"
 
   catalog.api:
     environment:
-      - ConnectionString=Server=sql.data;Database=CatalogDB;User Id=sa;Password=Pass@word
+      - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
     ports:
       - "5101:80"
 
-#  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"
+  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://13.88.8.119:5105           #remote
+    ports:
+      - "5102:5102"
 
   identity.service:
     environment:
       - SpaClient=http://localhost:5104
-      - 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. 
+      - ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word
+      #- MvcClient=http://13.88.8.119: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:

docker-compose.yml

@@ -7,11 +7,13 @@
 version: '2'
 
 services:
-#  webmvc:
-#    image: eshop/web
-#    depends_on:
-#      - identity.service
-#      - basket.api
+  webmvc:
+    image: eshop/web
+    links:
+      - identity.service:localhost
+    depends_on:
+      - identity.service
+      - basket.api
 
   webspa:
     image: eshop/webspa
@@ -30,10 +32,10 @@ services:
     depends_on:
       - sql.data
 
-#  ordering.api:
-#    image: eshop/ordering.api
-#    depends_on:
-#      - sql.data
+  ordering.api:
+    image: eshop/ordering.api
+    depends_on:
+      - sql.data
 
   identity.service:
     image: eshop/identity

src/Services/Basket/Basket.API/Controllers/HomeController.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+// For more information on enabling MVC for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860
+
+namespace Microsoft.eShopOnContainers.Services.Basket.API.Controllers
+{
+    public class HomeController : Controller
+    {
+        // GET: /<controller>/
+        public IActionResult Index()
+        {
+            return new RedirectResult("~/swagger/ui");
+        }
+    }
+}

src/Services/Basket/Basket.API/Startup.cs

@@ -47,6 +47,20 @@ public void ConfigureServices(IServiceCollection services)
                 return ConnectionMultiplexer.Connect(ips.First().ToString());
             });
 
+            services.AddSwaggerGen();
+            services.ConfigureSwaggerGen(options =>
+            {
+                options.DescribeAllEnumsAsStrings();
+                options.SingleApiVersion(new Swashbuckle.Swagger.Model.Info()
+                {
+                    Title = "Basket HTTP API",
+                    Version = "v1",
+                    Description = "The Basket Service HTTP API",
+                    TermsOfService = "Terms Of Service"
+                });
+            });
+
+
             services.AddCors(options =>
             {
                 options.AddPolicy("CorsPolicy",
@@ -77,7 +91,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
                 RequireHttpsMetadata = false
             });
 
-            app.UseMvc();
+            app.UseMvcWithDefaultRoute();
+
+            app.UseSwagger()
+                .UseSwaggerUi();
+
         }
     }
 }

src/Services/Basket/Basket.API/project.json

@@ -17,7 +17,8 @@
     "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
     "StackExchange.Redis": "1.1.608",
     "Newtonsoft.Json": "9.0.1",
-    "IdentityServer4.AccessTokenValidation": "1.0.1-rc3"
+    "IdentityServer4.AccessTokenValidation": "1.0.1-rc3",
+    "Swashbuckle": "6.0.0-beta902"
   },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"

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

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

src/Services/Identity/eShopOnContainers.Identity/AppSettings.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace eShopOnContainers.Identity
+{
+    public class AppSettings
+    {
+        public string MvcClient { get; set; }
+    }
+}

src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs

@@ -78,7 +78,7 @@ public static IEnumerable<Client> GetClients(Dictionary<string,string> clientsUr
                         new Secret("secret".Sha256())
                     },
                     ClientUri = $"{clientsUrl["Mvc"]}",                             // public uri of the client
-                    AllowedGrantTypes = GrantTypes.HybridAndClientCredentials,
+                    AllowedGrantTypes = GrantTypes.Hybrid,
                     RedirectUris = new List<string>
                     {
                         $"{clientsUrl["Mvc"]}/signin-oidc",

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

@@ -85,15 +85,9 @@ public async Task<IActionResult> Login(LoginViewModel model)
             if (ModelState.IsValid)
             {
                 var user = await _loginService.FindByUsername(model.Email);
-                // validate username/password against in-memory store
                 if (await _loginService.ValidateCredentials(user, model.Password))
                 {
-                    // issue authentication cookie with subject ID and username
-                    //var user = _loginService.FindByUsername(model.Username);
-
-                    AuthenticationProperties props = null;
-                    // only set explicit expiration here if persistent. 
-                    // otherwise we reply upon expiration configured in cookie middleware.
+                     AuthenticationProperties props = null;
                     if (model.RememberMe)
                     {
                         props = new AuthenticationProperties
@@ -217,15 +211,7 @@ public async Task<IActionResult> Logout(LogoutViewModel model)
 
             // get context information (client name, post logout redirect URI and iframe for federated signout)
             var logout = await _interaction.GetLogoutContextAsync(model.LogoutId);
-
-            var vm = new LoggedOutViewModel
-            {
-                PostLogoutRedirectUri = logout?.PostLogoutRedirectUri,
-                ClientName = logout?.ClientId,
-                SignOutIframeUrl = logout?.SignOutIFrameUrl
-            };
-
-            return View("LoggedOut", vm);
+            return Redirect(logout?.PostLogoutRedirectUri);
         }
 
         /// <summary>

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

@@ -2,24 +2,31 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
+using eShopOnContainers.Identity;
 using IdentityServer4.Quickstart.UI.Models;
 using IdentityServer4.Services;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 using System.Threading.Tasks;
 
 namespace IdentityServer4.Quickstart.UI.Controllers
 {
     public class HomeController : Controller
     {
         private readonly IIdentityServerInteractionService _interaction;
+        private readonly IOptions<AppSettings> _settings;
 
-        public HomeController(IIdentityServerInteractionService interaction)
+        public HomeController(IIdentityServerInteractionService interaction, IOptions<AppSettings> settings)
         {
             _interaction = interaction;
+            _settings = settings;
         }
 
-        public IActionResult Index()
+        public IActionResult Index(string returnUrl)
         {
+            if (returnUrl != "")
+                return Redirect(_settings.Value.MvcClient);
+
             return View();
         }