Skip to content

Use unicode regex for email validation #3936

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

Open
mpivchev wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −16
Open

Use unicode regex for email validation #3936

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a1d6f0
Use unicode regex for email validation
mpivchev Dec 22, 2025
fc02649
Update iOSClient/Share/NCShare.swift
mpivchev Dec 22, 2025
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
25 changes: 10 additions & 15 deletions iOSClient/Share/NCShare.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
let isVisible = (self.navigationController?.topViewController as? NCSharePaging)?.page == .sharing
networking?.readShare(showLoadingIndicator: isVisible)


Check warning on line 114 in iOSClient/Share/NCShare.swift

View workflow job for this annotation

GitHub Actions / Lint 

Vertical Whitespace Violation: Limit vertical whitespace to a single empty line; currently 2 (vertical_whitespace)

Check warning on line 114 in iOSClient/Share/NCShare.swift

View workflow job for this annotation

GitHub Actions / Lint 

Trailing Whitespace Violation: Lines should not have trailing whitespace (trailing_whitespace)
searchField.searchTextField.font = .systemFont(ofSize: 14)
searchField.delegate = self
}
Expand Down Expand Up @@ -201,13 +202,6 @@
// MARK: - IBAction

@IBAction func searchFieldDidEndOnExit(textField: UITextField) {
// https://stackoverflow.com/questions/25471114/how-to-validate-an-e-mail-address-in-swift
func isValidEmail(_ email: String) -> Bool {

let emailRegEx = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}"
let emailPred = NSPredicate(format: "SELF MATCHES %@", emailRegEx)
return emailPred.evaluate(with: email)
}
guard let searchString = textField.text, !searchString.isEmpty else { return }
if searchString.contains("@"), !isValidEmail(searchString) { return }
networking?.getSharees(searchString: searchString)
Expand Down Expand Up @@ -460,15 +454,16 @@
}

@objc private func searchSharees(_ sender: Any?) {
// https://stackoverflow.com/questions/25471114/how-to-validate-an-e-mail-address-in-swift
func isValidEmail(_ email: String) -> Bool {

let emailRegEx = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}"
let emailPred = NSPredicate(format: "SELF MATCHES %@", emailRegEx)
return emailPred.evaluate(with: email)
}
guard let searchString = searchField.text, !searchString.isEmpty else { return }
guard let searchString = searchField.text?.trimmingCharacters(in: .whitespacesAndNewlines), !searchString.isEmpty else { return }
if searchString.contains("@"), !isValidEmail(searchString) { return }
networking?.getSharees(searchString: searchString)
}
}

extension NCShare {
private func isValidEmail(_ email: String) -> Bool {
let emailRegEx = "^[\u{0021}-\u{007E}\\p{L}\\p{M}\\p{N}._%+\\-]+@([\\p{L}\\p{M}\\p{N}0-9\\-]+\\.)+[\\p{L}\\p{M}]{2,64}$" // Unicode regex allows for all unicode chars, ex. ß, ü, and more.
let emailPred = NSPredicate(format: "SELF MATCHES %@", emailRegEx)
return emailPred.evaluate(with: email)
}
}
Loading