diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/AccountController.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/AccountController.cs similarity index 99% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/AccountController.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/AccountController.cs index 6cb7518591..887f720dbd 100644 --- a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/AccountController.cs +++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/AccountController.cs @@ -17,8 +17,8 @@ using Microsoft.Net.Http.Headers; namespace IdentityOIDCWebApplicationSample.Identity.Controllers { - [Area("IdentityService")] - [Route("tfp/IdentityService/[controller]/[action]")] + [Area("Identity")] + [Route("tfp/Identity/[controller]/[action]")] [Authorize(IdentityServiceOptions.LoginPolicyName)] [AllowAnonymous] public class AccountController : Controller diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/ApplicationsController.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/ApplicationsController.cs similarity index 88% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/ApplicationsController.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/ApplicationsController.cs index 2b1a44130f..0848d07e11 100644 --- a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/ApplicationsController.cs +++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/ApplicationsController.cs @@ -12,7 +12,7 @@ using Microsoft.IdentityModel.Protocols.OpenIdConnect; namespace IdentityOIDCWebApplicationSample.Identity.Controllers { [Authorize(IdentityServiceOptions.ManagementPolicyName)] - [Area("IdentityService")] + [Area("Identity")] public class ApplicationsController : Controller { private readonly UserManager _userManager; @@ -26,7 +26,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers _applicationManager = applicationManager; } - [HttpGet("tfp/IdentityService/signinsignup/Applications")] + [HttpGet("tfp/Identity/signinsignup/Applications")] public async Task Index() { var id = _userManager.GetUserId(User); @@ -34,13 +34,13 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(applications); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/Create")] + [HttpGet("tfp/Identity/signinsignup/Applications/Create")] public IActionResult Create() { return View(); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/Create")] + [HttpPost("tfp/Identity/signinsignup/Applications/Create")] public async Task Create(CreateApplicationViewModel model) { var application = new IdentityServiceApplication @@ -56,7 +56,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return RedirectToAction(nameof(CreateScope), new { id = application.Id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Create")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/Scopes/Create")] public async Task CreateScope([FromRoute] string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -66,7 +66,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(new CreateScopeViewModel(applicationName, scopes)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Create")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/Scopes/Create")] [ValidateAntiForgeryToken] public async Task CreateScope( [FromRoute] string id, @@ -90,7 +90,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return RedirectToAction(nameof(CreateScope), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUris/Create")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/RedirectUris/Create")] public async Task CreateRedirectUri([FromRoute] string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -100,7 +100,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(new CreateRedirectUriViewModel(applicationName, redirectUris)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUris/Create")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/RedirectUris/Create")] [ValidateAntiForgeryToken] public async Task CreateRedirectUri( [FromRoute] string id, @@ -124,7 +124,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return RedirectToAction(nameof(CreateRedirectUri), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUris/Create")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/LogoutUris/Create")] public async Task CreateLogoutUri([FromRoute] string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -134,7 +134,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(new CreateLogoutUriViewModel(id, applicationName, logoutUris)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUris/Create")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/LogoutUris/Create")] [ValidateAntiForgeryToken] public async Task CreateLogoutUri( [FromRoute] string id, @@ -158,7 +158,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return RedirectToAction(nameof(CreateLogoutUri), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/Remove")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/Remove")] public async Task RemoveApplication([FromRoute] string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -167,7 +167,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(new RemoveApplicationViewModel(applicationName)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/Remove")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/Remove")] [ValidateAntiForgeryToken] [ActionName(nameof(RemoveApplicationViewModel))] public async Task RemoveApplicationConfirmed([FromRoute] string id) @@ -189,7 +189,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return RedirectToAction(nameof(Index)); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}")] public async Task Details([FromRoute]string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -211,7 +211,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/ChangeName")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/ChangeName")] public async Task ChangeName([FromRoute]string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -220,7 +220,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(new ChangeApplicationNameViewModel(applicationName)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/ChangeName")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/ChangeName")] [ValidateAntiForgeryToken] public async Task ChangeName([FromRoute]string id, [FromForm] ChangeApplicationNameViewModel model) { @@ -242,7 +242,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/GenerateClientSecret")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/GenerateClientSecret")] public async Task GenerateClientSecret([FromRoute]string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -251,7 +251,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/GenerateClientSecret")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/GenerateClientSecret")] [ValidateAntiForgeryToken] [ActionName(nameof(GenerateClientSecret))] public async Task GenerateClientSecretConfirmed([FromRoute]string id) @@ -270,7 +270,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View("GeneratedClientSecret", new GeneratedClientSecretViewModel(name, clientSecret)); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/RemoveClientSecret")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/RemoveClientSecret")] public async Task RemoveClientSecret([FromRoute]string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -279,7 +279,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/RemoveClientSecret")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/RemoveClientSecret")] [ValidateAntiForgeryToken] [ActionName(nameof(RemoveClientSecret))] public async Task RemoveClientSecretConfirmed([FromRoute]string id) @@ -297,7 +297,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return RedirectToAction(nameof(Details), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/RegenerateClientSecret")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/RegenerateClientSecret")] public async Task RegenerateClientSecret([FromRoute]string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -305,7 +305,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(model: name); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/RegenerateClientSecret")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/RegenerateClientSecret")] [ValidateAntiForgeryToken] [ActionName(nameof(RegenerateClientSecret))] public async Task RegenerateClientSecretConfirmed([FromRoute]string id) @@ -323,7 +323,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View("GeneratedClientSecret", new GeneratedClientSecretViewModel(name, clientSecret)); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Add")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/Scopes/Add")] public async Task AddScope([FromRoute] string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -333,7 +333,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(new CreateScopeViewModel(applicationName, scopes)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Add")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/Scopes/Add")] [ValidateAntiForgeryToken] public async Task AddScope( [FromRoute] string id, @@ -357,7 +357,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return RedirectToAction(nameof(AddScope), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Edit/{scope}")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/Scopes/Edit/{scope}")] public async Task EditScope([FromRoute] string id, [FromRoute] string scope) { var application = await _applicationManager.FindByIdAsync(id); @@ -366,7 +366,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(new EditScopeViewModel(applicationName, scope)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Edit/{scope}")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/Scopes/Edit/{scope}")] [ValidateAntiForgeryToken] public async Task EditScope( [FromRoute] string id, @@ -390,7 +390,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return RedirectToAction(nameof(Details), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUri/Edit")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/RedirectUri/Edit")] public async Task EditRedirectUri([FromRoute] string id, [FromQuery] string redirectUri) { var application = await _applicationManager.FindByIdAsync(id); @@ -399,7 +399,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(new EditRedirectUriViewModel(applicationName, redirectUri)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUri/Edit")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/RedirectUri/Edit")] [ValidateAntiForgeryToken] public async Task EditRedirectUri( [FromRoute] string id, @@ -423,7 +423,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return RedirectToAction(nameof(Details), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUri/Edit")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/LogoutUri/Edit")] public async Task EditLogoutUri([FromRoute] string id, [FromQuery] string logoutUri) { var application = await _applicationManager.FindByIdAsync(id); @@ -432,7 +432,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(new EditLogoutUriViewModel(applicationName, logoutUri)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUri/Edit")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/LogoutUri/Edit")] [ValidateAntiForgeryToken] public async Task EditLogoutUri( [FromRoute] string id, @@ -456,7 +456,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return RedirectToAction(nameof(Details), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Remove/{scope}")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/Scopes/Remove/{scope}")] public async Task RemoveScope([FromRoute] string id, [FromRoute] string scope) { var application = await _applicationManager.FindByIdAsync(id); @@ -465,7 +465,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(new RemoveScopeViewModel(applicationName, scope)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Remove/{scope}")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/Scopes/Remove/{scope}")] [ValidateAntiForgeryToken] [ActionName(nameof(RemoveScope))] public async Task RemoveScopeConfirmed([FromRoute] string id, [FromRoute] string scope) @@ -487,7 +487,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return RedirectToAction(nameof(Details), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUri/Remove")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/RedirectUri/Remove")] public async Task RemoveRedirectUri([FromRoute] string id, [FromQuery] string redirectUri) { var application = await _applicationManager.FindByIdAsync(id); @@ -496,7 +496,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(new RemoveRedirectUriViewModel(applicationName, redirectUri)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUri/Remove")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/RedirectUri/Remove")] [ValidateAntiForgeryToken] [ActionName(nameof(RemoveRedirectUri))] public async Task RemoveRedirectUriConfirmed([FromRoute] string id, [FromQuery] string redirectUri) @@ -518,7 +518,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return RedirectToAction(nameof(Details), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUri/Remove")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/LogoutUri/Remove")] public async Task RemoveLogoutUri([FromRoute] string id, [FromQuery] string logoutUri) { var application = await _applicationManager.FindByIdAsync(id); @@ -527,7 +527,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(new RemoveLogoutUriViewModel(applicationName, logoutUri)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUri/Remove")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/LogoutUri/Remove")] [ValidateAntiForgeryToken] [ActionName(nameof(RemoveLogoutUri))] public async Task RemoveLogoutUriConfirmed([FromRoute] string id, [FromQuery] string logoutUri) @@ -549,7 +549,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return RedirectToAction(nameof(Details), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUris/Add")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/RedirectUris/Add")] public async Task AddRedirectUri([FromRoute] string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -559,7 +559,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(new CreateRedirectUriViewModel(applicationName, redirectUris)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUris/Add")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/RedirectUris/Add")] [ValidateAntiForgeryToken] public async Task AddRedirectUri( [FromRoute] string id, @@ -583,7 +583,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return RedirectToAction(nameof(AddRedirectUri), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUris/Add")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/LogoutUris/Add")] public async Task AddLogoutUri([FromRoute] string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -593,7 +593,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return View(new CreateLogoutUriViewModel(id, applicationName, logoutUris)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUris/Add")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/LogoutUris/Add")] [ValidateAntiForgeryToken] public async Task AddLogoutUri( [FromRoute] string id, diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/IdentityServiceConfigurationController.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/IdentityServiceConfigurationController.cs similarity index 89% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/IdentityServiceConfigurationController.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/IdentityServiceConfigurationController.cs index dab589a43f..7cbb347f90 100644 --- a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/IdentityServiceConfigurationController.cs +++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/IdentityServiceConfigurationController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc; namespace IdentityOIDCWebApplicationSample.Identity.Controllers { - [Area("IdentityService")] + [Area("Identity")] public class IdentityServiceConfigurationController : Controller { private readonly IConfigurationManager _configurationProvider; @@ -18,7 +18,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers _keySetProvider = keySetProvider; } - [HttpGet("tfp/IdentityService/signinsignup/v2.0/.well-known/openid-configuration")] + [HttpGet("tfp/Identity/signinsignup/v2.0/.well-known/openid-configuration")] [Produces("application/json")] public async Task Metadata() { @@ -35,7 +35,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return Ok(await _configurationProvider.GetConfigurationAsync(configurationContext)); } - [HttpGet("tfp/IdentityService/signinsignup/discovery/v2.0/keys")] + [HttpGet("tfp/Identity/signinsignup/discovery/v2.0/keys")] [Produces("application/json")] public async Task Keys() { diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/IdentityServiceController.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/IdentityServiceController.cs similarity index 95% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/IdentityServiceController.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/IdentityServiceController.cs index 552be02f11..49d4aa169b 100644 --- a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/IdentityServiceController.cs +++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/IdentityServiceController.cs @@ -10,7 +10,7 @@ using Microsoft.IdentityModel.Protocols.OpenIdConnect; namespace IdentityOIDCWebApplicationSample.Identity.Controllers { - [Area("IdentityService")] + [Area("Identity")] public class IdentityServiceController : Controller { private readonly IOptions _options; @@ -33,7 +33,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers _tokenResponseFactory = tokenResponseFactory; } - [HttpGet("tfp/IdentityService/signinsignup/oauth2/v2.0/authorize/")] + [HttpGet("tfp/Identity/signinsignup/oauth2/v2.0/authorize/")] public async Task Authorize( [EnableIntegratedWebClient, ModelBinder(typeof(AuthorizationRequestModelBinder))] AuthorizationRequest authorization) { @@ -69,7 +69,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return this.ValidAuthorization(response); } - [HttpPost("tfp/IdentityService/signinsignup/oauth2/v2.0/token")] + [HttpPost("tfp/Identity/signinsignup/oauth2/v2.0/token")] [Produces("application/json")] public async Task Token( [ModelBinder(typeof(TokenRequestModelBinder))] TokenRequest request) @@ -92,7 +92,7 @@ namespace IdentityOIDCWebApplicationSample.Identity.Controllers return Ok(response.Parameters); } - [HttpGet("tfp/IdentityService/signinsignup/oauth2/v2.0/logout")] + [HttpGet("tfp/Identity/signinsignup/oauth2/v2.0/logout")] public async Task Logout( [EnableIntegratedWebClient, ModelBinder(typeof(LogoutRequestModelBinder))] LogoutRequest request) { diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/ManageController.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/ManageController.cs similarity index 99% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/ManageController.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/ManageController.cs index 81feb238a1..b2e6db6537 100644 --- a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Controllers/ManageController.cs +++ b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Controllers/ManageController.cs @@ -13,8 +13,8 @@ using Microsoft.Extensions.Logging; namespace IdentityOIDCWebApplicationSample.Identity.Controllers { [Authorize(IdentityServiceOptions.LoginPolicyName)] - [Area("IdentityService")] - [Route("tfp/IdentityService/[controller]/[action]")] + [Area("Identity")] + [Route("tfp/Identity/[controller]/[action]")] public class ManageController : Controller { private readonly UserManager _userManager; diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Data/IdentityServiceDbContext.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Data/IdentityServiceDbContext.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Data/IdentityServiceDbContext.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Data/IdentityServiceDbContext.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Data/IdentityServiceDbContextFactory.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Data/IdentityServiceDbContextFactory.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Data/IdentityServiceDbContextFactory.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Data/IdentityServiceDbContextFactory.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Data/Migrations/00000000000000_CreateIdentitySchema.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Data/Migrations/00000000000000_CreateIdentitySchema.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Data/Migrations/00000000000000_CreateIdentitySchema.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Data/Migrations/IdentityServiceDbContextModelSnapshot.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Data/Migrations/IdentityServiceDbContextModelSnapshot.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Data/Migrations/IdentityServiceDbContextModelSnapshot.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Data/Migrations/IdentityServiceDbContextModelSnapshot.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Extensions/IdentityServiceExtensions.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Extensions/IdentityServiceExtensions.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Extensions/IdentityServiceExtensions.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Extensions/IdentityServiceExtensions.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/AccountViewModels/ForgotPasswordViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/AccountViewModels/ForgotPasswordViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/AccountViewModels/ForgotPasswordViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/AccountViewModels/ForgotPasswordViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/AccountViewModels/LoginViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/AccountViewModels/LoginViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/AccountViewModels/LoginViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/AccountViewModels/LoginViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/AccountViewModels/RegisterViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/AccountViewModels/RegisterViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/AccountViewModels/RegisterViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/AccountViewModels/RegisterViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/AccountViewModels/ResetPasswordViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/AccountViewModels/ResetPasswordViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/AccountViewModels/ResetPasswordViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/AccountViewModels/ResetPasswordViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/AccountViewModels/SendCodeViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/AccountViewModels/SendCodeViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/AccountViewModels/SendCodeViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/AccountViewModels/SendCodeViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/AccountViewModels/VerifyCodeViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/AccountViewModels/VerifyCodeViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/AccountViewModels/VerifyCodeViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/AccountViewModels/VerifyCodeViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationUser.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationUser.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationUser.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationUser.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/ApplicationDetailsViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/ApplicationDetailsViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/ApplicationDetailsViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/ApplicationDetailsViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/ChangeApplicationNameViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/ChangeApplicationNameViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/ChangeApplicationNameViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/ChangeApplicationNameViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/CreateApplicationViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/CreateApplicationViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/CreateApplicationViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/CreateApplicationViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/CreateLogoutUriViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/CreateLogoutUriViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/CreateLogoutUriViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/CreateLogoutUriViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/CreateRedirectUriViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/CreateRedirectUriViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/CreateRedirectUriViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/CreateRedirectUriViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/CreateScopeViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/CreateScopeViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/CreateScopeViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/CreateScopeViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/EditLogoutUriViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/EditLogoutUriViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/EditLogoutUriViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/EditLogoutUriViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/EditRedirectUriViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/EditRedirectUriViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/EditRedirectUriViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/EditRedirectUriViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/EditScopeViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/EditScopeViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/EditScopeViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/EditScopeViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/GeneratedClientSecretViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/GeneratedClientSecretViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/GeneratedClientSecretViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/GeneratedClientSecretViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/RemoveApplicationViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/RemoveApplicationViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/RemoveApplicationViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/RemoveApplicationViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/RemoveLogoutUriViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/RemoveLogoutUriViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/RemoveLogoutUriViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/RemoveLogoutUriViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/RemoveRedirectUriViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/RemoveRedirectUriViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/RemoveRedirectUriViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/RemoveRedirectUriViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/RemoveScopeViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/RemoveScopeViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ApplicationViewModels/RemoveScopeViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ApplicationViewModels/RemoveScopeViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/AddPhoneNumberViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/AddPhoneNumberViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/AddPhoneNumberViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/AddPhoneNumberViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/ChangePasswordViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/ChangePasswordViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/ChangePasswordViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/ChangePasswordViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/FactorViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/FactorViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/FactorViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/FactorViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/IndexViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/IndexViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/IndexViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/IndexViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/ManageLoginsViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/ManageLoginsViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/ManageLoginsViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/ManageLoginsViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/RemoveLoginViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/RemoveLoginViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/RemoveLoginViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/RemoveLoginViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/SetPasswordViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/SetPasswordViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/SetPasswordViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/SetPasswordViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Services/IEmailSender.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Services/IEmailSender.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Services/IEmailSender.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Services/IEmailSender.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Services/ISmsSender.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Services/ISmsSender.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Services/ISmsSender.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Services/ISmsSender.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Services/MessageServices.cs b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Services/MessageServices.cs similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Services/MessageServices.cs rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Services/MessageServices.cs diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/AccessDenied.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/AccessDenied.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/AccessDenied.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/AccessDenied.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/ConfirmEmail.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ConfirmEmail.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/ConfirmEmail.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ConfirmEmail.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/ExternalLoginConfirmation.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ExternalLoginConfirmation.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/ExternalLoginConfirmation.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ExternalLoginConfirmation.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/ExternalLoginFailure.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ExternalLoginFailure.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/ExternalLoginFailure.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ExternalLoginFailure.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/ForgotPassword.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ForgotPassword.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/ForgotPassword.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ForgotPassword.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/ForgotPasswordConfirmation.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/ForgotPasswordConfirmation.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/Lockout.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Lockout.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/Lockout.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Lockout.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/Login.MSAL.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Login.MSAL.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/Login.MSAL.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Login.MSAL.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/Login.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Login.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/Login.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Login.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/Register.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Register.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/Register.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/Register.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/ResetPassword.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ResetPassword.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/ResetPassword.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ResetPassword.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/ResetPasswordConfirmation.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ResetPasswordConfirmation.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/ResetPasswordConfirmation.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/ResetPasswordConfirmation.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/SendCode.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/SendCode.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/SendCode.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/SendCode.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/VerifyCode.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/VerifyCode.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Account/VerifyCode.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Account/VerifyCode.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/AddLogoutUri.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddLogoutUri.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/AddLogoutUri.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddLogoutUri.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/AddRedirectUri.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddRedirectUri.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/AddRedirectUri.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddRedirectUri.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/AddScope.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddScope.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/AddScope.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/AddScope.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/ChangeName.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/ChangeName.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/ChangeName.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/ChangeName.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/ClientSecret.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/ClientSecret.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/ClientSecret.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/ClientSecret.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/Create.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Create.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/Create.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Create.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/CreateLogoutUri.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateLogoutUri.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/CreateLogoutUri.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateLogoutUri.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/CreateRedirectUri.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateRedirectUri.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/CreateRedirectUri.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateRedirectUri.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/CreateScope.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateScope.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/CreateScope.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/CreateScope.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/Details.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Details.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/Details.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Details.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/Edit.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Edit.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/Edit.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Edit.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/EditLogoutUri.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/EditLogoutUri.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/EditLogoutUri.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/EditLogoutUri.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/EditRedirectUri.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/EditRedirectUri.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/EditRedirectUri.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/EditRedirectUri.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/EditScope.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/EditScope.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/EditScope.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/EditScope.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/GenerateClientSecret.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/GenerateClientSecret.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/GenerateClientSecret.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/GenerateClientSecret.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/GeneratedClientSecret.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/GeneratedClientSecret.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/GeneratedClientSecret.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/GeneratedClientSecret.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/Index.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Index.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/Index.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/Index.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/RegenerateClientSecret.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RegenerateClientSecret.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/RegenerateClientSecret.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RegenerateClientSecret.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/RemoveApplication.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveApplication.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/RemoveApplication.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveApplication.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/RemoveClientSecret.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveClientSecret.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/RemoveClientSecret.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveClientSecret.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/RemoveLogoutUri.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveLogoutUri.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/RemoveLogoutUri.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveLogoutUri.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/RemoveRedirectUri.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveRedirectUri.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/RemoveRedirectUri.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveRedirectUri.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/RemoveScope.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveScope.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Applications/RemoveScope.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Applications/RemoveScope.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Home/Clients.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Home/Clients.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Home/Clients.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Home/Clients.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Home/Index.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Home/Index.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Home/Index.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Home/Index.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/IdentityService/InvalidLogoutRedirect.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/IdentityService/InvalidLogoutRedirect.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/IdentityService/InvalidLogoutRedirect.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/IdentityService/InvalidLogoutRedirect.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/IdentityService/SignedOut.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/IdentityService/SignedOut.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/IdentityService/SignedOut.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/IdentityService/SignedOut.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Manage/AddPhoneNumber.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/AddPhoneNumber.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Manage/AddPhoneNumber.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/AddPhoneNumber.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Manage/ChangePassword.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/ChangePassword.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Manage/ChangePassword.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/ChangePassword.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Manage/Index.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/Index.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Manage/Index.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/Index.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Manage/ManageLogins.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/ManageLogins.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Manage/ManageLogins.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/ManageLogins.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Manage/SetPassword.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/SetPassword.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Manage/SetPassword.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/SetPassword.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Manage/VerifyPhoneNumber.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/VerifyPhoneNumber.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/Manage/VerifyPhoneNumber.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/Manage/VerifyPhoneNumber.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/_ViewImports.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/_ViewImports.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/_ViewImports.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/_ViewImports.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/_ViewStart.cshtml b/samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/_ViewStart.cshtml similarity index 100% rename from samples/IdentityOIDCWebApplicationSample/Areas/IdentityService/Views/_ViewStart.cshtml rename to samples/IdentityOIDCWebApplicationSample/Areas/Identity/Views/_ViewStart.cshtml diff --git a/samples/IdentityOIDCWebApplicationSample/Controllers/AccountController.cs b/samples/IdentityOIDCWebApplicationSample/Controllers/AccountController.cs index 1f3f425c56..9c4509081b 100644 --- a/samples/IdentityOIDCWebApplicationSample/Controllers/AccountController.cs +++ b/samples/IdentityOIDCWebApplicationSample/Controllers/AccountController.cs @@ -23,7 +23,7 @@ namespace IdentityOIDCWebApplicationSample.Controllers [HttpGet] public IActionResult Manage() { - return RedirectToAction("Index", "Manage", new { area = "IdentityService" }); + return RedirectToAction("Index", "Manage", new { area = "Identity" }); } // // GET: /Account/SignOut diff --git a/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj b/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj index 620a414a67..dd4436248f 100644 --- a/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj +++ b/samples/IdentityOIDCWebApplicationSample/IdentityOIDCWebApplicationSample.csproj @@ -39,8 +39,4 @@ - - - - diff --git a/samples/IdentityOIDCWebApplicationSample/wwwroot/Spa.html b/samples/IdentityOIDCWebApplicationSample/wwwroot/Spa.html index d05a1f7ea9..91a7d24067 100644 --- a/samples/IdentityOIDCWebApplicationSample/wwwroot/Spa.html +++ b/samples/IdentityOIDCWebApplicationSample/wwwroot/Spa.html @@ -38,7 +38,7 @@ var applicationConfig = { clientID: 'CDA53D17-6683-4EA7-B6D7-B6DB23E60DED', redirectUri: "https://localhost:44324/Spa.html", - authority: "https://localhost:44324/tfp/IdentityService/signinsignup", + authority: "https://localhost:44324/tfp/Identity/signinsignup", b2cScopes: ["https://localhost/DFC7191F-FF74-42B9-A292-08FEA80F5B20/v2.0/ProtectedApi/read"], // <>/<>/<>. webApi: 'https://localhost:44324/Home/Contact', }; diff --git a/samples/NativeWPFClient/MainWindow.xaml.cs b/samples/NativeWPFClient/MainWindow.xaml.cs index 7dab2e039b..a6dcf6cdf5 100644 --- a/samples/NativeWPFClient/MainWindow.xaml.cs +++ b/samples/NativeWPFClient/MainWindow.xaml.cs @@ -33,7 +33,7 @@ namespace NativeWPFClient { BaseAddress = "https://localhost:44324/", RedirectUri = "urn:ietf:wg:oauth:2.0:oob", - Tenant = "IdentityService", + Tenant = "Identity", Policy = "signinsignup", ClientId = "06D7C2FB-A66A-41AD-9509-77BDDFAB111B", Scopes = "https://localhost/DFC7191F-FF74-42B9-A292-08FEA80F5B20/v2.0/ProtectedApi/read" diff --git a/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebClientConfigurationManager.cs b/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebClientConfigurationManager.cs index 9715b69c8f..2f72aa65ca 100644 --- a/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebClientConfigurationManager.cs +++ b/src/Microsoft.AspNetCore.Identity.Service.IntegratedWebClient/IntegratedWebClientConfigurationManager.cs @@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Identity.Service.IntegratedWebClient var baseUrl = $"{ctx.Request.Scheme}://{ctx.Request.Host.ToUriComponent()}{ctx.Request.PathBase}"; if (!Uri.TryCreate(configurationContext.AuthorizationEndpoint, UriKind.RelativeOrAbsolute, out var authorizationUri)) { - configurationContext.AuthorizationEndpoint = $"{baseUrl}/tfp/IdentityService/signinsignup/oauth2/v2.0/authorize"; + configurationContext.AuthorizationEndpoint = $"{baseUrl}/tfp/Identity/signinsignup/oauth2/v2.0/authorize"; } else { @@ -52,7 +52,7 @@ namespace Microsoft.AspNetCore.Identity.Service.IntegratedWebClient if (!Uri.TryCreate(configurationContext.TokenEndpoint, UriKind.RelativeOrAbsolute, out var tokenUri)) { - configurationContext.TokenEndpoint = $"{baseUrl}/tfp/IdentityService/signinsignup/oauth2/v2.0/token"; + configurationContext.TokenEndpoint = $"{baseUrl}/tfp/Identity/signinsignup/oauth2/v2.0/token"; } else { @@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Identity.Service.IntegratedWebClient if (!Uri.TryCreate(configurationContext.EndSessionEndpoint, UriKind.RelativeOrAbsolute, out var logoutUri)) { - configurationContext.EndSessionEndpoint = $"{baseUrl}/tfp/IdentityService/signinsignup/oauth2/v2.0/logout"; + configurationContext.EndSessionEndpoint = $"{baseUrl}/tfp/Identity/signinsignup/oauth2/v2.0/logout"; } else { diff --git a/src/Microsoft.AspNetCore.Identity.Service/IdentityServiceServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Identity.Service/IdentityServiceServiceCollectionExtensions.cs index ddf156fd7e..1e1b171cf6 100644 --- a/src/Microsoft.AspNetCore.Identity.Service/IdentityServiceServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNetCore.Identity.Service/IdentityServiceServiceCollectionExtensions.cs @@ -57,19 +57,19 @@ namespace Microsoft.Extensions.DependencyInjection { options.Cookie.HttpOnly = true; options.Cookie.SecurePolicy = CookieSecurePolicy.Always; - options.Cookie.Path = "/tfp/IdentityService/signinsignup"; + options.Cookie.Path = "/tfp"; options.Cookie.Name = IdentityServiceOptions.AuthenticationCookieName; }); services.ConfigureApplicationCookie(options => { - options.LoginPath = $"/tfp/IdentityService/Account/Login"; - options.AccessDeniedPath = $"/tfp/IdentityService/Account/Denied"; - options.Cookie.Path = $"/tfp/IdentityService"; + options.LoginPath = "/tfp/Identity/Account/Login"; + options.AccessDeniedPath = "/tfp/Identity/Account/Denied"; + options.Cookie.Path = "/tfp"; }); - services.ConfigureApplicationCookie(options => options.Cookie.Path = $"/tfp/IdentityService"); - services.Configure(IdentityConstants.TwoFactorRememberMeScheme, options => options.Cookie.Path = $"/tfp/IdentityService"); - services.Configure(IdentityConstants.TwoFactorUserIdScheme, options => options.Cookie.Path = $"/tfp/IdentityService"); + services.ConfigureExternalCookie(options => options.Cookie.Path = "/tfp"); + services.Configure(IdentityConstants.TwoFactorRememberMeScheme, options => options.Cookie.Path = "/tfp"); + services.Configure(IdentityConstants.TwoFactorUserIdScheme, options => options.Cookie.Path = "/tfp"); services.AddTransient, IdentityServiceAuthorizationOptionsSetup>(); // Other stuff diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/AccountController.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/AccountController.cs similarity index 99% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/AccountController.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/AccountController.cs index d6248c71a9..ac1014f78d 100644 --- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/AccountController.cs +++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/AccountController.cs @@ -14,8 +14,8 @@ using Microsoft.Extensions.Logging; namespace Identity.OpenIdConnect.WebSite.Identity.Controllers { - [Area("IdentityService")] - [Route("tfp/IdentityService/[controller]/[action]")] + [Area("Identity")] + [Route("tfp/Identity/[controller]/[action]")] [Authorize(IdentityServiceOptions.LoginPolicyName)] [AllowAnonymous] public class AccountController : Controller diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/ApplicationsController.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/ApplicationsController.cs similarity index 88% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/ApplicationsController.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/ApplicationsController.cs index c09e923727..6346f623d9 100644 --- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/ApplicationsController.cs +++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/ApplicationsController.cs @@ -12,7 +12,7 @@ using Microsoft.IdentityModel.Protocols.OpenIdConnect; namespace Identity.OpenIdConnect.WebSite.Identity.Controllers { [Authorize(IdentityServiceOptions.ManagementPolicyName)] - [Area("IdentityService")] + [Area("Identity")] public class ApplicationsController : Controller { private readonly UserManager _userManager; @@ -26,7 +26,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers _applicationManager = applicationManager; } - [HttpGet("tfp/IdentityService/signinsignup/Applications")] + [HttpGet("tfp/Identity/signinsignup/Applications")] public async Task Index() { var id = _userManager.GetUserId(User); @@ -34,13 +34,13 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(applications); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/Create")] + [HttpGet("tfp/Identity/signinsignup/Applications/Create")] public IActionResult Create() { return View(); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/Create")] + [HttpPost("tfp/Identity/signinsignup/Applications/Create")] public async Task Create(CreateApplicationViewModel model) { var application = new IdentityServiceApplication @@ -56,7 +56,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return RedirectToAction(nameof(CreateScope), new { id = application.Id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Create")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/Scopes/Create")] public async Task CreateScope([FromRoute] string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -66,7 +66,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(new CreateScopeViewModel(applicationName, scopes)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Create")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/Scopes/Create")] [ValidateAntiForgeryToken] public async Task CreateScope( [FromRoute] string id, @@ -90,7 +90,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return RedirectToAction(nameof(CreateScope), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUris/Create")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/RedirectUris/Create")] public async Task CreateRedirectUri([FromRoute] string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -100,7 +100,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(new CreateRedirectUriViewModel(applicationName, redirectUris)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUris/Create")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/RedirectUris/Create")] [ValidateAntiForgeryToken] public async Task CreateRedirectUri( [FromRoute] string id, @@ -124,7 +124,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return RedirectToAction(nameof(CreateRedirectUri), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUris/Create")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/LogoutUris/Create")] public async Task CreateLogoutUri([FromRoute] string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -134,7 +134,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(new CreateLogoutUriViewModel(id, applicationName, logoutUris)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUris/Create")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/LogoutUris/Create")] [ValidateAntiForgeryToken] public async Task CreateLogoutUri( [FromRoute] string id, @@ -158,7 +158,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return RedirectToAction(nameof(CreateLogoutUri), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/Remove")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/Remove")] public async Task RemoveApplication([FromRoute] string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -167,7 +167,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(new RemoveApplicationViewModel(applicationName)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/Remove")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/Remove")] [ValidateAntiForgeryToken] [ActionName(nameof(RemoveApplicationViewModel))] public async Task RemoveApplicationConfirmed([FromRoute] string id) @@ -189,7 +189,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return RedirectToAction(nameof(Index)); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}")] public async Task Details([FromRoute]string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -211,7 +211,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/ChangeName")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/ChangeName")] public async Task ChangeName([FromRoute]string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -220,7 +220,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(new ChangeApplicationNameViewModel(applicationName)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/ChangeName")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/ChangeName")] [ValidateAntiForgeryToken] public async Task ChangeName([FromRoute]string id, [FromForm] ChangeApplicationNameViewModel model) { @@ -242,7 +242,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/GenerateClientSecret")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/GenerateClientSecret")] public async Task GenerateClientSecret([FromRoute]string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -251,7 +251,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/GenerateClientSecret")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/GenerateClientSecret")] [ValidateAntiForgeryToken] [ActionName(nameof(GenerateClientSecret))] public async Task GenerateClientSecretConfirmed([FromRoute]string id) @@ -270,7 +270,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View("GeneratedClientSecret", new GeneratedClientSecretViewModel(name, clientSecret)); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/RemoveClientSecret")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/RemoveClientSecret")] public async Task RemoveClientSecret([FromRoute]string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -279,7 +279,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/RemoveClientSecret")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/RemoveClientSecret")] [ValidateAntiForgeryToken] [ActionName(nameof(RemoveClientSecret))] public async Task RemoveClientSecretConfirmed([FromRoute]string id) @@ -297,7 +297,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return RedirectToAction(nameof(Details), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/RegenerateClientSecret")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/RegenerateClientSecret")] public async Task RegenerateClientSecret([FromRoute]string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -305,7 +305,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(model: name); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/RegenerateClientSecret")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/RegenerateClientSecret")] [ValidateAntiForgeryToken] [ActionName(nameof(RegenerateClientSecret))] public async Task RegenerateClientSecretConfirmed([FromRoute]string id) @@ -323,7 +323,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View("GeneratedClientSecret", new GeneratedClientSecretViewModel(name, clientSecret)); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Add")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/Scopes/Add")] public async Task AddScope([FromRoute] string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -333,7 +333,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(new CreateScopeViewModel(applicationName, scopes)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Add")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/Scopes/Add")] [ValidateAntiForgeryToken] public async Task AddScope( [FromRoute] string id, @@ -357,7 +357,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return RedirectToAction(nameof(AddScope), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Edit/{scope}")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/Scopes/Edit/{scope}")] public async Task EditScope([FromRoute] string id, [FromRoute] string scope) { var application = await _applicationManager.FindByIdAsync(id); @@ -366,7 +366,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(new EditScopeViewModel(applicationName, scope)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Edit/{scope}")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/Scopes/Edit/{scope}")] [ValidateAntiForgeryToken] public async Task EditScope( [FromRoute] string id, @@ -390,7 +390,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return RedirectToAction(nameof(Details), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUri/Edit")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/RedirectUri/Edit")] public async Task EditRedirectUri([FromRoute] string id, [FromQuery] string redirectUri) { var application = await _applicationManager.FindByIdAsync(id); @@ -399,7 +399,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(new EditRedirectUriViewModel(applicationName, redirectUri)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUri/Edit")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/RedirectUri/Edit")] [ValidateAntiForgeryToken] public async Task EditRedirectUri( [FromRoute] string id, @@ -423,7 +423,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return RedirectToAction(nameof(Details), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUri/Edit")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/LogoutUri/Edit")] public async Task EditLogoutUri([FromRoute] string id, [FromQuery] string logoutUri) { var application = await _applicationManager.FindByIdAsync(id); @@ -432,7 +432,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(new EditLogoutUriViewModel(applicationName, logoutUri)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUri/Edit")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/LogoutUri/Edit")] [ValidateAntiForgeryToken] public async Task EditLogoutUri( [FromRoute] string id, @@ -456,7 +456,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return RedirectToAction(nameof(Details), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Remove/{scope}")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/Scopes/Remove/{scope}")] public async Task RemoveScope([FromRoute] string id, [FromRoute] string scope) { var application = await _applicationManager.FindByIdAsync(id); @@ -465,7 +465,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(new RemoveScopeViewModel(applicationName, scope)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/Scopes/Remove/{scope}")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/Scopes/Remove/{scope}")] [ValidateAntiForgeryToken] [ActionName(nameof(RemoveScope))] public async Task RemoveScopeConfirmed([FromRoute] string id, [FromRoute] string scope) @@ -487,7 +487,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return RedirectToAction(nameof(Details), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUri/Remove")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/RedirectUri/Remove")] public async Task RemoveRedirectUri([FromRoute] string id, [FromQuery] string redirectUri) { var application = await _applicationManager.FindByIdAsync(id); @@ -496,7 +496,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(new RemoveRedirectUriViewModel(applicationName, redirectUri)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUri/Remove")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/RedirectUri/Remove")] [ValidateAntiForgeryToken] [ActionName(nameof(RemoveRedirectUri))] public async Task RemoveRedirectUriConfirmed([FromRoute] string id, [FromQuery] string redirectUri) @@ -518,7 +518,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return RedirectToAction(nameof(Details), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUri/Remove")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/LogoutUri/Remove")] public async Task RemoveLogoutUri([FromRoute] string id, [FromQuery] string logoutUri) { var application = await _applicationManager.FindByIdAsync(id); @@ -527,7 +527,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(new RemoveLogoutUriViewModel(applicationName, logoutUri)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUri/Remove")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/LogoutUri/Remove")] [ValidateAntiForgeryToken] [ActionName(nameof(RemoveLogoutUri))] public async Task RemoveLogoutUriConfirmed([FromRoute] string id, [FromQuery] string logoutUri) @@ -549,7 +549,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return RedirectToAction(nameof(Details), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUris/Add")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/RedirectUris/Add")] public async Task AddRedirectUri([FromRoute] string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -559,7 +559,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(new CreateRedirectUriViewModel(applicationName, redirectUris)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/RedirectUris/Add")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/RedirectUris/Add")] [ValidateAntiForgeryToken] public async Task AddRedirectUri( [FromRoute] string id, @@ -583,7 +583,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return RedirectToAction(nameof(AddRedirectUri), new { id }); } - [HttpGet("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUris/Add")] + [HttpGet("tfp/Identity/signinsignup/Applications/{id}/LogoutUris/Add")] public async Task AddLogoutUri([FromRoute] string id) { var application = await _applicationManager.FindByIdAsync(id); @@ -593,7 +593,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return View(new CreateLogoutUriViewModel(id, applicationName, logoutUris)); } - [HttpPost("tfp/IdentityService/signinsignup/Applications/{id}/LogoutUris/Add")] + [HttpPost("tfp/Identity/signinsignup/Applications/{id}/LogoutUris/Add")] [ValidateAntiForgeryToken] public async Task AddLogoutUri( [FromRoute] string id, diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/IdentityServiceConfigurationController.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/IdentityServiceConfigurationController.cs similarity index 89% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/IdentityServiceConfigurationController.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/IdentityServiceConfigurationController.cs index fbea822c7e..90332464f8 100644 --- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/IdentityServiceConfigurationController.cs +++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/IdentityServiceConfigurationController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc; namespace Identity.OpenIdConnect.WebSite.Identity.Controllers { - [Area("IdentityService")] + [Area("Identity")] public class IdentityServiceConfigurationController : Controller { private readonly IConfigurationManager _configurationProvider; @@ -18,7 +18,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers _keySetProvider = keySetProvider; } - [HttpGet("tfp/IdentityService/signinsignup/v2.0/.well-known/openid-configuration")] + [HttpGet("tfp/Identity/signinsignup/v2.0/.well-known/openid-configuration")] [Produces("application/json")] public async Task Metadata() { @@ -35,7 +35,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return Ok(await _configurationProvider.GetConfigurationAsync(configurationContext)); } - [HttpGet("tfp/IdentityService/signinsignup/discovery/v2.0/keys")] + [HttpGet("tfp/Identity/signinsignup/discovery/v2.0/keys")] [Produces("application/json")] public async Task Keys() { diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/IdentityServiceController.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/IdentityServiceController.cs similarity index 93% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/IdentityServiceController.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/IdentityServiceController.cs index c4ef3c8c62..b122480ced 100644 --- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/IdentityServiceController.cs +++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/IdentityServiceController.cs @@ -10,7 +10,7 @@ using Microsoft.IdentityModel.Protocols.OpenIdConnect; namespace Identity.OpenIdConnect.WebSite.Identity.Controllers { - [Area("IdentityService")] + [Area("Identity")] public class IdentityServiceController : Controller { private readonly IOptions _options; @@ -33,7 +33,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers _tokenResponseFactory = tokenResponseFactory; } - [HttpGet("tfp/IdentityService/signinsignup/oauth2/v2.0/authorize/")] + [HttpGet("tfp/Identity/signinsignup/oauth2/v2.0/authorize/")] public async Task Authorize( [EnableIntegratedWebClient, ModelBinder(typeof(AuthorizationRequestModelBinder))] AuthorizationRequest authorization) { @@ -69,7 +69,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return this.ValidAuthorization(response); } - [HttpPost("tfp/IdentityService/signinsignup/oauth2/v2.0/token")] + [HttpPost("tfp/Identity/signinsignup/oauth2/v2.0/token")] [Produces("application/json")] public async Task Token( [ModelBinder(typeof(TokenRequestModelBinder))] TokenRequest request) @@ -92,7 +92,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers return Ok(response.Parameters); } - [HttpGet("tfp/IdentityService/signinsignup/oauth2/v2.0/logout")] + [HttpGet("tfp/Identity/signinsignup/oauth2/v2.0/logout")] public async Task Logout( [EnableIntegratedWebClient, ModelBinder(typeof(LogoutRequestModelBinder))] LogoutRequest request) { @@ -119,7 +119,7 @@ namespace Identity.OpenIdConnect.WebSite.Identity.Controllers var parameters = new { - ReturnUrl = Url.Action("Authorize", "IdentityService", messageCopy.Parameters) + ReturnUrl = Url.Action("Authorize", "Identity", messageCopy.Parameters) }; return RedirectToAction(action, controller, parameters); diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/ManageController.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/ManageController.cs similarity index 99% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/ManageController.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/ManageController.cs index b17eb5ab74..35f98149e0 100644 --- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Controllers/ManageController.cs +++ b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Controllers/ManageController.cs @@ -13,8 +13,8 @@ using Microsoft.Extensions.Logging; namespace Identity.OpenIdConnect.WebSite.Identity.Controllers { [Authorize(IdentityServiceOptions.LoginPolicyName)] - [Area("IdentityService")] - [Route("tfp/IdentityService/[controller]/[action]")] + [Area("Identity")] + [Route("tfp/Identity/[controller]/[action]")] public class ManageController : Controller { private readonly UserManager _userManager; diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Data/IdentityServiceDbContext.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Data/IdentityServiceDbContext.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Data/IdentityServiceDbContext.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Data/IdentityServiceDbContext.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Data/Migrations/00000000000000_CreateIdentitySchema.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Data/Migrations/00000000000000_CreateIdentitySchema.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Data/Migrations/00000000000000_CreateIdentitySchema.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Data/Migrations/IdentityServiceDbContextModelSnapshot.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Data/Migrations/IdentityServiceDbContextModelSnapshot.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Data/Migrations/IdentityServiceDbContextModelSnapshot.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Data/Migrations/IdentityServiceDbContextModelSnapshot.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Extensions/IdentityServiceExtensions.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Extensions/IdentityServiceExtensions.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Extensions/IdentityServiceExtensions.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Extensions/IdentityServiceExtensions.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/AccountViewModels/ForgotPasswordViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/AccountViewModels/ForgotPasswordViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/AccountViewModels/ForgotPasswordViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/AccountViewModels/ForgotPasswordViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/AccountViewModels/LoginViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/AccountViewModels/LoginViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/AccountViewModels/LoginViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/AccountViewModels/LoginViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/AccountViewModels/RegisterViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/AccountViewModels/RegisterViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/AccountViewModels/RegisterViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/AccountViewModels/RegisterViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/AccountViewModels/ResetPasswordViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/AccountViewModels/ResetPasswordViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/AccountViewModels/ResetPasswordViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/AccountViewModels/ResetPasswordViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/AccountViewModels/SendCodeViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/AccountViewModels/SendCodeViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/AccountViewModels/SendCodeViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/AccountViewModels/SendCodeViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/AccountViewModels/VerifyCodeViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/AccountViewModels/VerifyCodeViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/AccountViewModels/VerifyCodeViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/AccountViewModels/VerifyCodeViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationUser.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationUser.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationUser.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationUser.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/ApplicationDetailsViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/ApplicationDetailsViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/ApplicationDetailsViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/ApplicationDetailsViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/ChangeApplicationNameViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/ChangeApplicationNameViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/ChangeApplicationNameViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/ChangeApplicationNameViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/CreateApplicationViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/CreateApplicationViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/CreateApplicationViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/CreateApplicationViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/CreateLogoutUriViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/CreateLogoutUriViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/CreateLogoutUriViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/CreateLogoutUriViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/CreateRedirectUriViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/CreateRedirectUriViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/CreateRedirectUriViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/CreateRedirectUriViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/CreateScopeViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/CreateScopeViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/CreateScopeViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/CreateScopeViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/EditLogoutUriViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/EditLogoutUriViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/EditLogoutUriViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/EditLogoutUriViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/EditRedirectUriViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/EditRedirectUriViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/EditRedirectUriViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/EditRedirectUriViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/EditScopeViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/EditScopeViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/EditScopeViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/EditScopeViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/GeneratedClientSecretViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/GeneratedClientSecretViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/GeneratedClientSecretViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/GeneratedClientSecretViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/RemoveApplicationViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/RemoveApplicationViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/RemoveApplicationViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/RemoveApplicationViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/RemoveLogoutUriViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/RemoveLogoutUriViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/RemoveLogoutUriViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/RemoveLogoutUriViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/RemoveRedirectUriViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/RemoveRedirectUriViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/RemoveRedirectUriViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/RemoveRedirectUriViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/RemoveScopeViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/RemoveScopeViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ApplicationViewModels/RemoveScopeViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ApplicationViewModels/RemoveScopeViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/AddPhoneNumberViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/AddPhoneNumberViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/AddPhoneNumberViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/AddPhoneNumberViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/ChangePasswordViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/ChangePasswordViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/ChangePasswordViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/ChangePasswordViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/FactorViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/FactorViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/FactorViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/FactorViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/IndexViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/IndexViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/IndexViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/IndexViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/ManageLoginsViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/ManageLoginsViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/ManageLoginsViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/ManageLoginsViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/RemoveLoginViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/RemoveLoginViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/RemoveLoginViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/RemoveLoginViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/SetPasswordViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/SetPasswordViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/SetPasswordViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/SetPasswordViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Services/IEmailSender.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Services/IEmailSender.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Services/IEmailSender.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Services/IEmailSender.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Services/ISmsSender.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Services/ISmsSender.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Services/ISmsSender.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Services/ISmsSender.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Services/MessageServices.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Services/MessageServices.cs similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Services/MessageServices.cs rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Services/MessageServices.cs diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/AccessDenied.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/AccessDenied.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/AccessDenied.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/AccessDenied.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/ConfirmEmail.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ConfirmEmail.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/ConfirmEmail.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ConfirmEmail.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/ExternalLoginConfirmation.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ExternalLoginConfirmation.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/ExternalLoginConfirmation.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ExternalLoginConfirmation.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/ExternalLoginFailure.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ExternalLoginFailure.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/ExternalLoginFailure.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ExternalLoginFailure.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/ForgotPassword.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ForgotPassword.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/ForgotPassword.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ForgotPassword.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/ForgotPasswordConfirmation.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/ForgotPasswordConfirmation.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/Lockout.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Lockout.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/Lockout.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Lockout.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/Login.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Login.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/Login.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Login.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/Register.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Register.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/Register.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/Register.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/ResetPassword.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ResetPassword.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/ResetPassword.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ResetPassword.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/ResetPasswordConfirmation.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ResetPasswordConfirmation.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/ResetPasswordConfirmation.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/ResetPasswordConfirmation.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/SendCode.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/SendCode.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/SendCode.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/SendCode.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/VerifyCode.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/VerifyCode.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Account/VerifyCode.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Account/VerifyCode.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/AddLogoutUri.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddLogoutUri.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/AddLogoutUri.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddLogoutUri.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/AddRedirectUri.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddRedirectUri.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/AddRedirectUri.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddRedirectUri.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/AddScope.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddScope.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/AddScope.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/AddScope.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/ChangeName.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/ChangeName.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/ChangeName.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/ChangeName.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/ClientSecret.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/ClientSecret.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/ClientSecret.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/ClientSecret.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/Create.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Create.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/Create.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Create.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/CreateLogoutUri.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateLogoutUri.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/CreateLogoutUri.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateLogoutUri.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/CreateRedirectUri.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateRedirectUri.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/CreateRedirectUri.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateRedirectUri.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/CreateScope.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateScope.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/CreateScope.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/CreateScope.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/Details.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Details.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/Details.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Details.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/Edit.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Edit.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/Edit.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Edit.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/EditLogoutUri.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/EditLogoutUri.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/EditLogoutUri.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/EditLogoutUri.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/EditRedirectUri.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/EditRedirectUri.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/EditRedirectUri.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/EditRedirectUri.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/EditScope.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/EditScope.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/EditScope.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/EditScope.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/GenerateClientSecret.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/GenerateClientSecret.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/GenerateClientSecret.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/GenerateClientSecret.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/GeneratedClientSecret.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/GeneratedClientSecret.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/GeneratedClientSecret.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/GeneratedClientSecret.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/Index.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Index.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/Index.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/Index.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/RegenerateClientSecret.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RegenerateClientSecret.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/RegenerateClientSecret.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RegenerateClientSecret.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/RemoveApplication.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveApplication.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/RemoveApplication.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveApplication.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/RemoveClientSecret.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveClientSecret.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/RemoveClientSecret.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveClientSecret.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/RemoveLogoutUri.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveLogoutUri.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/RemoveLogoutUri.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveLogoutUri.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/RemoveRedirectUri.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveRedirectUri.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/RemoveRedirectUri.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveRedirectUri.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/RemoveScope.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveScope.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Applications/RemoveScope.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Applications/RemoveScope.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Home/Clients.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Home/Clients.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Home/Clients.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Home/Clients.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Home/Index.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Home/Index.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Home/Index.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Home/Index.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/IdentityService/InvalidLogoutRedirect.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/IdentityService/InvalidLogoutRedirect.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/IdentityService/InvalidLogoutRedirect.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/IdentityService/InvalidLogoutRedirect.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/IdentityService/SignedOut.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/IdentityService/SignedOut.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/IdentityService/SignedOut.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/IdentityService/SignedOut.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Manage/AddPhoneNumber.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/AddPhoneNumber.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Manage/AddPhoneNumber.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/AddPhoneNumber.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Manage/ChangePassword.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/ChangePassword.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Manage/ChangePassword.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/ChangePassword.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Manage/Index.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/Index.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Manage/Index.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/Index.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Manage/ManageLogins.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/ManageLogins.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Manage/ManageLogins.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/ManageLogins.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Manage/SetPassword.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/SetPassword.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Manage/SetPassword.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/SetPassword.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Manage/VerifyPhoneNumber.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/VerifyPhoneNumber.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/Manage/VerifyPhoneNumber.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/Manage/VerifyPhoneNumber.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/_ViewImports.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/_ViewImports.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/_ViewImports.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/_ViewImports.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/_ViewStart.cshtml b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/_ViewStart.cshtml similarity index 100% rename from test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Views/_ViewStart.cshtml rename to test/WebSites/Identity.OpenIdConnect.WebSite/Areas/Identity/Views/_ViewStart.cshtml diff --git a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Data/IdentityServiceDbContextFactory.cs b/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Data/IdentityServiceDbContextFactory.cs deleted file mode 100644 index fa63a43094..0000000000 --- a/test/WebSites/Identity.OpenIdConnect.WebSite/Areas/IdentityService/Data/IdentityServiceDbContextFactory.cs +++ /dev/null @@ -1,6 +0,0 @@ -using Microsoft.EntityFrameworkCore.Design; -using Microsoft.Extensions.DependencyInjection; - -namespace Identity.OpenIdConnect.WebSite.Identity.Data -{ -}