From c29b783d935acd4aee07c2806c31c365dfdecb60 Mon Sep 17 00:00:00 2001 From: "PLAINCONCEPTS\\ccanizares" Date: Mon, 30 Jan 2017 11:35:16 +0100 Subject: [PATCH] rename identity project --- build-images.ps1 | 2 +- eShopOnContainers-ServicesAndWebApps.sln | 2 +- eShopOnContainers.sln | 102 +++++++++--------- .../.bowerrc | 0 .../AppSettings.cs | 0 .../Configuration/Config.cs | 2 +- .../Controllers/AccountController.cs | 6 +- .../Controllers/ConsentController.cs | 4 +- .../Controllers/HomeController.cs | 2 +- .../Data/ApplicationContextSeed.cs | 4 +- .../Data/ApplicationDbContext.cs | 4 +- .../20161019122215_Init_Scheme.Designer.cs | 2 +- .../Migrations/20161019122215_Init_Scheme.cs | 0 .../20161020101725_extendProfile.Designer.cs | 2 +- .../20161020101725_extendProfile.cs | 0 .../ApplicationDbContextModelSnapshot.cs | 2 +- .../Dockerfile | 2 +- .../Identity.API.xproj} | 4 +- .../AccountViewModels/ConsentInputModel.cs | 2 +- .../AccountViewModels/ConsentViewModel.cs | 2 +- .../ExternalLoginConfirmationViewModel.cs | 2 +- .../ForgotPasswordViewModel.cs | 2 +- .../AccountViewModels/LoggedOutViewModel.cs | 2 +- .../AccountViewModels/LoginViewModel.cs | 2 +- .../AccountViewModels/LogoutViewModel.cs | 2 +- .../AccountViewModels/RegisterViewModel.cs | 2 +- .../ResetPasswordViewModel.cs | 2 +- .../AccountViewModels/SendCodeViewModel.cs | 2 +- .../AccountViewModels/VerifyCodeViewModel.cs | 2 +- .../AccountViewModels/_LoginViewModel.cs | 2 +- .../Models/ApplicationUser.cs | 2 +- .../Models/ErrorViewModel.cs | 0 .../AddPhoneNumberViewModel.cs | 2 +- .../ChangePasswordViewModel.cs | 2 +- .../ConfigureTwoFactorViewModel.cs | 2 +- .../ManageViewModels/FactorViewModel.cs | 2 +- .../Models/ManageViewModels/IndexViewModel.cs | 2 +- .../ManageViewModels/ManageLoginsViewModel.cs | 2 +- .../ManageViewModels/RemoveLoginViewModel.cs | 2 +- .../ManageViewModels/SetPasswordViewModel.cs | 2 +- .../VerifyPhoneNumberViewModel.cs | 2 +- .../Program.cs | 0 .../Properties/launchSettings.json | 0 .../README.md | 0 .../Services/EFLoginService.cs | 4 +- .../Services/IEmailSender.cs | 2 +- .../Services/ILoginService.cs | 2 +- .../Services/IRedirectService.cs | 2 +- .../Services/ISmsSender.cs | 2 +- .../Services/MessageServices.cs | 2 +- .../Services/ProfileService.cs | 4 +- .../Services/RedirectService.cs | 2 +- .../Startup.cs | 8 +- .../Views/Account/LoggedOut.cshtml | 2 +- .../Views/Account/Login.cshtml | 2 +- .../Views/Account/Logout.cshtml | 2 +- .../Views/Account/Redirecting.cshtml | 0 .../Views/Account/Register.cshtml | 2 +- .../Views/Consent/Index.cshtml | 2 +- .../Views/Consent/_ScopeListItem.cshtml | 2 +- .../Views/Home/About.cshtml | 0 .../Views/Home/Contact.cshtml | 0 .../Views/Home/Index.cshtml | 0 .../Views/Shared/Error.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/Shared/_LoginPartial.cshtml | 2 +- .../Shared/_ValidationScriptsPartial.cshtml | 0 .../Views/Shared/_ValidationSummary.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../appsettings.json | 0 .../bower.json | 0 .../bundleconfig.json | 0 .../docker-compose.yml | 0 .../project.json | 0 .../web.config | 0 .../wwwroot/_references.js | 0 .../wwwroot/css/site.css | 0 .../wwwroot/css/site.less | 0 .../wwwroot/css/site.min.css | 0 .../wwwroot/favicon.ico | Bin .../wwwroot/fonts/Montserrat-Bold.eot | Bin .../wwwroot/fonts/Montserrat-Bold.svg | 0 .../wwwroot/fonts/Montserrat-Bold.ttf | Bin .../wwwroot/fonts/Montserrat-Bold.woff | Bin .../wwwroot/fonts/Montserrat-Bold.woff2 | Bin .../wwwroot/fonts/Montserrat-Regular.eot | Bin .../wwwroot/fonts/Montserrat-Regular.svg | 0 .../wwwroot/fonts/Montserrat-Regular.ttf | Bin .../wwwroot/fonts/Montserrat-Regular.woff | Bin .../wwwroot/fonts/Montserrat-Regular.woff2 | Bin .../wwwroot/icon.jpg | Bin .../wwwroot/icon.png | Bin .../wwwroot/images/arrow-down.png | Bin .../wwwroot/images/arrow-right.svg | 0 .../wwwroot/images/banner1.svg | 0 .../wwwroot/images/banner2.svg | 0 .../wwwroot/images/banner3.svg | 0 .../wwwroot/images/banner4.svg | 0 .../wwwroot/images/brand.PNG | Bin .../wwwroot/images/brand_dark.PNG | Bin .../wwwroot/images/cart.png | Bin .../wwwroot/images/logout.PNG | Bin .../wwwroot/images/main_banner.png | Bin .../wwwroot/images/main_banner_text.png | Bin .../wwwroot/images/main_banner_text.svg | 0 .../wwwroot/images/my_orders.PNG | Bin .../wwwroot/images/refresh.svg | 0 .../wwwroot/js/site.js | 0 .../wwwroot/js/site.min.js | 0 .../wwwroot/lib/bootstrap/.bower.json | 0 .../wwwroot/lib/bootstrap/LICENSE | 0 .../wwwroot/lib/bootstrap/css/bootstrap.css | 0 .../lib/bootstrap/css/bootstrap.css.map | 0 .../lib/bootstrap/css/bootstrap.min.css | 0 .../bootstrap/dist/css/bootstrap-theme.css | 0 .../dist/css/bootstrap-theme.css.map | 0 .../dist/css/bootstrap-theme.min.css | 0 .../dist/css/bootstrap-theme.min.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.css | 0 .../lib/bootstrap/dist/css/bootstrap.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.min.css | 0 .../bootstrap/dist/css/bootstrap.min.css.map | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../lib/bootstrap/dist/js/bootstrap.js | 0 .../lib/bootstrap/dist/js/bootstrap.min.js | 0 .../wwwroot/lib/bootstrap/dist/js/npm.js | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../wwwroot/lib/bootstrap/js/bootstrap.js | 0 .../wwwroot/lib/bootstrap/js/bootstrap.min.js | 0 .../jquery-validation-unobtrusive/.bower.json | 0 .../jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../wwwroot/lib/jquery-validation/.bower.json | 0 .../wwwroot/lib/jquery-validation/LICENSE.md | 0 .../dist/additional-methods.js | 0 .../dist/additional-methods.min.js | 0 .../jquery-validation/dist/jquery.validate.js | 0 .../dist/jquery.validate.min.js | 0 .../wwwroot/lib/jquery/.bower.json | 0 .../wwwroot/lib/jquery/LICENSE.txt | 0 .../wwwroot/lib/jquery/dist/jquery.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.map | 0 .../wwwroot/lib/jquery/jquery.js | 0 .../wwwroot/lib/jquery/jquery.min.js | 0 .../wwwroot/lib/jquery/jquery.min.map | 0 .../Application/NewOrderCommandHandlerTest.cs | 3 +- 156 files changed, 115 insertions(+), 114 deletions(-) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/.bowerrc (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/AppSettings.cs (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Configuration/Config.cs (98%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Controllers/AccountController.cs (98%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Controllers/ConsentController.cs (97%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Controllers/HomeController.cs (97%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Data/ApplicationContextSeed.cs (96%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Data/ApplicationDbContext.cs (90%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Data/Migrations/20161019122215_Init_Scheme.Designer.cs (99%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Data/Migrations/20161019122215_Init_Scheme.cs (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Data/Migrations/20161020101725_extendProfile.Designer.cs (99%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Data/Migrations/20161020101725_extendProfile.cs (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Data/Migrations/ApplicationDbContextModelSnapshot.cs (99%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Dockerfile (65%) rename src/Services/Identity/{eShopOnContainers.Identity/eShopOnContainers.Identity.xproj => Identity.API/Identity.API.xproj} (94%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/AccountViewModels/ConsentInputModel.cs (88%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/AccountViewModels/ConsentViewModel.cs (97%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs (82%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/AccountViewModels/ForgotPasswordViewModel.cs (82%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/AccountViewModels/LoggedOutViewModel.cs (86%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/AccountViewModels/LoginViewModel.cs (90%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/AccountViewModels/LogoutViewModel.cs (81%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/AccountViewModels/RegisterViewModel.cs (93%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/AccountViewModels/ResetPasswordViewModel.cs (92%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/AccountViewModels/SendCodeViewModel.cs (86%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/AccountViewModels/VerifyCodeViewModel.cs (90%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/AccountViewModels/_LoginViewModel.cs (90%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/ApplicationUser.cs (96%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/ErrorViewModel.cs (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/ManageViewModels/AddPhoneNumberViewModel.cs (84%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/ManageViewModels/ChangePasswordViewModel.cs (93%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs (84%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/ManageViewModels/FactorViewModel.cs (76%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/ManageViewModels/IndexViewModel.cs (87%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/ManageViewModels/ManageLoginsViewModel.cs (86%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/ManageViewModels/RemoveLoginViewModel.cs (83%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/ManageViewModels/SetPasswordViewModel.cs (92%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs (86%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Program.cs (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Properties/launchSettings.json (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/README.md (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Services/EFLoginService.cs (91%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Services/IEmailSender.cs (83%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Services/ILoginService.cs (86%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Services/IRedirectService.cs (82%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Services/ISmsSender.cs (81%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Services/MessageServices.cs (94%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Services/ProfileService.cs (98%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Services/RedirectService.cs (95%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Startup.cs (96%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Account/LoggedOut.cshtml (86%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Account/Login.cshtml (97%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Account/Logout.cshtml (87%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Account/Redirecting.cshtml (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Account/Register.cshtml (98%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Consent/Index.cshtml (97%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Consent/_ScopeListItem.cshtml (91%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Home/About.cshtml (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Home/Contact.cshtml (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Home/Index.cshtml (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Shared/Error.cshtml (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Shared/_Layout.cshtml (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Shared/_LoginPartial.cshtml (95%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Shared/_ValidationScriptsPartial.cshtml (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/Shared/_ValidationSummary.cshtml (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/_ViewImports.cshtml (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/Views/_ViewStart.cshtml (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/appsettings.json (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/bower.json (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/bundleconfig.json (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/docker-compose.yml (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/project.json (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/web.config (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/_references.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/css/site.css (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/css/site.less (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/css/site.min.css (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/favicon.ico (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/fonts/Montserrat-Bold.eot (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/fonts/Montserrat-Bold.svg (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/fonts/Montserrat-Bold.ttf (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/fonts/Montserrat-Bold.woff (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/fonts/Montserrat-Bold.woff2 (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/fonts/Montserrat-Regular.eot (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/fonts/Montserrat-Regular.svg (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/fonts/Montserrat-Regular.ttf (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/fonts/Montserrat-Regular.woff (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/fonts/Montserrat-Regular.woff2 (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/icon.jpg (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/icon.png (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/arrow-down.png (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/arrow-right.svg (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/banner1.svg (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/banner2.svg (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/banner3.svg (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/banner4.svg (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/brand.PNG (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/brand_dark.PNG (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/cart.png (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/logout.PNG (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/main_banner.png (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/main_banner_text.png (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/main_banner_text.svg (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/my_orders.PNG (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/images/refresh.svg (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/js/site.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/js/site.min.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/.bower.json (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/LICENSE (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/css/bootstrap.css (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/css/bootstrap.css.map (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/css/bootstrap.min.css (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.css.map (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/css/bootstrap-theme.min.css.map (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/css/bootstrap.css (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.svg (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/js/bootstrap.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/dist/js/npm.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/fonts/glyphicons-halflings-regular.eot (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/fonts/glyphicons-halflings-regular.svg (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/fonts/glyphicons-halflings-regular.woff (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2 (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/js/bootstrap.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/bootstrap/js/bootstrap.min.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery-validation-unobtrusive/.bower.json (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery-validation/.bower.json (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery-validation/LICENSE.md (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery-validation/dist/additional-methods.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery-validation/dist/additional-methods.min.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery-validation/dist/jquery.validate.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery/.bower.json (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery/LICENSE.txt (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery/dist/jquery.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery/dist/jquery.min.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery/dist/jquery.min.map (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery/jquery.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery/jquery.min.js (100%) rename src/Services/Identity/{eShopOnContainers.Identity => Identity.API}/wwwroot/lib/jquery/jquery.min.map (100%) 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