Skip to content

Commit

Permalink
minor fix - approved domains should not be case sensitive
Browse files Browse the repository at this point in the history
  • Loading branch information
albogdano committed May 24, 2024
1 parent 4f014da commit 3c0a99d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/java/com/erudika/scoold/utils/ScooldUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public static ScooldConfig getConfig() {
// multiple domains/admins are allowed only in Scoold PRO
String approvedDomain = StringUtils.substringBefore(CONF.approvedDomainsForSignups(), ",");
if (!StringUtils.isBlank(approvedDomain)) {
APPROVED_DOMAINS.add(approvedDomain);
APPROVED_DOMAINS.add(approvedDomain.toLowerCase());
}
// multiple admins are allowed only in Scoold PRO
String admin = StringUtils.substringBefore(CONF.admins(), ",");
Expand Down Expand Up @@ -524,7 +524,7 @@ public boolean isEmailDomainApproved(String email) {
if (StringUtils.isBlank(email)) {
return false;
}
if (!APPROVED_DOMAINS.isEmpty() && !APPROVED_DOMAINS.contains(StringUtils.substringAfter(email, "@"))) {
if (!APPROVED_DOMAINS.isEmpty() && !APPROVED_DOMAINS.contains(StringUtils.substringAfter(email, "@").toLowerCase())) {
logger.warn("Attempted signin from an unknown domain - email {} is part of an unapproved domain.", email);
return false;
}
Expand Down

0 comments on commit 3c0a99d

Please sign in to comment.