Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

refactor logic related to domain filtering for emails during external login

Browse Source
This commit is contained in:
sbwalker
2023-12-21 15:54:46 -05:00
parent e99df58bce
commit 52069f35c5
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs
View File

@ -205,6 +205,10 @@ namespace Oqtane.Extensions
{ {
email = item[emailClaimType].ToString().ToLower(); email = item[emailClaimType].ToString().ToLower();
} }
else
{
id = ""; // if email is not valid we will assume id is not valid
}
} }
} }
if (!string.IsNullOrEmpty(id)) if (!string.IsNullOrEmpty(id))
@ -290,6 +294,10 @@ namespace Oqtane.Extensions
{ {
email = context.Principal.FindFirstValue(emailClaimType); email = context.Principal.FindFirstValue(emailClaimType);
} }
else
{
id = ""; // if email is not valid we will assume id is not valid
}
} }
// validate user // validate user
@ -610,7 +618,9 @@ namespace Oqtane.Extensions
private static bool EmailValid(string email, string domainfilter) private static bool EmailValid(string email, string domainfilter)
{ {
if (!string.IsNullOrEmpty(email) && email.Contains("@") && email.Contains(".")) if (!string.IsNullOrEmpty(email))
{
if (email.Contains("@") && email.Contains("."))
{ {
var domains = domainfilter.ToLower().Split(',', StringSplitOptions.RemoveEmptyEntries); var domains = domainfilter.ToLower().Split(',', StringSplitOptions.RemoveEmptyEntries);
foreach (var domain in domains) foreach (var domain in domains)
@ -628,5 +638,7 @@ namespace Oqtane.Extensions
} }
return false; return false;
} }
return (string.IsNullOrEmpty(domainfilter)); // email is optional unless domain filter is specified
}
} }
} }