From e7048a325d7e8aba89305278bf23f96b8c016a32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pavli=C4=8D?=
 <tomas.pavlic@aps-holding.com>
Date: Wed, 30 Aug 2017 13:41:27 +0200
Subject: [PATCH] Combine claims from IdentityResolver with Jwt registered
 claims.

---
 src/SimpleTokenProvider/TokenProviderMiddleware.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/SimpleTokenProvider/TokenProviderMiddleware.cs b/src/SimpleTokenProvider/TokenProviderMiddleware.cs
index 9182110..f6594db 100644
--- a/src/SimpleTokenProvider/TokenProviderMiddleware.cs
+++ b/src/SimpleTokenProvider/TokenProviderMiddleware.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IdentityModel.Tokens.Jwt;
+using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
@@ -87,6 +88,10 @@ private async Task GenerateToken(HttpContext context)
                 new Claim(JwtRegisteredClaimNames.Iat, ToUnixEpochDate(now).ToString(), ClaimValueTypes.Integer64)
             };
 
+            // Combine claims from IdentityResolver with Jwt registered claims.
+            var claimsList = identity.Claims.ToList();
+            claimsList.AddRange(claims);
+
             // Create the JWT and write it to a string
             var jwt = new JwtSecurityToken(
                 issuer: _options.Issuer,