ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Migrated Identity.API to Identity Server 4 on dotnetcore2

Browse Source
This commit is contained in:
Unai Zorrilla Castro 2017-09-11 12:43:45 +02:00
parent 7321d5e5fc
commit aed97fdc99
5 changed files with 48 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/Services/Identity/Identity.API/Controllers/AccountController.cs
View File

@ -2,26 +2,23 @@
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
using Identity.API.Models;
using Identity.API.Models.AccountViewModels;
using Identity.API.Services;
using IdentityModel; using IdentityModel;
using IdentityServer4.Quickstart.UI.Models; using IdentityServer4.Models;
using IdentityServer4.Services; using IdentityServer4.Services;
using Microsoft.AspNetCore.Http.Authentication; using IdentityServer4.Stores;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Security.Claims; using System.Security.Claims;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
using System.Threading.Tasks; using System.Threading.Tasks;
using IdentityServer4.Models;
using IdentityServer4.Stores;
using Identity.API.Services;
using Identity.API.Models;
using Microsoft.Extensions.Logging;
using Microsoft.AspNetCore.Authorization;
using Identity.API.Models.AccountViewModels;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Authentication;
namespace IdentityServer4.Quickstart.UI.Controllers namespace IdentityServer4.Quickstart.UI.Controllers
{ {
@ -36,7 +33,7 @@ namespace IdentityServer4.Quickstart.UI.Controllers
private readonly ILoginService<ApplicationUser> _loginService; private readonly ILoginService<ApplicationUser> _loginService;
private readonly IIdentityServerInteractionService _interaction; private readonly IIdentityServerInteractionService _interaction;
private readonly IClientStore _clientStore; private readonly IClientStore _clientStore;
private readonly ILogger _logger; private readonly ILogger<AccountController> _logger;
private readonly UserManager<ApplicationUser> _userManager; private readonly UserManager<ApplicationUser> _userManager;
public AccountController( public AccountController(
@ -45,13 +42,13 @@ namespace IdentityServer4.Quickstart.UI.Controllers
ILoginService<ApplicationUser> loginService, ILoginService<ApplicationUser> loginService,
IIdentityServerInteractionService interaction, IIdentityServerInteractionService interaction,
IClientStore clientStore, IClientStore clientStore,
ILoggerFactory loggerFactory, ILogger<AccountController> logger,
UserManager<ApplicationUser> userManager) UserManager<ApplicationUser> userManager)
{ {
_loginService = loginService; _loginService = loginService;
_interaction = interaction; _interaction = interaction;
_clientStore = clientStore; _clientStore = clientStore;
_logger = loggerFactory.CreateLogger<AccountController>(); _logger = logger;
_userManager = userManager; _userManager = userManager;
} }
@ -69,6 +66,7 @@ namespace IdentityServer4.Quickstart.UI.Controllers
} }
var vm = await BuildLoginViewModelAsync(returnUrl, context); var vm = await BuildLoginViewModelAsync(returnUrl, context);
ViewData["ReturnUrl"] = returnUrl; ViewData["ReturnUrl"] = returnUrl;
return View(vm); return View(vm);
@ -97,6 +95,7 @@ namespace IdentityServer4.Quickstart.UI.Controllers
}; };
await _loginService.SignIn(user); await _loginService.SignIn(user);
// make sure the returnUrl is still valid, and if yes - redirect back to authorize endpoint // make sure the returnUrl is still valid, and if yes - redirect back to authorize endpoint
if (_interaction.IsValidReturnUrl(model.ReturnUrl)) if (_interaction.IsValidReturnUrl(model.ReturnUrl))
{ {
@ -111,7 +110,9 @@ namespace IdentityServer4.Quickstart.UI.Controllers
// something went wrong, show form with error // something went wrong, show form with error
var vm = await BuildLoginViewModelAsync(model); var vm = await BuildLoginViewModelAsync(model);
ViewData["ReturnUrl"] = model.ReturnUrl; ViewData["ReturnUrl"] = model.ReturnUrl;
return View(vm); return View(vm);
} }
@ -180,6 +181,7 @@ namespace IdentityServer4.Quickstart.UI.Controllers
public async Task<IActionResult> Logout(LogoutViewModel model) public async Task<IActionResult> Logout(LogoutViewModel model)
{ {
var idp = User?.FindFirst(JwtClaimTypes.IdentityProvider)?.Value; var idp = User?.FindFirst(JwtClaimTypes.IdentityProvider)?.Value;
if (idp != null && idp != IdentityServerConstants.LocalIdentityProvider) if (idp != null && idp != IdentityServerConstants.LocalIdentityProvider)
{ {
if (model.LogoutId == null) if (model.LogoutId == null)
@ -191,10 +193,15 @@ namespace IdentityServer4.Quickstart.UI.Controllers
} }
string url = "/Account/Logout?logoutId=" + model.LogoutId; string url = "/Account/Logout?logoutId=" + model.LogoutId;
try try
{ {
// hack: try/catch to handle social providers that throw // hack: try/catch to handle social providers that throw
await HttpContext.Authentication.SignOutAsync(idp, new AuthenticationProperties { RedirectUri = url }); await HttpContext.SignOutAsync(idp, new AuthenticationProperties
{
RedirectUri = url
});
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -203,7 +210,7 @@ namespace IdentityServer4.Quickstart.UI.Controllers
} }
// delete authentication cookie // delete authentication cookie
await HttpContext.Authentication.SignOutAsync(); await HttpContext.SignOutAsync();
// set this so UI rendering sees an anonymous user // set this so UI rendering sees an anonymous user
HttpContext.User = new ClaimsPrincipal(new ClaimsIdentity()); HttpContext.User = new ClaimsPrincipal(new ClaimsIdentity());
@ -217,7 +224,7 @@ namespace IdentityServer4.Quickstart.UI.Controllers
public async Task<IActionResult> DeviceLogOut(string redirectUrl) public async Task<IActionResult> DeviceLogOut(string redirectUrl)
{ {
// delete authentication cookie // delete authentication cookie
await HttpContext.Authentication.SignOutAsync(); await HttpContext.SignOutAsync();
// set this so UI rendering sees an anonymous user // set this so UI rendering sees an anonymous user
HttpContext.User = new ClaimsPrincipal(new ClaimsIdentity()); HttpContext.User = new ClaimsPrincipal(new ClaimsIdentity());

6
src/Services/Identity/Identity.API/Data/ApplicationDbContext.cs
View File

@ -1,10 +1,6 @@
using System; using Identity.API.Models;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Identity.API.Models;
namespace Identity.API.Data namespace Identity.API.Data
{ {

41
src/Services/Identity/Identity.API/Identity.API.csproj
View File

@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework> <TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeFrameworkVersion>1.1.2</RuntimeFrameworkVersion> <RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
<UserSecretsId>aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5</UserSecretsId> <UserSecretsId>aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5</UserSecretsId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
@ -16,32 +16,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.2" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" /> <PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.0.0-rc1" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="1.1.2" /> <PackageReference Include="IdentityServer4.EntityFramework" Version="2.0.0-rc1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.2">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.1">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink.Loader" Version="14.1.0" />
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="1.0.1" />
<PackageReference Include="IdentityServer4.EntityFramework" Version="1.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
</ItemGroup> </ItemGroup>
@ -51,10 +28,10 @@
</Target> </Target>
<ItemGroup> <ItemGroup>
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.4.337" /> <DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.5.357" />
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0-msbuild3-final" /> <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="1.0.0-msbuild3-final" /> <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0-msbuild3-final" /> <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
src/Services/Identity/Identity.API/Models/ApplicationUser.cs
View File

@ -1,8 +1,4 @@
using System; using Microsoft.AspNetCore.Identity;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Identity.API.Models namespace Identity.API.Models

21
src/Services/Identity/Identity.API/Startup.cs
View File

@ -11,7 +11,6 @@ using IdentityServer4.Services;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.eShopOnContainers.BuildingBlocks; using Microsoft.eShopOnContainers.BuildingBlocks;
using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure; using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure;
@ -95,16 +94,21 @@ namespace eShopOnContainers.Identity
services.AddIdentityServer(x => x.IssuerUri = "null") services.AddIdentityServer(x => x.IssuerUri = "null")
.AddSigningCredential(Certificate.Get()) .AddSigningCredential(Certificate.Get())
.AddAspNetIdentity<ApplicationUser>() .AddAspNetIdentity<ApplicationUser>()
.AddConfigurationStore(builder => .AddConfigurationStore(options =>
builder.UseSqlServer(connectionString, options => {
options.MigrationsAssembly(migrationsAssembly))) options.ConfigureDbContext = builder => builder.UseSqlServer(connectionString, opts =>
.AddOperationalStore(builder => opts.MigrationsAssembly(migrationsAssembly));
builder.UseSqlServer(connectionString, options => })
options.MigrationsAssembly(migrationsAssembly))) .AddOperationalStore(options =>
{
options.ConfigureDbContext = builder => builder.UseSqlServer(connectionString, opts =>
opts.MigrationsAssembly(migrationsAssembly));
})
.Services.AddTransient<IProfileService, ProfileService>(); .Services.AddTransient<IProfileService, ProfileService>();
var container = new ContainerBuilder(); var container = new ContainerBuilder();
container.Populate(services); container.Populate(services);
return new AutofacServiceProvider(container.Build()); return new AutofacServiceProvider(container.Build());
} }
@ -118,7 +122,6 @@ namespace eShopOnContainers.Identity
{ {
app.UseDeveloperExceptionPage(); app.UseDeveloperExceptionPage();
app.UseDatabaseErrorPage(); app.UseDatabaseErrorPage();
app.UseBrowserLink();
} }
else else
{ {
@ -142,7 +145,7 @@ namespace eShopOnContainers.Identity
await next(); await next();
}); });
app.UseIdentity(); app.UseAuthentication();
// Adds IdentityServer // Adds IdentityServer
app.UseIdentityServer(); app.UseIdentityServer();