BasketApi: Add authorizationHeader (pass bearer from Swagger Ui to authorize request...).

MVC: Solve some design feedback (filter selector in catalog)

CatalogApi: Move models from infrastructure to Model folder.

Author: Carlos Cañizares Estévez

add-firewall-docker.ps1

@@ -0,0 +1,23 @@
+param([switch]$Elevated)
+function Check-Admin {
+$currentUser = New-Object Security.Principal.WindowsPrincipal $([Security.Principal.WindowsIdentity]::GetCurrent())
+$currentUser.IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator)
+}
+if ((Check-Admin) -eq $false)  {
+if ($elevated)
+{
+# could not elevate, quit
+}
+ 
+else {
+ 
+Start-Process powershell.exe -Verb RunAs -ArgumentList ('-noprofile -noexit -file "{0}" -elevated' -f ($myinvocation.MyCommand.Definition))
+}
+exit
+}
+$reglas = Get-NetFirewallRule -DisplayName 'EshopDocker'
+if ($reglas.Length -gt 0)
+{
+    New-NetFirewallRule -DisplayName EshopDocker -Confirm -Description "Eshop on Containers" -LocalAddress Any -LocalPort Any -Protocol tcp -RemoteAddress Any -RemotePort 5100-5105 -Direction Inbound
+    New-NetFirewallRule -DisplayName EshopDocker -Confirm -Description "Eshop on Containers" -LocalAddress Any -LocalPort Any -Protocol tcp -RemoteAddress Any -RemotePort 5100-5105 -Direction Outbound
+}

docker-compose.override.yml

@@ -14,27 +14,31 @@ services:
       - 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. 
+      - 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"
+    links:
+      - identity.service:10.0.75.1
 
   webspa:
     environment:
       - CatalogUrl=http://catalog.api
       - OrderingUrl=http://ordering.api
-      #- 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
+      #- 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. 
+      - IdentityUrl=http://10.0.75.1:5105               #Local: You need to open windows firewall at range 5100-5105. 
+      - BasketUrl=http://basket.api:5103                
     ports:
       - "5104:80"
 
   basket.api:
     environment:
       - ConnectionString=basket.data
       #- 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. 
+      #- identityUrl=http://identity.service:5105        #Local: You need a entry in windows host file to run identity in local docker. 
+      - identityUrl=http://10.0.75.1:5105                #Local: You need to open windows firewall at range 5100-5105. 
     ports:
       - "5103:5103"
 
@@ -47,18 +51,19 @@ services:
   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
+      #- 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. 
+      - identityUrl=http://10.0.75.1:5105                #Local: You need to open windows firewall at range 5100-5105. 
     ports:
       - "5102:5102"
 
   identity.service:
     environment:
       - SpaClient=http://localhost:5104
       - 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://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. 
+      - MvcClient=http://10.0.75.1:5100                 #Local: You need to open windows firewall at range 5100-5105. 
     ports:
       - "5105:5105"
 

src/Services/Basket/Basket.API/Auth/Client/enable-token-client.js

@@ -0,0 +1,28 @@
+(function ($, swaggerUi) {
+    $(function () {
+        var settings = {
+            authority: 'https://localhost:5105',
+            client_id: 'js',
+            popup_redirect_uri: window.location.protocol
+                + '//'
+                + window.location.host
+                + '/tokenclient/popup.html',
+
+            response_type: 'id_token token',
+            scope: 'openid profile basket',
+
+            filter_protocol_claims: true
+        },
+        manager = new OidcTokenManager(settings),
+        $inputApiKey = $('#input_apiKey');
+
+        $inputApiKey.on('dblclick', function () {
+            manager.openPopupForTokenAsync()
+                .then(function () {
+                    $inputApiKey.val(manager.access_token).change();
+                }, function (error) {
+                    console.error(error);
+                });
+        });
+    });
+})(jQuery, window.swaggerUi);