Merge pull request #5230 from sbwalker/dev

resolve issue with host role support  in external login
This commit is contained in:
Shaun Walker 2025-04-09 10:55:32 -04:00 committed by GitHub
commit 7aa54bf979
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -584,8 +584,9 @@ namespace Oqtane.Extensions
} }
} }
var userrole = userRoles.FirstOrDefault(item => item.Role.Name == RoleNames.Registered); var host = userRoles.FirstOrDefault(item => item.Role.Name == RoleNames.Host);
if (!user.IsDeleted && userrole != null && Utilities.IsEffectiveAndNotExpired(userrole.EffectiveDate, userrole.ExpiryDate)) var registered = userRoles.FirstOrDefault(item => item.Role.Name == RoleNames.Registered);
if (!user.IsDeleted && (host != null || registered != null && Utilities.IsEffectiveAndNotExpired(registered.EffectiveDate, registered.ExpiryDate)))
{ {
// update user // update user
user.LastLoginOn = DateTime.UtcNow; user.LastLoginOn = DateTime.UtcNow;