Added identity service

Author: Carlos Cañizares Estévez

build-images.ps1

@@ -22,13 +22,26 @@ dotnet publish $webPathToJson -o $webPathToPub
 $webSPAPathToJson = $scriptPath + "\src\Web\WebSPA\eShopOnContainers.WebSPA\project.json"
 Write-Host "webSPAPathToJson is $webSPAPathToJson" -ForegroundColor Yellow
 $webSPAPathToPub = $scriptPath + "\pub\webSPA"
+#$webSPAPathToNpmBat = $scriptPath + "\src\Web\WebSPA\eShopOnContainers.WebSPA\buildspa.bat"
 Write-Host "webSPAPathToPub is $webSPAPathToPub" -ForegroundColor Yellow
 
 Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue
 dotnet restore $webSPAPathToJson
 dotnet build $webSPAPathToJson
+#Start-Process "cmd.exe" "/c " + $webSPAPathToNpmBat
 dotnet publish $webSPAPathToJson -o $webSPAPathToPub
 
+# *** identitySvc image ***
+$identitySvcPathToJson = $scriptPath + "\src\Services\Identity\eShopOnContainers.Identity\project.json"
+Write-Host "identitySvcPathToJson is $identitySvcPathToJson" -ForegroundColor Yellow
+$identitySvcPathToPub = $scriptPath + "\pub\identity"
+Write-Host "identitySvcPathToPub is $identitySvcPathToPub" -ForegroundColor Yellow
+
+Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue
+dotnet restore $identitySvcPathToJson
+dotnet build $identitySvcPathToJson
+dotnet publish $identitySvcPathToJson -o $identitySvcPathToPub
+
 
 #*** Catalog service image ***
 $catalogPathToJson = $scriptPath + "\src\Services\Catalog\Catalog.API\project.json"
@@ -63,8 +76,10 @@ dotnet restore $basketPathToJson
 dotnet build $basketPathToJson
 dotnet publish $basketPathToJson -o $basketPathToPub
 
+#*** build docker images ***
 docker build -t eshop/web $webPathToPub
 docker build -t eshop/catalog.api $catalogPathToPub
 docker build -t eshop/ordering.api $orderingPathToPub
 docker build -t eshop/basket.api $basketPathToPub
 docker build -t eshop/webspa $webSPAPathToPub
+docker build -t eshop/identity $identitySvcPathToPub

docker-compose.yml

@@ -9,11 +9,13 @@ services:
     environment:
       - CatalogUrl=http://catalog.api
       - OrderingUrl=http://ordering.api
+      - IdentityUrl=http://identity.service
+      - BasketUrl=http://basket.api
     ports:
       - "5100:80"
     depends_on:
       - catalog.api
-      - identity.data
+      - identity.service
       - basket.api
 
   webspa:
@@ -24,12 +26,14 @@ services:
     environment:
       - CatalogUrl=http://catalog.api
       - OrderingUrl=http://ordering.api
+      - IdentityUrl=http://identity.service
+      - BasketUrl=http://basket.api
     ports:
       - "5104:80"
     depends_on:
       - catalog.api
-      - identity.data
       - basket.api
+      - identity.service
 
   catalog.api:
     image: eshop/catalog.api
@@ -56,10 +60,6 @@ services:
       - ConnectionString=Server=ordering.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
     ports:
       - "5102:80"
-# (Go to Production): For secured/final deployment, remove Ports mapping and
-# leave just the internal expose section 
-#    expose:
-#      - "80"
     extra_hosts:
       - "CESARDLBOOKVHD:10.0.75.1"
     depends_on:
@@ -70,6 +70,17 @@ services:
     ports:
       - "5432:1433"
 
+  identity.service:
+    image: eshop/identity
+    environment:
+      - Spa:http://webspa
+    expose:
+      - "80"
+    ports:
+      - "5105:80"
+    depends_on:
+      - identity.data
+
   identity.data:
     image: microsoft/mssql-server-linux
     environment:
@@ -89,6 +100,7 @@ services:
       - "5103:80"
     depends_on:
       - basket.data
+      - identity.service
 
   basket.data:
     image: redis

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

@@ -31,9 +31,11 @@ public async Task<IActionResult> Get(string id)
 
         // POST api/values
         [HttpPost]
-        public void Post([FromBody]CustomerBasket value)
+        public async Task<IActionResult> Post([FromBody]CustomerBasket value)
         {
-            _repository.UpdateBasket(value);
+            var basket = await _repository.UpdateBasket(value);
+
+            return Ok(basket);
         }
 
         // DELETE api/values/5

src/Services/Basket/Basket.API/Model/IBasketRepository.cs

@@ -8,7 +8,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model
     public interface IBasketRepository
     {
         Task<CustomerBasket> GetBasket(string customerId);
-        Task<bool> UpdateBasket(CustomerBasket basket);
+        Task<CustomerBasket> UpdateBasket(CustomerBasket basket);
         Task<bool> DeleteBasket(string id);
     }
 }

src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs

@@ -44,10 +44,19 @@ public async Task<CustomerBasket> GetBasket(string customerId)
             return JsonConvert.DeserializeObject<CustomerBasket>(data);
         }
 
-        public async Task<bool> UpdateBasket(CustomerBasket basket)
+        public async Task<CustomerBasket> UpdateBasket(CustomerBasket basket)
         {
             var database = await GetDatabase();
-            return await database.StringSetAsync(basket.BuyerId, JsonConvert.SerializeObject(basket));
+
+            var created = await database.StringSetAsync(basket.BuyerId, JsonConvert.SerializeObject(basket));
+            if (!created)
+            {
+                _logger.LogInformation("Problem persisting the item");
+                return null;
+            }
+
+            _logger.LogInformation("basket item persisted succesfully");
+            return await GetBasket(basket.BuyerId);
         }
 
         private async Task<IDatabase> GetDatabase()
@@ -64,3 +73,4 @@ private async Task<IDatabase> GetDatabase()
         }
     }
 }
+

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

@@ -56,6 +56,13 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             loggerFactory.AddConsole(Configuration.GetSection("Logging"));
             loggerFactory.AddDebug();
 
+            app.UseIdentityServerAuthentication(new IdentityServerAuthenticationOptions
+            {
+                Authority = Configuration.GetValue("IdentityUrl", "http://localhost:5000"),
+                ScopeName = "basket",
+                RequireHttpsMetadata = false
+            });
+
             app.UseMvc();
         }
     }

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

@@ -7,5 +7,6 @@
       "Microsoft": "Information"
     }
   },
+  "identityUrl":  "http://localhost:5105",
   "ConnectionString": "127.0.0.1"
 }

src/Services/Basket/Basket.API/docker-compose.yml

@@ -15,3 +15,20 @@ services:
 
   basket.data:
     image: redis
+
+  identity.service:
+    image: eshop/identity
+    expose:
+      - "80"
+    ports:
+      - "5105:80"
+    depends_on:
+      - identity.data
+      
+  identity.data:
+    image: microsoft/mssql-server-linux
+    environment:
+      - SA_PASSWORD=Pass@word
+      - ACCEPT_EULA=Y
+    ports:
+      - "5433:1433"

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

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

src/Services/Identity/eShopOnContainers.Identity/.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "wwwroot/lib"
+}