Commit f6baff65: #1630 fix silent signIn and profile loading

#1630 fix silent signIn and profile loading

f6baff65

Michael Schmitz

committed Mar 18

main

succeeded

Files

Details



	WPE.App.Authentication.Maui
	Business
	Flow
	AuthClient.cs
	IAuthClient.cs
	NativeAuthenticationStateProvider.cs
	WPE.App.Authentication.Maui.csproj

AuthClient.cs

-9+8

/WPE.App.Authentication.Maui/Business/Flow/AuthClient.cs

View

using IdentityModel.OidcClient.Results;

using Infsoft.WPE.App.Authentication.Base.Models;

using Infsoft.WPE.App.Authentication.Maui.Models;

using Infsoft.WPE.App.Services.Models;

using Infsoft.WPE.App.Services;

using Microsoft.Extensions.Options;

using IBrowser = IdentityModel.OidcClient.Browser.IBrowser;

}

/// <inheritdoc/>

public async Task SignOut()

{

await OidcClient.LogoutAsync();

}

public Task SignOut() =>

OidcClient.LogoutAsync();

/// <inheritdoc/>

public Task<UserInfoResult> GetUserInfo(string accessToken) =>

OidcClient.GetUserInfoAsync(accessToken);

/// <inheritdoc/>

public async Task<RefreshTokenResult> RefreshTokens(string refreshToken)

{

return await OidcClient.RefreshTokenAsync(refreshToken, scope: OidcClient.Options.Scope);

}

public Task<RefreshTokenResult> RefreshTokens(string refreshToken) =>

OidcClient.RefreshTokenAsync(refreshToken, scope: OidcClient.Options.Scope);

private OidcClient CreateOidcClient(LoginType loginType, string emailOrVoucherCode)

{

IAuthClient.cs

+11

/WPE.App.Authentication.Maui/Business/Flow/IAuthClient.cs

View

/// <param name="refreshToken">Token to authenticate refresh</param>

/// <returns>Result of token refresh, contains all tokens if successfull</returns>

Task<RefreshTokenResult> RefreshTokens(string refreshToken);

/// <summary>

/// Signout the user on the IdP

/// </summary>

Task SignOut();

/// <summary>

/// Query userInfo of IdP

/// </summary>

/// <param name="accessToken">Token to authenticate api call</param>

/// <returns>user information as per userInfo endpoint</returns>

Task<UserInfoResult> GetUserInfo(string accessToken);

}

NativeAuthenticationStateProvider.cs

-10+14

/WPE.App.Authentication.Maui/Business/NativeAuthenticationStateProvider.cs

View

using IdentityModel;

using Infsoft.WPE.App.Authentication.Base.Business;

using Infsoft.WPE.App.Authentication.Base.Models;

using Infsoft.WPE.App.Authentication.Maui.Business.Flow;

using Infsoft.WPE.App.Authentication.Maui.Business.Token;

using Infsoft.WPE.App.DTO;

using Infsoft.WPE.App.Extensions;

using Infsoft.WPE.App.Services;

using Microsoft.AspNetCore.Components.Authorization;

using Microsoft.Extensions.Logging;

using System.IdentityModel.Tokens.Jwt;

using System.Security.Claims;

namespace Infsoft.WPE.App.Authentication.Maui.Business

{

internal class NativeAuthenticationStateProvider(ITokenManager TokenManager, IAuthClient AuthClient, ISettingsProvider SettingsProvider,

internal class NativeAuthenticationStateProvider(ITokenManager TokenManager, IAuthClient AuthClient,

ILogger<NativeAuthenticationStateProvider> logger, IPlatformPreferenceService platformPreferenceService) : AppAuthenticationStateProvider(logger, platformPreferenceService)

{

public override async Task<AuthenticationState> GetAuthenticationStateAsync()

private async Task<AuthenticationState> SilentSignInCore()

{

if (await TokenManager.GetAccessToken() != null)

await ExtractUser();

cachedUser = await ExtractUser();

var tenant = cachedUser.FindFirst(claim => claim.Type == "tenant");

if (tenant is null)

{

Logger.LogDebug("No tenant detected");

cachedUser = NoUser;

}

else

PlatformPreferenceService.SetTenant(tenant.Value);

private async Task<ClaimsPrincipal> ExtractUser()

{

Logger.LogInformation("Reading user information from id token");

var token = await TokenManager.GetIdToken();

Logger.LogInformation("Querying user information from userInfo endpoint");

var token = await TokenManager.GetAccessToken();

if (token is null)

return NoUser;

var parsed = new JwtSecurityTokenHandler().ReadJwtToken(token);

var profile = await AuthClient.GetUserInfo(token);

if (profile.IsError)

{

Logger.LogDebug("Error on fetching profile information: {Error}, {Description}", profile.Error, profile.ErrorDescription);

return NoUser;

}

var identity = new ClaimsIdentity(

nameof(NativeAuthenticationStateProvider),

"name",

"role");

identity.AddClaims(parsed.Claims);

identity.AddClaims(profile.Claims);

return new ClaimsPrincipal(identity);

}

WPE.App.Authentication.Maui.csproj

-1+1

/WPE.App.Authentication.Maui/WPE.App.Authentication.Maui.csproj

View

<PackageReadmeFile>ReadMe.md</PackageReadmeFile>

<PackageTags>WPE;Workplace Experience;infsoft</PackageTags>

</PropertyGroup>