IOS-3048: Bugfix/Trailing @ symbol passes validation (#47)

spothero · May 24, 2021 · f2fcbe7 · f2fcbe7
1 parent 4533504
commit f2fcbe7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,8 @@ jobs:
   lint:
     name: Lint
     runs-on: macos-latest
+    permissions: 
+      pull-requests: write
     env:
       DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:

diff --git a/Sources/SpotHeroEmailValidator/SpotHeroEmailValidator.swift b/Sources/SpotHeroEmailValidator/SpotHeroEmailValidator.swift
@@ -118,13 +118,13 @@ public class SpotHeroEmailValidator: NSObject {
     }
 
     private func splitEmailAddress(_ emailAddress: String) throws -> EmailParts {
-        let emailAddressParts = emailAddress.split(separator: "@")
-
-        guard emailAddressParts.count == 2 else {
-            // There are either no @ symbols or more than one @ symbol, throw an error
+        // Ensure there is exactly one @ symbol.
+        guard emailAddress.filter({ $0 == "@" }).count == 1 else {
             throw Error.invalidSyntax
         }
 
+        let emailAddressParts = emailAddress.split(separator: "@")
+
         // Extract the username from the email address parts
         let username = String(emailAddressParts.first ?? "")
         // Extract the full domain (including TLD) from the email address parts

diff --git a/Tests/SpotHeroEmailValidatorTests/SpotHeroEmailValidatorTests.swift b/Tests/SpotHeroEmailValidatorTests/SpotHeroEmailValidatorTests.swift
@@ -20,6 +20,7 @@ class SpotHeroEmailValidatorTests: XCTestCase {
             ValidatorTestModel(emailAddress: "test.com", error: .invalidSyntax),
             ValidatorTestModel(emailAddress: #"test&*\"@email.com"#, error: .invalidSyntax),
             ValidatorTestModel(emailAddress: #"test&*\@email.com"#, error: .invalidSyntax),
+            ValidatorTestModel(emailAddress: "test@email.com@", error: .invalidSyntax),
             // Username Tests
             ValidatorTestModel(emailAddress: #"John..Doe@email.com"#, error: .invalidUsername),
             ValidatorTestModel(emailAddress: #".JohnDoe@email.com"#, error: .invalidUsername),