diff --git a/add-firewall-docker.ps1 b/add-firewall-docker.ps1 index be2b4cf0c..480227580 100644 --- a/add-firewall-docker.ps1 +++ b/add-firewall-docker.ps1 @@ -21,7 +21,6 @@ try { Write-Host "Rule found" } catch [Exception] { - 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 - ac -Encoding UTF8 C:\Windows\system32\drivers\etc\hosts "127.0.0.1 eshopcontainers" #avoid cors problem in Angular2-http-localhost + New-NetFirewallRule -DisplayName EshopDocker -Confirm -Description "Eshop on Containers" -LocalAddress 5100-5105 -LocalPort Any -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Inbound + New-NetFirewallRule -DisplayName EshopDocker -Confirm -Description "Eshop on Containers" -LocalAddress 5100-5105 -LocalPort Any -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Outbound } \ No newline at end of file diff --git a/build-images.ps1 b/build-images.ps1 index e04cf8ba4..d498bb89d 100644 --- a/build-images.ps1 +++ b/build-images.ps1 @@ -30,7 +30,7 @@ dotnet build $webSPAPathToJson dotnet publish $webSPAPathToJson -o $webSPAPathToPub # *** identitySvc image *** -$identitySvcPathToJson = $scriptPath + "\src\Services\Identity\eShopOnContainers.Identity\project.json" +$identitySvcPathToJson = $scriptPath + "\src\Services\Identity\Identity.API\project.json" Write-Host "identitySvcPathToJson is $identitySvcPathToJson" -ForegroundColor Yellow $identitySvcPathToPub = $scriptPath + "\pub\identity" Write-Host "identitySvcPathToPub is $identitySvcPathToPub" -ForegroundColor Yellow diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln index 1cfe02204..264a8d6b5 100644 --- a/eShopOnContainers-ServicesAndWebApps.sln +++ b/eShopOnContainers-ServicesAndWebApps.sln @@ -47,7 +47,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UnitTest", "test\Services\U EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{24CD3B53-141E-4A07-9B0D-796641E1CF78}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "eShopOnContainers.Identity", "src\Services\Identity\eShopOnContainers.Identity\eShopOnContainers.Identity.xproj", "{A579E108-5445-403D-A407-339AC4D1611B}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Identity.API", "src\Services\Identity\eShopOnContainers.Identity\Identity.API.xproj", "{A579E108-5445-403D-A407-339AC4D1611B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/eShopOnContainers.sln b/eShopOnContainers.sln index 53013c1cb..cda4a14d8 100644 --- a/eShopOnContainers.sln +++ b/eShopOnContainers.sln @@ -65,8 +65,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ordering.Infrastructure", " EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{02DF7FEE-C302-433D-A6CD-237A2569F236}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "eShopOnContainers.Identity", "src\Services\Identity\eShopOnContainers.Identity\eShopOnContainers.Identity.xproj", "{A579E108-5445-403D-A407-339AC4D1611B}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FunctionalTests", "test\Services\FunctionalTests\FunctionalTests.xproj", "{621E7211-58D0-45FD-9600-1CB490BD930E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.UITests", "src\Mobile\eShopOnContainers\eShopOnContainers.UITests\eShopOnContainers.UITests.csproj", "{E3B18084-842C-4B80-8E4A-A7E588EC3137}" @@ -75,6 +73,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.Core", "s EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UnitTest", "test\Services\UnitTest\UnitTest.xproj", "{7796F5D8-31FC-45A4-B673-19DE5BA194CF}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Identity.API", "src\Services\Identity\Identity.API\Identity.API.xproj", "{A579E108-5445-403D-A407-339AC4D1611B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU @@ -716,54 +716,6 @@ Global {95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|x64.Build.0 = Release|Any CPU {95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|x86.ActiveCfg = Release|Any CPU {95F1F07C-4D92-4742-BD07-E5B805AAB651}.Release|x86.Build.0 = Release|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|ARM.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhone.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x64.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x64.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x86.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x86.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Debug|ARM.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhone.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Debug|x64.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Debug|x64.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Debug|x86.ActiveCfg = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Debug|x86.Build.0 = Debug|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Release|Any CPU.Build.0 = Release|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Release|ARM.ActiveCfg = Release|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Release|ARM.Build.0 = Release|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhone.ActiveCfg = Release|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhone.Build.0 = Release|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Release|x64.ActiveCfg = Release|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Release|x64.Build.0 = Release|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.ActiveCfg = Release|Any CPU - {A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.Build.0 = Release|Any CPU {621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU {621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU {621E7211-58D0-45FD-9600-1CB490BD930E}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU @@ -956,6 +908,54 @@ Global {7796F5D8-31FC-45A4-B673-19DE5BA194CF}.Release|x64.Build.0 = Release|Any CPU {7796F5D8-31FC-45A4-B673-19DE5BA194CF}.Release|x86.ActiveCfg = Release|Any CPU {7796F5D8-31FC-45A4-B673-19DE5BA194CF}.Release|x86.Build.0 = Release|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x64.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|ARM.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|ARM.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhone.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x64.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x64.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x86.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.AppStore|x86.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Debug|ARM.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhone.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Debug|x64.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Debug|x64.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Debug|x86.ActiveCfg = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Debug|x86.Build.0 = Debug|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Release|Any CPU.Build.0 = Release|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Release|ARM.ActiveCfg = Release|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Release|ARM.Build.0 = Release|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhone.ActiveCfg = Release|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhone.Build.0 = Release|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Release|x64.ActiveCfg = Release|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Release|x64.Build.0 = Release|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.ActiveCfg = Release|Any CPU + {A579E108-5445-403D-A407-339AC4D1611B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -986,10 +986,10 @@ Global {B68C2B56-7581-46AE-B55D-D25DDFD3BFE3} = {B7B1D395-4E06-4036-BE86-C216756B9367} {95F1F07C-4D92-4742-BD07-E5B805AAB651} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B} {02DF7FEE-C302-433D-A6CD-237A2569F236} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8} - {A579E108-5445-403D-A407-339AC4D1611B} = {02DF7FEE-C302-433D-A6CD-237A2569F236} {621E7211-58D0-45FD-9600-1CB490BD930E} = {EF0337F2-ED00-4643-89FD-EE10863F1870} {E3B18084-842C-4B80-8E4A-A7E588EC3137} = {B7B1D395-4E06-4036-BE86-C216756B9367} {67F9D3A8-F71E-4428-913F-C37AE82CDB24} = {778289CA-31F7-4464-8C2A-612EE846F8A7} {7796F5D8-31FC-45A4-B673-19DE5BA194CF} = {EF0337F2-ED00-4643-89FD-EE10863F1870} + {A579E108-5445-403D-A407-339AC4D1611B} = {02DF7FEE-C302-433D-A6CD-237A2569F236} EndGlobalSection EndGlobal diff --git a/src/Services/Identity/eShopOnContainers.Identity/.bowerrc b/src/Services/Identity/Identity.API/.bowerrc similarity index 100% rename from src/Services/Identity/eShopOnContainers.Identity/.bowerrc rename to src/Services/Identity/Identity.API/.bowerrc diff --git a/src/Services/Identity/eShopOnContainers.Identity/AppSettings.cs b/src/Services/Identity/Identity.API/AppSettings.cs similarity index 100% rename from src/Services/Identity/eShopOnContainers.Identity/AppSettings.cs rename to src/Services/Identity/Identity.API/AppSettings.cs diff --git a/src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs b/src/Services/Identity/Identity.API/Configuration/Config.cs similarity index 98% rename from src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs rename to src/Services/Identity/Identity.API/Configuration/Config.cs index ee0c9b5e8..764320096 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Configuration/Config.cs +++ b/src/Services/Identity/Identity.API/Configuration/Config.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.Options; using System.Collections.Generic; -namespace eShopOnContainers.Identity.Configuration +namespace Identity.API.Configuration { public class Config { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs b/src/Services/Identity/Identity.API/Controllers/AccountController.cs similarity index 98% rename from src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs rename to src/Services/Identity/Identity.API/Controllers/AccountController.cs index 39b33bd4c..c4747602f 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs +++ b/src/Services/Identity/Identity.API/Controllers/AccountController.cs @@ -16,11 +16,11 @@ using System.Text.Encodings.Web; using System.Threading.Tasks; using IdentityServer4.Models; using IdentityServer4.Stores; -using eShopOnContainers.Identity.Services; -using eShopOnContainers.Identity.Models; +using Identity.API.Services; +using Identity.API.Models; using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Authorization; -using eShopOnContainers.Identity.Models.AccountViewModels; +using Identity.API.Models.AccountViewModels; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Authentication; diff --git a/src/Services/Identity/eShopOnContainers.Identity/Controllers/ConsentController.cs b/src/Services/Identity/Identity.API/Controllers/ConsentController.cs similarity index 97% rename from src/Services/Identity/eShopOnContainers.Identity/Controllers/ConsentController.cs rename to src/Services/Identity/Identity.API/Controllers/ConsentController.cs index f9c37cdf0..ab954f779 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Controllers/ConsentController.cs +++ b/src/Services/Identity/Identity.API/Controllers/ConsentController.cs @@ -10,8 +10,8 @@ using System.Threading.Tasks; using IdentityServer4.Models; using IdentityServer4.Stores; using IdentityServer4.Quickstart.UI.Models; -using eShopOnContainers.Identity.Models.AccountViewModels; -using eShopOnContainers.Identity.Services; +using Identity.API.Models.AccountViewModels; +using Identity.API.Services; namespace IdentityServer4.Quickstart.UI.Controllers { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Controllers/HomeController.cs b/src/Services/Identity/Identity.API/Controllers/HomeController.cs similarity index 97% rename from src/Services/Identity/eShopOnContainers.Identity/Controllers/HomeController.cs rename to src/Services/Identity/Identity.API/Controllers/HomeController.cs index 3e68ee5d3..9fbc8b190 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Controllers/HomeController.cs +++ b/src/Services/Identity/Identity.API/Controllers/HomeController.cs @@ -3,7 +3,7 @@ using eShopOnContainers.Identity; -using eShopOnContainers.Identity.Services; +using Identity.API.Services; using IdentityServer4.Quickstart.UI.Models; using IdentityServer4.Services; using Microsoft.AspNetCore.Mvc; diff --git a/src/Services/Identity/eShopOnContainers.Identity/Data/ApplicationContextSeed.cs b/src/Services/Identity/Identity.API/Data/ApplicationContextSeed.cs similarity index 96% rename from src/Services/Identity/eShopOnContainers.Identity/Data/ApplicationContextSeed.cs rename to src/Services/Identity/Identity.API/Data/ApplicationContextSeed.cs index 8a413c139..cf8ae612f 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Data/ApplicationContextSeed.cs +++ b/src/Services/Identity/Identity.API/Data/ApplicationContextSeed.cs @@ -3,8 +3,8 @@ using AspNetCore.Identity; using EntityFrameworkCore; using Extensions.Logging; - using global::eShopOnContainers.Identity.Data; - using global::eShopOnContainers.Identity.Models; + using global::Identity.API.Data; + using global::Identity.API.Models; using Microsoft.AspNetCore.Builder; using System; using System.Collections.Generic; diff --git a/src/Services/Identity/eShopOnContainers.Identity/Data/ApplicationDbContext.cs b/src/Services/Identity/Identity.API/Data/ApplicationDbContext.cs similarity index 90% rename from src/Services/Identity/eShopOnContainers.Identity/Data/ApplicationDbContext.cs rename to src/Services/Identity/Identity.API/Data/ApplicationDbContext.cs index 954cdb906..ddbe7bbfd 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Data/ApplicationDbContext.cs +++ b/src/Services/Identity/Identity.API/Data/ApplicationDbContext.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; -using eShopOnContainers.Identity.Models; +using Identity.API.Models; -namespace eShopOnContainers.Identity.Data +namespace Identity.API.Data { public class ApplicationDbContext : IdentityDbContext { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Data/Migrations/20161019122215_Init_Scheme.Designer.cs b/src/Services/Identity/Identity.API/Data/Migrations/20161019122215_Init_Scheme.Designer.cs similarity index 99% rename from src/Services/Identity/eShopOnContainers.Identity/Data/Migrations/20161019122215_Init_Scheme.Designer.cs rename to src/Services/Identity/Identity.API/Data/Migrations/20161019122215_Init_Scheme.Designer.cs index e5a0802ab..af45c0320 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Data/Migrations/20161019122215_Init_Scheme.Designer.cs +++ b/src/Services/Identity/Identity.API/Data/Migrations/20161019122215_Init_Scheme.Designer.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -using eShopOnContainers.Identity.Data; +using Identity.API.Data; namespace WebMVC.Migrations { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Data/Migrations/20161019122215_Init_Scheme.cs b/src/Services/Identity/Identity.API/Data/Migrations/20161019122215_Init_Scheme.cs similarity index 100% rename from src/Services/Identity/eShopOnContainers.Identity/Data/Migrations/20161019122215_Init_Scheme.cs rename to src/Services/Identity/Identity.API/Data/Migrations/20161019122215_Init_Scheme.cs diff --git a/src/Services/Identity/eShopOnContainers.Identity/Data/Migrations/20161020101725_extendProfile.Designer.cs b/src/Services/Identity/Identity.API/Data/Migrations/20161020101725_extendProfile.Designer.cs similarity index 99% rename from src/Services/Identity/eShopOnContainers.Identity/Data/Migrations/20161020101725_extendProfile.Designer.cs rename to src/Services/Identity/Identity.API/Data/Migrations/20161020101725_extendProfile.Designer.cs index 316a7b55a..ac483149b 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Data/Migrations/20161020101725_extendProfile.Designer.cs +++ b/src/Services/Identity/Identity.API/Data/Migrations/20161020101725_extendProfile.Designer.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -using eShopOnContainers.Identity.Data; +using Identity.API.Data; namespace WebMVC.Migrations { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Data/Migrations/20161020101725_extendProfile.cs b/src/Services/Identity/Identity.API/Data/Migrations/20161020101725_extendProfile.cs similarity index 100% rename from src/Services/Identity/eShopOnContainers.Identity/Data/Migrations/20161020101725_extendProfile.cs rename to src/Services/Identity/Identity.API/Data/Migrations/20161020101725_extendProfile.cs diff --git a/src/Services/Identity/eShopOnContainers.Identity/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Services/Identity/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 99% rename from src/Services/Identity/eShopOnContainers.Identity/Data/Migrations/ApplicationDbContextModelSnapshot.cs rename to src/Services/Identity/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs index 6904bdbef..01bc906b0 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Services/Identity/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; -using eShopOnContainers.Identity.Data; +using Identity.API.Data; namespace WebMVC.Migrations { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile similarity index 65% rename from src/Services/Identity/eShopOnContainers.Identity/Dockerfile rename to src/Services/Identity/Identity.API/Dockerfile index d08c2afad..38dda0129 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Dockerfile +++ b/src/Services/Identity/Identity.API/Dockerfile @@ -1,5 +1,5 @@ FROM microsoft/aspnetcore:1.0.1 -ENTRYPOINT ["dotnet", "eShopOnContainers.Identity.dll"] +ENTRYPOINT ["dotnet", "Identity.API.dll"] ARG source=. WORKDIR /app ENV ASPNETCORE_URLS http://*:5105 diff --git a/src/Services/Identity/eShopOnContainers.Identity/eShopOnContainers.Identity.xproj b/src/Services/Identity/Identity.API/Identity.API.xproj similarity index 94% rename from src/Services/Identity/eShopOnContainers.Identity/eShopOnContainers.Identity.xproj rename to src/Services/Identity/Identity.API/Identity.API.xproj index 6a72253f3..c767e3c0b 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/eShopOnContainers.Identity.xproj +++ b/src/Services/Identity/Identity.API/Identity.API.xproj @@ -7,7 +7,7 @@ a579e108-5445-403d-a407-339ac4d1611b - eShopOnContainers.Identity + Identity.API .\obj .\bin\ v4.6 @@ -20,4 +20,4 @@ - + \ No newline at end of file diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ConsentInputModel.cs b/src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentInputModel.cs similarity index 88% rename from src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ConsentInputModel.cs rename to src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentInputModel.cs index 033488e49..89a2d90e7 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ConsentInputModel.cs +++ b/src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentInputModel.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace eShopOnContainers.Identity.Models.AccountViewModels +namespace Identity.API.Models.AccountViewModels { public class ConsentInputModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ConsentViewModel.cs b/src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentViewModel.cs similarity index 97% rename from src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ConsentViewModel.cs rename to src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentViewModel.cs index 3b9eb0891..07124587c 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ConsentViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/AccountViewModels/ConsentViewModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using IdentityServer4.Models; -namespace eShopOnContainers.Identity.Models.AccountViewModels +namespace Identity.API.Models.AccountViewModels { public class ConsentViewModel : ConsentInputModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs b/src/Services/Identity/Identity.API/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs similarity index 82% rename from src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs rename to src/Services/Identity/Identity.API/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs index 30f982a19..526f320ba 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Models.AccountViewModels +namespace Identity.API.Models.AccountViewModels { public class ExternalLoginConfirmationViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ForgotPasswordViewModel.cs b/src/Services/Identity/Identity.API/Models/AccountViewModels/ForgotPasswordViewModel.cs similarity index 82% rename from src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ForgotPasswordViewModel.cs rename to src/Services/Identity/Identity.API/Models/AccountViewModels/ForgotPasswordViewModel.cs index 903b83a27..fd00ca55f 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ForgotPasswordViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/AccountViewModels/ForgotPasswordViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Models.AccountViewModels +namespace Identity.API.Models.AccountViewModels { public class ForgotPasswordViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/LoggedOutViewModel.cs b/src/Services/Identity/Identity.API/Models/AccountViewModels/LoggedOutViewModel.cs similarity index 86% rename from src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/LoggedOutViewModel.cs rename to src/Services/Identity/Identity.API/Models/AccountViewModels/LoggedOutViewModel.cs index 535710b3b..d78c9e984 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/LoggedOutViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/AccountViewModels/LoggedOutViewModel.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. -namespace eShopOnContainers.Identity.Models.AccountViewModels +namespace Identity.API.Models.AccountViewModels { public class LoggedOutViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/LoginViewModel.cs b/src/Services/Identity/Identity.API/Models/AccountViewModels/LoginViewModel.cs similarity index 90% rename from src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/LoginViewModel.cs rename to src/Services/Identity/Identity.API/Models/AccountViewModels/LoginViewModel.cs index 6e82f0315..edb29a8d2 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/LoginViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/AccountViewModels/LoginViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; -namespace eShopOnContainers.Identity.Models.AccountViewModels +namespace Identity.API.Models.AccountViewModels { public class LoginViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/LogoutViewModel.cs b/src/Services/Identity/Identity.API/Models/AccountViewModels/LogoutViewModel.cs similarity index 81% rename from src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/LogoutViewModel.cs rename to src/Services/Identity/Identity.API/Models/AccountViewModels/LogoutViewModel.cs index 15c0a5e0c..fd5153288 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/LogoutViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/AccountViewModels/LogoutViewModel.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. -namespace eShopOnContainers.Identity.Models.AccountViewModels +namespace Identity.API.Models.AccountViewModels { public class LogoutViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/RegisterViewModel.cs b/src/Services/Identity/Identity.API/Models/AccountViewModels/RegisterViewModel.cs similarity index 93% rename from src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/RegisterViewModel.cs rename to src/Services/Identity/Identity.API/Models/AccountViewModels/RegisterViewModel.cs index 31dcb8acb..c84c1478d 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/RegisterViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/AccountViewModels/RegisterViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Models.AccountViewModels +namespace Identity.API.Models.AccountViewModels { public class RegisterViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ResetPasswordViewModel.cs b/src/Services/Identity/Identity.API/Models/AccountViewModels/ResetPasswordViewModel.cs similarity index 92% rename from src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ResetPasswordViewModel.cs rename to src/Services/Identity/Identity.API/Models/AccountViewModels/ResetPasswordViewModel.cs index dfc66df17..a90c4ca64 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/ResetPasswordViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/AccountViewModels/ResetPasswordViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Models.AccountViewModels +namespace Identity.API.Models.AccountViewModels { public class ResetPasswordViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/SendCodeViewModel.cs b/src/Services/Identity/Identity.API/Models/AccountViewModels/SendCodeViewModel.cs similarity index 86% rename from src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/SendCodeViewModel.cs rename to src/Services/Identity/Identity.API/Models/AccountViewModels/SendCodeViewModel.cs index 3c74a16fd..b5efaed34 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/SendCodeViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/AccountViewModels/SendCodeViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Rendering; -namespace eShopOnContainers.Identity.Models.AccountViewModels +namespace Identity.API.Models.AccountViewModels { public class SendCodeViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/VerifyCodeViewModel.cs b/src/Services/Identity/Identity.API/Models/AccountViewModels/VerifyCodeViewModel.cs similarity index 90% rename from src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/VerifyCodeViewModel.cs rename to src/Services/Identity/Identity.API/Models/AccountViewModels/VerifyCodeViewModel.cs index 36bd23ef2..f0a18d663 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/VerifyCodeViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/AccountViewModels/VerifyCodeViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Models.AccountViewModels +namespace Identity.API.Models.AccountViewModels { public class VerifyCodeViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/_LoginViewModel.cs b/src/Services/Identity/Identity.API/Models/AccountViewModels/_LoginViewModel.cs similarity index 90% rename from src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/_LoginViewModel.cs rename to src/Services/Identity/Identity.API/Models/AccountViewModels/_LoginViewModel.cs index 9c4505147..63290cb8a 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/AccountViewModels/_LoginViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/AccountViewModels/_LoginViewModel.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace eShopOnContainers.Identity.Models.AccountViewModels +namespace Identity.API.Models.AccountViewModels { //public class _LoginViewModel : LoginViewModel //{ diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/ApplicationUser.cs b/src/Services/Identity/Identity.API/Models/ApplicationUser.cs similarity index 96% rename from src/Services/Identity/eShopOnContainers.Identity/Models/ApplicationUser.cs rename to src/Services/Identity/Identity.API/Models/ApplicationUser.cs index 5d009b718..b520c333b 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/ApplicationUser.cs +++ b/src/Services/Identity/Identity.API/Models/ApplicationUser.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using System.ComponentModel.DataAnnotations; -namespace eShopOnContainers.Identity.Models +namespace Identity.API.Models { // Add profile data for application users by adding properties to the ApplicationUser class public class ApplicationUser : IdentityUser diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/ErrorViewModel.cs b/src/Services/Identity/Identity.API/Models/ErrorViewModel.cs similarity index 100% rename from src/Services/Identity/eShopOnContainers.Identity/Models/ErrorViewModel.cs rename to src/Services/Identity/Identity.API/Models/ErrorViewModel.cs diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/AddPhoneNumberViewModel.cs b/src/Services/Identity/Identity.API/Models/ManageViewModels/AddPhoneNumberViewModel.cs similarity index 84% rename from src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/AddPhoneNumberViewModel.cs rename to src/Services/Identity/Identity.API/Models/ManageViewModels/AddPhoneNumberViewModel.cs index 535a66f5e..ada4b8a03 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/AddPhoneNumberViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/ManageViewModels/AddPhoneNumberViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Models.ManageViewModels +namespace Identity.API.Models.ManageViewModels { public class AddPhoneNumberViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/ChangePasswordViewModel.cs b/src/Services/Identity/Identity.API/Models/ManageViewModels/ChangePasswordViewModel.cs similarity index 93% rename from src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/ChangePasswordViewModel.cs rename to src/Services/Identity/Identity.API/Models/ManageViewModels/ChangePasswordViewModel.cs index 967374c42..b0df1b2af 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/ChangePasswordViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/ManageViewModels/ChangePasswordViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Models.ManageViewModels +namespace Identity.API.Models.ManageViewModels { public class ChangePasswordViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs b/src/Services/Identity/Identity.API/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs similarity index 84% rename from src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs rename to src/Services/Identity/Identity.API/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs index 548bf4623..5ed3b2925 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Rendering; -namespace eShopOnContainers.Identity.Models.ManageViewModels +namespace Identity.API.Models.ManageViewModels { public class ConfigureTwoFactorViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/FactorViewModel.cs b/src/Services/Identity/Identity.API/Models/ManageViewModels/FactorViewModel.cs similarity index 76% rename from src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/FactorViewModel.cs rename to src/Services/Identity/Identity.API/Models/ManageViewModels/FactorViewModel.cs index 71b5da71e..92eccf504 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/FactorViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/ManageViewModels/FactorViewModel.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Models.ManageViewModels +namespace Identity.API.Models.ManageViewModels { public class FactorViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/IndexViewModel.cs b/src/Services/Identity/Identity.API/Models/ManageViewModels/IndexViewModel.cs similarity index 87% rename from src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/IndexViewModel.cs rename to src/Services/Identity/Identity.API/Models/ManageViewModels/IndexViewModel.cs index d7c16d8b9..f6e5b6874 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/IndexViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/ManageViewModels/IndexViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Identity; -namespace eShopOnContainers.Identity.Models.ManageViewModels +namespace Identity.API.Models.ManageViewModels { public class IndexViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/ManageLoginsViewModel.cs b/src/Services/Identity/Identity.API/Models/ManageViewModels/ManageLoginsViewModel.cs similarity index 86% rename from src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/ManageLoginsViewModel.cs rename to src/Services/Identity/Identity.API/Models/ManageViewModels/ManageLoginsViewModel.cs index 21c3dbaf2..1238585cd 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/ManageLoginsViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/ManageViewModels/ManageLoginsViewModel.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Authentication; using Microsoft.AspNetCore.Identity; -namespace eShopOnContainers.Identity.Models.ManageViewModels +namespace Identity.API.Models.ManageViewModels { public class ManageLoginsViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/RemoveLoginViewModel.cs b/src/Services/Identity/Identity.API/Models/ManageViewModels/RemoveLoginViewModel.cs similarity index 83% rename from src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/RemoveLoginViewModel.cs rename to src/Services/Identity/Identity.API/Models/ManageViewModels/RemoveLoginViewModel.cs index a5686b1f5..546f0b1e8 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/RemoveLoginViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/ManageViewModels/RemoveLoginViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Models.ManageViewModels +namespace Identity.API.Models.ManageViewModels { public class RemoveLoginViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/SetPasswordViewModel.cs b/src/Services/Identity/Identity.API/Models/ManageViewModels/SetPasswordViewModel.cs similarity index 92% rename from src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/SetPasswordViewModel.cs rename to src/Services/Identity/Identity.API/Models/ManageViewModels/SetPasswordViewModel.cs index 720f4d15a..d824afc94 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/SetPasswordViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/ManageViewModels/SetPasswordViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Models.ManageViewModels +namespace Identity.API.Models.ManageViewModels { public class SetPasswordViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs b/src/Services/Identity/Identity.API/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs similarity index 86% rename from src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs rename to src/Services/Identity/Identity.API/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs index 31c3e5fe6..af7105a2e 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs +++ b/src/Services/Identity/Identity.API/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Models.ManageViewModels +namespace Identity.API.Models.ManageViewModels { public class VerifyPhoneNumberViewModel { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Program.cs b/src/Services/Identity/Identity.API/Program.cs similarity index 100% rename from src/Services/Identity/eShopOnContainers.Identity/Program.cs rename to src/Services/Identity/Identity.API/Program.cs diff --git a/src/Services/Identity/eShopOnContainers.Identity/Properties/launchSettings.json b/src/Services/Identity/Identity.API/Properties/launchSettings.json similarity index 100% rename from src/Services/Identity/eShopOnContainers.Identity/Properties/launchSettings.json rename to src/Services/Identity/Identity.API/Properties/launchSettings.json diff --git a/src/Services/Identity/eShopOnContainers.Identity/README.md b/src/Services/Identity/Identity.API/README.md similarity index 100% rename from src/Services/Identity/eShopOnContainers.Identity/README.md rename to src/Services/Identity/Identity.API/README.md diff --git a/src/Services/Identity/eShopOnContainers.Identity/Services/EFLoginService.cs b/src/Services/Identity/Identity.API/Services/EFLoginService.cs similarity index 91% rename from src/Services/Identity/eShopOnContainers.Identity/Services/EFLoginService.cs rename to src/Services/Identity/Identity.API/Services/EFLoginService.cs index d0f2532f6..e1c2fe52e 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Services/EFLoginService.cs +++ b/src/Services/Identity/Identity.API/Services/EFLoginService.cs @@ -1,11 +1,11 @@ -using eShopOnContainers.Identity.Models; +using Identity.API.Models; using Microsoft.AspNetCore.Identity; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Services +namespace Identity.API.Services { public class EFLoginService : ILoginService { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Services/IEmailSender.cs b/src/Services/Identity/Identity.API/Services/IEmailSender.cs similarity index 83% rename from src/Services/Identity/eShopOnContainers.Identity/Services/IEmailSender.cs rename to src/Services/Identity/Identity.API/Services/IEmailSender.cs index 7634270d8..2259641f8 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Services/IEmailSender.cs +++ b/src/Services/Identity/Identity.API/Services/IEmailSender.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Services +namespace Identity.API.Services { public interface IEmailSender { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Services/ILoginService.cs b/src/Services/Identity/Identity.API/Services/ILoginService.cs similarity index 86% rename from src/Services/Identity/eShopOnContainers.Identity/Services/ILoginService.cs rename to src/Services/Identity/Identity.API/Services/ILoginService.cs index 398102adb..5915b42ee 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Services/ILoginService.cs +++ b/src/Services/Identity/Identity.API/Services/ILoginService.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Services +namespace Identity.API.Services { public interface ILoginService { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Services/IRedirectService.cs b/src/Services/Identity/Identity.API/Services/IRedirectService.cs similarity index 82% rename from src/Services/Identity/eShopOnContainers.Identity/Services/IRedirectService.cs rename to src/Services/Identity/Identity.API/Services/IRedirectService.cs index 20982460b..9dd277e2d 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Services/IRedirectService.cs +++ b/src/Services/Identity/Identity.API/Services/IRedirectService.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Services +namespace Identity.API.Services { public interface IRedirectService { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Services/ISmsSender.cs b/src/Services/Identity/Identity.API/Services/ISmsSender.cs similarity index 81% rename from src/Services/Identity/eShopOnContainers.Identity/Services/ISmsSender.cs rename to src/Services/Identity/Identity.API/Services/ISmsSender.cs index 95d626d64..5c6bd2aae 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Services/ISmsSender.cs +++ b/src/Services/Identity/Identity.API/Services/ISmsSender.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Services +namespace Identity.API.Services { public interface ISmsSender { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Services/MessageServices.cs b/src/Services/Identity/Identity.API/Services/MessageServices.cs similarity index 94% rename from src/Services/Identity/eShopOnContainers.Identity/Services/MessageServices.cs rename to src/Services/Identity/Identity.API/Services/MessageServices.cs index 65604979a..d9898cba4 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Services/MessageServices.cs +++ b/src/Services/Identity/Identity.API/Services/MessageServices.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Services +namespace Identity.API.Services { // This class is used by the application to send Email and SMS // when you turn on two-factor authentication in ASP.NET Identity. diff --git a/src/Services/Identity/eShopOnContainers.Identity/Services/ProfileService.cs b/src/Services/Identity/Identity.API/Services/ProfileService.cs similarity index 98% rename from src/Services/Identity/eShopOnContainers.Identity/Services/ProfileService.cs rename to src/Services/Identity/Identity.API/Services/ProfileService.cs index 79a419382..1d7e548bb 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Services/ProfileService.cs +++ b/src/Services/Identity/Identity.API/Services/ProfileService.cs @@ -5,11 +5,11 @@ using System.Linq; using System.Threading.Tasks; using IdentityServer4.Models; using Microsoft.AspNetCore.Identity; -using eShopOnContainers.Identity.Models; +using Identity.API.Models; using System.Security.Claims; using IdentityModel; -namespace eShopOnContainers.Identity.Services +namespace Identity.API.Services { public class ProfileService : IProfileService { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Services/RedirectService.cs b/src/Services/Identity/Identity.API/Services/RedirectService.cs similarity index 95% rename from src/Services/Identity/eShopOnContainers.Identity/Services/RedirectService.cs rename to src/Services/Identity/Identity.API/Services/RedirectService.cs index d38ad9d38..440272d39 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Services/RedirectService.cs +++ b/src/Services/Identity/Identity.API/Services/RedirectService.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -namespace eShopOnContainers.Identity.Services +namespace Identity.API.Services { public class RedirectService : IRedirectService { diff --git a/src/Services/Identity/eShopOnContainers.Identity/Startup.cs b/src/Services/Identity/Identity.API/Startup.cs similarity index 96% rename from src/Services/Identity/eShopOnContainers.Identity/Startup.cs rename to src/Services/Identity/Identity.API/Startup.cs index f132cd3c8..d29459395 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Startup.cs +++ b/src/Services/Identity/Identity.API/Startup.cs @@ -9,10 +9,10 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using eShopOnContainers.Identity.Data; -using eShopOnContainers.Identity.Models; -using eShopOnContainers.Identity.Services; -using eShopOnContainers.Identity.Configuration; +using Identity.API.Data; +using Identity.API.Models; +using Identity.API.Services; +using Identity.API.Configuration; using IdentityServer4.Services; using System.Threading; using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure; diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/LoggedOut.cshtml b/src/Services/Identity/Identity.API/Views/Account/LoggedOut.cshtml similarity index 86% rename from src/Services/Identity/eShopOnContainers.Identity/Views/Account/LoggedOut.cshtml rename to src/Services/Identity/Identity.API/Views/Account/LoggedOut.cshtml index 11886a1b0..ea6fdbfbc 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/LoggedOut.cshtml +++ b/src/Services/Identity/Identity.API/Views/Account/LoggedOut.cshtml @@ -1,4 +1,4 @@ -@model eShopOnContainers.Identity.Models.AccountViewModels.LoggedOutViewModel +@model Identity.API.Models.AccountViewModels.LoggedOutViewModel

diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Login.cshtml b/src/Services/Identity/Identity.API/Views/Account/Login.cshtml similarity index 97% rename from src/Services/Identity/eShopOnContainers.Identity/Views/Account/Login.cshtml rename to src/Services/Identity/Identity.API/Views/Account/Login.cshtml index e008f672c..88f6884cc 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Login.cshtml +++ b/src/Services/Identity/Identity.API/Views/Account/Login.cshtml @@ -1,7 +1,7 @@ @using System.Collections.Generic @using Microsoft.AspNetCore.Http @using Microsoft.AspNetCore.Http.Authentication -@model eShopOnContainers.Identity.Models.AccountViewModels.LoginViewModel +@model Identity.API.Models.AccountViewModels.LoginViewModel @{ diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Logout.cshtml b/src/Services/Identity/Identity.API/Views/Account/Logout.cshtml similarity index 87% rename from src/Services/Identity/eShopOnContainers.Identity/Views/Account/Logout.cshtml rename to src/Services/Identity/Identity.API/Views/Account/Logout.cshtml index 1d7aba8c8..cbd50bd8d 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Logout.cshtml +++ b/src/Services/Identity/Identity.API/Views/Account/Logout.cshtml @@ -1,4 +1,4 @@ -@model eShopOnContainers.Identity.Models.AccountViewModels.LogoutViewModel +@model Identity.API.Models.AccountViewModels.LogoutViewModel
diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Redirecting.cshtml b/src/Services/Identity/Identity.API/Views/Account/Redirecting.cshtml similarity index 100% rename from src/Services/Identity/eShopOnContainers.Identity/Views/Account/Redirecting.cshtml rename to src/Services/Identity/Identity.API/Views/Account/Redirecting.cshtml diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Register.cshtml b/src/Services/Identity/Identity.API/Views/Account/Register.cshtml similarity index 98% rename from src/Services/Identity/eShopOnContainers.Identity/Views/Account/Register.cshtml rename to src/Services/Identity/Identity.API/Views/Account/Register.cshtml index 24a2afbb1..aad68e9cc 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Register.cshtml +++ b/src/Services/Identity/Identity.API/Views/Account/Register.cshtml @@ -1,4 +1,4 @@ -@using eShopOnContainers.Identity.Models.AccountViewModels +@using Identity.API.Models.AccountViewModels @model RegisterViewModel @{ ViewData["Title"] = "Register"; diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Consent/Index.cshtml b/src/Services/Identity/Identity.API/Views/Consent/Index.cshtml similarity index 97% rename from src/Services/Identity/eShopOnContainers.Identity/Views/Consent/Index.cshtml rename to src/Services/Identity/Identity.API/Views/Consent/Index.cshtml index 36a99254c..1304e965a 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Consent/Index.cshtml +++ b/src/Services/Identity/Identity.API/Views/Consent/Index.cshtml @@ -1,4 +1,4 @@ -@model eShopOnContainers.Identity.Models.AccountViewModels.ConsentViewModel +@model Identity.API.Models.AccountViewModels.ConsentViewModel
diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Consent/_ScopeListItem.cshtml b/src/Services/Identity/Identity.API/Views/Consent/_ScopeListItem.cshtml similarity index 91% rename from src/Services/Identity/eShopOnContainers.Identity/Views/Consent/_ScopeListItem.cshtml rename to src/Services/Identity/Identity.API/Views/Consent/_ScopeListItem.cshtml index b7b2971c5..2609a6490 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Consent/_ScopeListItem.cshtml +++ b/src/Services/Identity/Identity.API/Views/Consent/_ScopeListItem.cshtml @@ -1,4 +1,4 @@ -@model eShopOnContainers.Identity.Models.AccountViewModels.ScopeViewModel +@model Identity.API.Models.AccountViewModels.ScopeViewModel
    • +
    diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.service.ts b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.service.ts index 20899b9a9..9a7b9a34d 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.service.ts +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.service.ts @@ -62,7 +62,7 @@ export class OrdersService { order.city = identityInfo.address_city; order.country = identityInfo.address_country; order.state = identityInfo.address_state; - order.zipcode = identityInfo.addrees_zipcode; + order.zipcode = identityInfo.address_zip_code; order.cardexpiration = identityInfo.card_expiration; order.cardnumber = identityInfo.card_number; order.cardsecuritynumber = identityInfo.card_security_number; diff --git a/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs b/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs index 3230b1924..1320d47e3 100644 --- a/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs +++ b/test/Services/FunctionalTests/Services/Ordering/OrderingScenarios.cs @@ -1,12 +1,13 @@ namespace FunctionalTests.Services.Ordering { - using Microsoft.eShopOnContainers.Services.Ordering.API.Models; + using Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands; using Newtonsoft.Json; using System; using System.Net.Http; using System.Text; using System.Threading.Tasks; using Xunit; + using static Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands.CreateOrderCommand; public class OrderingScenarios : OrderingScenarioBase @@ -64,34 +65,45 @@ string BuildOrder() { - var order = new NewOrderViewModel() + var order = new CreateOrderCommand() { CardExpiration = DateTime.UtcNow.AddYears(1), CardNumber = "5145-555-5555", CardHolderName = "Jhon Senna", CardSecurityNumber = "232", - CardType = "Amex", - ShippingCity = "Redmon", - ShippingCountry = "USA", - ShippingState = "WA", - ShippingStreet = "One way" + CardTypeId = 1, + City = "Redmon", + Country = "USA", + State = "WA", + Street = "One way", + ZipCode = "zipcode", }; + order.AddOrderItem(new OrderItemDTO() + { + ProductId = 1, + Discount = 10M, + UnitPrice = 10, + Units = 1, + ProductName = "Some name" + }); + return JsonConvert.SerializeObject(order); } string BuildOrderWithInvalidExperationTime() { - var order = new NewOrderViewModel() + var order = new CreateOrderCommand() { CardExpiration = DateTime.UtcNow.AddYears(-1), CardNumber = "5145-555-5555", CardHolderName = "Jhon Senna", CardSecurityNumber = "232", - CardType = "Amex", - ShippingCity = "Redmon", - ShippingCountry = "USA", - ShippingState = "WA", - ShippingStreet = "One way" + CardTypeId = 1, + City = "Redmon", + Country = "USA", + State = "WA", + Street = "One way", + ZipCode = "zipcode" }; return JsonConvert.SerializeObject(order); diff --git a/test/Services/FunctionalTests/project.json b/test/Services/FunctionalTests/project.json index 56d0182a2..9db48cfb1 100644 --- a/test/Services/FunctionalTests/project.json +++ b/test/Services/FunctionalTests/project.json @@ -2,21 +2,28 @@ "version": "1.0.0-*", "dependencies": { - "Microsoft.NETCore.App": "1.1.0", + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.1.0" + }, "Microsoft.AspNetCore.TestHost": "1.1.0", "dotnet-test-xunit": "2.2.0-preview2-build1029", + "Microsoft.DotNet.InternalAbstractions": "1.0.0", "xunit": "2.2.0-beta4-build3444", "Catalog.API": "1.0.0-*", "Ordering.API": "1.0.0-*" }, "testRunner": "xunit", - "runtimes": { - "win10-x64": {} - }, + //"runtimes": { + // "win10-x64": {} + //}, "frameworks": { - "netcoreapp1.0": { - "dependencies": { - } + "netcoreapp1.1": { + "imports": [ + "netstandard1.6.1", + "dnxcore50", + "portable-net451+win8" + ] } }, "publishOptions": { diff --git a/test/Services/UnitTest/Ordering/Application/NewOrderCommandHandlerTest.cs b/test/Services/UnitTest/Ordering/Application/NewOrderCommandHandlerTest.cs index d2a22e4a5..af26cbe49 100644 --- a/test/Services/UnitTest/Ordering/Application/NewOrderCommandHandlerTest.cs +++ b/test/Services/UnitTest/Ordering/Application/NewOrderCommandHandlerTest.cs @@ -1,16 +1,14 @@ -namespace UnitTest.Ordering.Application +using Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands; +using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate; +using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate; +using Moq; +using System; +using System.Threading; +using System.Threading.Tasks; +using Xunit; + +namespace UnitTest.Ordering.Application { - using Microsoft.eShopOnContainers.Services.Ordering.Api.Application.Commands; - using Microsoft.eShopOnContainers.Services.Ordering.Domain; - using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate; - using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate; - using Moq; - using System; - using System.Threading; - using System.Threading.Tasks; - using Xunit; - - public class NewOrderRequestHandlerTest { private readonly Mock _buyerRepositoryMock; @@ -27,7 +25,7 @@ public async Task Handle_returns_true_when_order_is_persisted_succesfully() { // Arrange - _buyerRepositoryMock.Setup(buyerRepo => buyerRepo.FindAsync(FakeOrderRequestWithBuyer().BuyerIdentityGuid)) + _buyerRepositoryMock.Setup(buyerRepo => buyerRepo.FindAsync(FakeOrderRequestWithBuyer().BuyerFullName)) .Returns(Task.FromResult(FakeBuyer())); _buyerRepositoryMock.Setup(buyerRepo => buyerRepo.UnitOfWork.SaveChangesAsync(default(CancellationToken))) @@ -50,7 +48,7 @@ [Fact] public async Task Handle_return_false_if_order_is_not_persisted() { - _buyerRepositoryMock.Setup(buyerRepo => buyerRepo.FindAsync(FakeOrderRequestWithBuyer().BuyerIdentityGuid)) + _buyerRepositoryMock.Setup(buyerRepo => buyerRepo.FindAsync(FakeOrderRequestWithBuyer().BuyerFullName)) .Returns(Task.FromResult(FakeBuyer())); _buyerRepositoryMock.Setup(buyerRepo => buyerRepo.UnitOfWork.SaveChangesAsync(default(CancellationToken))) @@ -75,17 +73,14 @@ private Order FakeOrder() { - return new Order(1, 1) - { - - }; + return new Order(1, 1, new Address("street", "city", "state", "country", "zipcode")); } private CreateOrderCommand FakeOrderRequestWithBuyer() { return new CreateOrderCommand { - BuyerIdentityGuid = "1234", + BuyerFullName = "1234", CardNumber = "1234", CardExpiration = DateTime.Now.AddYears(1), CardSecurityNumber = "123", diff --git a/test/Services/UnitTest/project.json b/test/Services/UnitTest/project.json index 0e54e4c4f..e44322750 100644 --- a/test/Services/UnitTest/project.json +++ b/test/Services/UnitTest/project.json @@ -2,23 +2,27 @@ "version": "1.0.0-*", "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.1.0" + }, "MediatR": "2.1.0", "Moq": "4.6.38-alpha", - "Microsoft.NETCore.App": "1.1.0", "xunit": "2.2.0-beta4-build3444", - "Ordering.API": "1.0.0-*", - "Catalog.API": "1.0.0-*", "Microsoft.AspNetCore.TestHost": "1.1.0", - "dotnet-test-xunit": "2.2.0-preview2-build1029" + "dotnet-test-xunit": "2.2.0-preview2-build1029", + "Ordering.API": "1.0.0-*", + "Ordering.Infrastructure": "1.0.0-*", + "Ordering.Domain": "1.0.0-*" }, "testRunner": "xunit", - "runtimes": { - "win10-x64": {} - }, "frameworks": { - "netcoreapp1.0": { - "dependencies": { - } + "netcoreapp1.1": { + "imports": [ + "netstandard1.6.1", + "dnxcore50", + "portable-net451+win8" + ] } } }