Commit 6887cb42: #1152 adjust native login

AuthClient.cs

-10+13

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

View

using IdentityModel.Client;

using IdentityModel.OidcClient;

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;

/// </summary>

/// <param name="Browser">Browser interface to actually execute login</param>

/// <param name="options">Configured options for authentication</param>

internal class AuthClient(IBrowser Browser, IOptions<AuthenticationConfiguration> options) : IAuthClient

internal class AuthClient(IBrowser Browser, IOptions<AuthenticationConfiguration> options, ISettingsProvider SettingsProvider) : IAuthClient

{

private AuthenticationConfiguration Options => options.Value;

private OidcClient? OidcClient { get; set; }

private Parameters? AdditionalParams { get; set; }

/// <inheritdoc/>

public async Task<LoginResult> SignIn(string scope, bool customerLogin, string? voucher)

public async Task<LoginResult> SignIn(LoginType loginType, string scope, string emailOrVoucherCode)

{

OidcClient = CreateOidcClient(scope, customerLogin, voucher);

OidcClient = CreateOidcClient(loginType, scope, emailOrVoucherCode);

return await OidcClient.LoginAsync(new()

{

FrontChannelExtraParameters = AdditionalParams

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

}

private OidcClient CreateOidcClient(string scope, bool customerLogin, string? voucher)

private OidcClient CreateOidcClient(LoginType loginType, string scope, string emailOrVoucherCode)

{

AdditionalParams = [];

if (voucher is not null)

AdditionalParams.Add("X-Voucher-Code", voucher);

if (loginType is LoginType.Visitor)

AdditionalParams.Add("X-Voucher-Code", emailOrVoucherCode);

else if (loginType is LoginType.Employee)

AdditionalParams.Add("X-Login-Hint", emailOrVoucherCode);

if (!customerLogin)

AdditionalParams.Add("X-External-Provider", "infsoft");

else

AdditionalParams.Add("X-External-Provider", Options.Tenant);

if (SettingsProvider.Tenant != "LocAwareOne")

AdditionalParams.Add("X-Tenant", SettingsProvider.Tenant);

if (OidcClient is not null && OidcClient.Options.Scope.Contains(scope))

return OidcClient;

IAuthClient.cs

-1+7

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

View

using IdentityModel.OidcClient;

using IdentityModel.OidcClient.Results;

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

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

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

{

/// <summary>

/// Start a login and resolve tokens

/// </summary>

/// <remarks><paramref name="loginType"/> will never be <see cref="LoginType.Anonymous"/>, that value is already handled in <see cref="AppAuthenticationStateProvider" /></remarks>

/// <param name="loginType">Login type requested</param>

/// <param name="scope">Scope to request</param>

/// <param name="emailOrVoucherCode">Entered email address or voucher code</param>

/// <returns>Result of login flow, contains all tokens if successfull</returns>

Task<LoginResult> SignIn(string scope, bool customerLogin, string? voucher);

Task<LoginResult> SignIn(LoginType loginType, string scope, string emailOrVoucherCode);

/// <summary>

/// Refresh all tokens with given refresh token and resolve them

WebBrowserAuthenticator.cs

-4+4

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

View

/// <param name="redirectUrl">Initial redirect url</param>

/// <param name="result">Result of Web authentication</param>

/// <returns>cleaned redirect url</returns>

private string WinStateWorkaroundURL(string redirectUrl, WebAuthenticatorResult result)

private static string WinStateWorkaroundURL(string redirectUrl, WebAuthenticatorResult result)

{

#if WINDOWS

try

if (!string.IsNullOrWhiteSpace(stateParameter))

{

// Remove the state key added by WebAuthenticator that includes appInstanceId

modifiedParameters = modifiedParameters.Where(p => !p.StartsWith("state", StringComparison.OrdinalIgnoreCase)).ToList();

modifiedParameters = [.. modifiedParameters.Where(p => !p.StartsWith("state", StringComparison.OrdinalIgnoreCase))];

stateParameter = $"state={System.Web.HttpUtility.UrlDecode(stateParameter).Split(':').Last()[1..^2]}";

stateParameter = $"state={System.Web.HttpUtility.UrlDecode(stateParameter).Split(':')[^1][1..^2]}";

modifiedParameters.Add(stateParameter);

}

var values = string.Join("&", modifiedParameters);

throw;

}

#else

return new RequestUrl(redirectUrl).Create(new Parameters(result.Properties));

return new RequestUrl(redirectUrl).Create([.. result.Properties]);

#endif

}

NativeAuthenticationStateProvider.cs

-12+11

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

View

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

using Infsoft.WPE.App.DTO;

using Infsoft.WPE.App.Services;

using Infsoft.WPE.App.Services.Models;

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,

IWPELogger<NativeAuthenticationStateProvider> Logger, IWPELogger<AppAuthenticationStateProvider> BaseLogger) : AppAuthenticationStateProvider(BaseLogger)

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

{

public override async Task<AuthenticationState> GetAuthenticationStateAsync()

{

if (user.Identity != null && user.Identity.IsAuthenticated && user.Identity.AuthenticationType != "anonymous")

{

Logger.Info("starting background check..");

Logger.LogInformation("starting background check..");

Timer? timer = null;

timer = new Timer(async _ =>

var currentUser = await GetUser(false);

if (currentUser.Identity?.IsAuthenticated == false)

{

Logger.Info("user logged out");

Logger.LogInformation("user logged out");

NotifyAuthenticationStateChanged(Task.FromResult(new AuthenticationState(currentUser)));

await timer!.DisposeAsync();

}

return state;

}

protected override Task SignIn(LoginType loginType, string? voucherCode)

protected override Task SignIn(LoginType loginType, string emailOrVoucherCode)

{

var loginTask = SignInWithSilent();

NotifyAuthenticationStateChanged(loginTask);

{

if (!(await SilentSignInCore()).User?.Identity?.IsAuthenticated ?? false)

{

var user = await SignInCore(loginType, voucherCode);

var user = await SignInCore(loginType, emailOrVoucherCode);

cachedUser = user;

}

return new AuthenticationState(cachedUser);

}

private async Task<ClaimsPrincipal> SignInCore(LoginType loginType, string? voucherCode)

private async Task<ClaimsPrincipal> SignInCore(LoginType loginType, string emailOrVoucherCode)

{

var noCustomerLogin = loginType is LoginType.Employee && SettingsProvider.AuthenticationType is AuthenticationType.Infsoft;

var scope = SettingsProvider.DevModeEnabled && SettingsProvider.AppEnvironment is not AppEnvironment.Prod ? "env.test" : "env.prod";

var authResult = await AuthClient.SignIn(scope, !noCustomerLogin, loginType is LoginType.Visitor ? voucherCode : null);

var authResult = await AuthClient.SignIn(loginType, scope, emailOrVoucherCode);

if (authResult.IsError)

return NoUser;

return cachedUser;

else if (now < userLastCheck + UserCacheRefreshInterval)

{

Logger.Debug("Taking user from cache");

Logger.LogDebug("Taking user from cache");

return cachedUser;

}

Logger.Debug("Fetching user");

Logger.LogDebug("Fetching user");

cachedUser = await ExtractUser();

userLastCheck = now;

private async Task<ClaimsPrincipal> ExtractUser()

{

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

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

var token = await TokenManager.GetIdToken();

if (token is null)

return NoUser;

AuthenticationConfiguration.cs

-5

/WPE.App.Authentication.Maui/Models/AuthenticationConfiguration.cs

View

public required string Authority { get; set; }

/// <summary>

/// Tenant to login for

/// </summary>

public required string Tenant { get; set; }

/// <summary>

/// Client id of app

/// </summary>

public required string ClientId { get; set; }

WPE.App.Authentication.Maui.csproj

-5+4

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

View

<PackageReadmeFile>ReadMe.md</PackageReadmeFile>

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

</PropertyGroup>

</ItemGroup>



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