Skip to content

Commit

Permalink
Validate that username is not an email
Browse files Browse the repository at this point in the history
  • Loading branch information
cocojoe committed Jul 22, 2019
1 parent de6a53c commit 754ff62
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Lock/Validators.swift
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public class UsernameValidator: InputValidator {

let invalidSet: CharacterSet?
let range: CountableClosedRange<Int>
let emailValidator = EmailValidator()

var min: Int { return self.range.lowerBound }
var max: Int { return self.range.upperBound }
Expand All @@ -87,6 +88,7 @@ public class UsernameValidator: InputValidator {
#endif
guard let characterSet = self.invalidSet else { return nil }
guard username.rangeOfCharacter(from: characterSet) == nil else { return InputValidationError.notAUsername }
guard self.emailValidator.validate(username) != nil else { return InputValidationError.notAUsername }
return nil
}

Expand Down

0 comments on commit 754ff62

Please sign in to comment.