Resolve refresh token expiration bug.

Remove login and logout blinking with EmptyLayout.razor in sample.

Author: Revsgaard

samples/BlazorWAOidcSample.Client/BlazorWAOidcSample.Client.csproj

@@ -10,8 +10,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.01" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />   
   </ItemGroup>
 
   <ItemGroup>

samples/BlazorWAOidcSample.Client/Pages/Authentication.razor

@@ -1,2 +1,3 @@
 @page "/authentication/{action}"
+@layout EmptyLayout
 @inherits AuthenticationPageBase

samples/BlazorWAOidcSample.Client/Shared/EmptyLayout.razor

@@ -0,0 +1,3 @@
+@inherits LayoutComponentBase
+
+@Body

src/ITfoxtec.Identity.BlazorWA.Oidc/ITfoxtec.Identity.BlazorWA.Oidc.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;netstandard2.1</TargetFrameworks>
     <AssemblyName>ITfoxtec.Identity.BlazorWebAssembly.OpenidConnect</AssemblyName>
     <RootNamespace>ITfoxtec.Identity.BlazorWebAssembly.OpenidConnect</RootNamespace>
 
@@ -21,9 +21,9 @@ The component automatically handle token / session update with use of the refres
     <PackageTags>Blazor WebAssembly OpenID Connect (OIDC) Proof Key for Code Exchange (PKCE) id token access token refresh token</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Copyright>© 2020 ITfoxtec</Copyright>
-    <AssemblyVersion>1.4.7.0</AssemblyVersion>
-    <FileVersion>1.4.7.0</FileVersion>
-    <Version>1.4.7</Version>
+    <AssemblyVersion>1.4.12.0</AssemblyVersion>
+    <FileVersion>1.4.12.0</FileVersion>
+    <Version>1.4.12</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -49,20 +49,21 @@ The component automatically handle token / session update with use of the refres
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.10" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.10" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.12" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
     <DefineConstants>NETSTANDARD2;NETSTANDARD</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
     <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.1|AnyCPU'">
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>

src/ITfoxtec.Identity.BlazorWA.Oidc/OidcAuthenticationStateProvider.cs

@@ -4,7 +4,6 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;

src/ITfoxtec.Identity.BlazorWA.Oidc/OpenidConnectPkce.cs

@@ -152,8 +152,7 @@ public async Task LoginCallBackAsync(string responseUrl)
             var request = new HttpRequestMessage(HttpMethod.Post, oidcDiscovery.TokenEndpoint);
             request.Content = new FormUrlEncodedContent(requestDictionary);
 
-            var httpClient = serviceProvider.GetService<HttpClient>();
-            var response = await httpClient.SendAsync(request);
+            var response = await GetHttpClient().SendAsync(request);
             switch (response.StatusCode)
             {
                 case HttpStatusCode.OK:
@@ -223,8 +222,7 @@ public async Task<OidcUserSession> HandleRefreshTokenAsync(OidcUserSession userS
             var request = new HttpRequestMessage(HttpMethod.Post, oidcDiscovery.TokenEndpoint);
             request.Content = new FormUrlEncodedContent(tokenRequest.ToDictionary());
 
-            var httpClient = serviceProvider.GetService<HttpClient>();
-            var response = await httpClient.SendAsync(request);
+            var response = await GetHttpClient().SendAsync(request);
             switch (response.StatusCode)
             {
                 case HttpStatusCode.OK:
@@ -267,16 +265,29 @@ public async Task<OidcUserSession> HandleRefreshTokenAsync(OidcUserSession userS
                     }
 
                 case HttpStatusCode.BadRequest:
-                    var resultBadRequest = await response.Content.ReadAsStringAsync();
-                    var tokenResponseBadRequest = resultBadRequest.ToObject<TokenResponse>();
-                    tokenResponseBadRequest.Validate(true);
-                    throw new Exception($"Error, Bad request. StatusCode={response.StatusCode}");
+                    try
+                    {
+                        var resultBadRequest = await response.Content.ReadAsStringAsync();
+                        var tokenResponseBadRequest = resultBadRequest.ToObject<TokenResponse>();
+                        tokenResponseBadRequest.Validate(true);
+                        throw new TokenUnavailableException($"Error, Bad request. StatusCode={response.StatusCode}");
+                    }
+                    catch (ResponseErrorException rex)
+                    {
+                        throw new TokenUnavailableException(rex.Message, rex);
+                    }
 
                 default:
-                    throw new Exception($"Error, Status Code not expected. StatusCode={response.StatusCode}");
+                    throw new TokenUnavailableException($"Error, Status Code not expected. StatusCode={response.StatusCode}");
             }
         }
 
+        private HttpClient GetHttpClient()
+        {
+            var httpClientFactory = serviceProvider.GetService<IHttpClientFactory>();
+            return httpClientFactory.CreateClient();
+        }
+
         public async Task LogoutAsync(OpenidConnectPkceSettings openidClientPkceSettings = null)
         {
             try