chore: handle white spaces in username validation

openedx · Nov 14, 2023 · a62c71e · a62c71e
1 parent cc70b4a
commit a62c71e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/Authorization/Authorization/Presentation/Login/SignInViewModel.swift b/Authorization/Authorization/Presentation/Login/SignInViewModel.swift
@@ -50,7 +50,7 @@ public class SignInViewModel: ObservableObject {
 
     @MainActor
     func login(username: String, password: String) async {
-        guard !validator.containsWhitespace(username) else {
+        guard validator.isValidUsername(username) else {
             errorMessage = AuthLocalization.Error.invalidEmailAddressOrUsername
             return
         }

diff --git a/Core/Core/View/Validator.swift b/Core/Core/View/Validator.swift
@@ -25,13 +25,7 @@ public class Validator {
         return password.count >= 2
     }
 
-    public func containsWhitespace(_ string: String) -> Bool {
-        return string.containsWhitespace
-    }
-}
-
-fileprivate extension String {
-    var containsWhitespace : Bool {
-        return(rangeOfCharacter(from: .whitespacesAndNewlines) != nil)
+    public func isValidUsername(_ string: String) -> Bool {
+        return !string.trimmingCharacters(in: .whitespaces).isEmpty
     }
 }