Fix KeyNotFoundException in OIDCHandler.AuthenticateCoreAsync #315 (#316)

Author: Tratcher

src/Microsoft.Owin.Security.OpenIdConnect/OpenidConnectAuthenticationHandler.cs

@@ -384,7 +384,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
                         ClientSecret = Options.ClientSecret,
                         Code = authorizationResponse.Code,
                         GrantType = OpenIdConnectGrantTypes.AuthorizationCode,
-                        RedirectUri = properties.Dictionary[OpenIdConnectAuthenticationDefaults.RedirectUriUsedForCodeKey]
+                        RedirectUri = properties.Dictionary.ContainsKey(OpenIdConnectAuthenticationDefaults.RedirectUriUsedForCodeKey) ?
+                            properties.Dictionary[OpenIdConnectAuthenticationDefaults.RedirectUriUsedForCodeKey] : string.Empty,
                     };
 
                     var authorizationCodeReceivedNotification = new AuthorizationCodeReceivedNotification(Context, Options)
@@ -393,8 +394,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
                         Code = authorizationResponse.Code,
                         JwtSecurityToken = jwt,
                         ProtocolMessage = authorizationResponse,
-                        RedirectUri = properties.Dictionary.ContainsKey(OpenIdConnectAuthenticationDefaults.RedirectUriUsedForCodeKey) ?
-                            properties.Dictionary[OpenIdConnectAuthenticationDefaults.RedirectUriUsedForCodeKey] : string.Empty,
+                        RedirectUri = tokenEndpointRequest.RedirectUri,
                         TokenEndpointRequest = tokenEndpointRequest
                     };
                     await Options.Notifications.AuthorizationCodeReceived(authorizationCodeReceivedNotification);