Skip to content

alway logout when is someone logged in #984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PTKu merged 4 commits into from
Jan 22, 2026
Merged

alway logout when is someone logged in #984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbf8c52
alway logout when is someone logged in
Brano5 Jan 22, 2026
4f05b6c
Merge branch 'dev' into 977-new-feature-external-login
Brano5 Jan 22, 2026
1d8cb0b
Merge branch 'dev' into 977-new-feature-external-login
PTKu Jan 22, 2026
8e88db2
Merge branch 'dev' into 977-new-feature-external-login
PTKu Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 12 additions & 24 deletions src/Security/src/AXOpen.Security/IdentityComponentsEndpointRouteBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,38 +108,26 @@ public static IEndpointRouteBuilder MapAdditionalIdentityEndpoints(this IEndpoin
if (context.User.Identity?.Name != null)
currentUser = await userManager.FindByNameAsync(context.User.Identity.Name);

if (currentUser != null)
{
if (logoutHandler != null)
{
string ipAddress = GetClientIpAddress(context);
await logoutHandler(currentUser.UserName!, ipAddress);
}
await signInManager.SignOutAsync();
}

// Find user by hashed external auth ID
var users = userManager.Users.Where(u => TokenHasher.VerifyToken(externalAuthId, u.ExternalAuthId)).ToList();
if (!users.Any() || users.Count > 1)
return TypedResults.LocalRedirect(string.IsNullOrEmpty(returnUrl) ? "/" : !returnUrl.StartsWith("/") ? "/" + returnUrl : returnUrl.StartsWith("//") ? "/" + returnUrl.TrimStart('/') : returnUrl);

var user = users.First();

if (currentUser != null)
{
// User is already logged in
if (TokenHasher.VerifyToken(externalAuthId, currentUser.ExternalAuthId))
{
// Same user - log out
if (logoutHandler != null)
{
string ipAddress = GetClientIpAddress(context);
await logoutHandler(currentUser.UserName!, ipAddress);
}
await signInManager.SignOutAsync();
if (currentUser != null) // User is already logged in
if (TokenHasher.VerifyToken(externalAuthId, currentUser.ExternalAuthId)) // Same user - only log out
return TypedResults.LocalRedirect(string.IsNullOrEmpty(returnUrl) ? "/" : !returnUrl.StartsWith("/") ? "/" + returnUrl : returnUrl.StartsWith("//") ? "/" + returnUrl.TrimStart('/') : returnUrl);
}
else
{
// Different user - log out current and log in new
if (logoutHandler != null)
{
string ipAddress = GetClientIpAddress(context);
await logoutHandler(currentUser.UserName!, ipAddress);
}
await signInManager.SignOutAsync();
}
}

// Sign in the user
await signInManager.SignInAsync(user, isPersistent: false);
Expand Down
10 changes: 9 additions & 1 deletion src/Security/src/AXOpen.Security/Services/SerialService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,15 @@ public async Task<bool> OpenPortAsync(int baudRate, bool onlyPreviouslyAuthorize

if(_module == null)
_module = await _jsRuntime.InvokeAsync<IJSObjectReference>("import", "./_content/AXOpen.Security.Blazor/js/SerialCommunication.js");
int operationStatus = await _module.InvokeAsync<int>("openPortAsync", _selfRef, onlyPreviouslyAuthorizedPort, baudRate, 512, dataBits, flowControlString, parityString, stopBits);

int operationStatus = 0;
try
{
operationStatus = await _module.InvokeAsync<int>("openPortAsync", _selfRef, onlyPreviouslyAuthorizedPort, baudRate, 512, dataBits, flowControlString, parityString, stopBits);
}
catch (Exception ex)
{
}

switch (operationStatus)
{
Expand Down
Loading