Merge pull request #163 from niscy-eudiw/main

Added extension function to check for String nullability and emptiness.
eu-digital-identity-wallet · Sep 9, 2024 · f5342d7 · f5342d7
2 parents 0049e34 + da3af25
commit f5342d7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Modules/logic-business/Sources/Extension/String+Extensions.swift b/Modules/logic-business/Sources/Extension/String+Extensions.swift
@@ -177,3 +177,11 @@ public extension String {
     return data.base64EncodedString()
   }
 }
+
+public extension String? {
+
+  func isNullOrEmpty() -> Bool {
+    return self == nil || self?.isEmpty == true
+  }
+
+}
diff --git a/Modules/logic-business/Sources/Validator/FormValidator.swift b/Modules/logic-business/Sources/Validator/FormValidator.swift
@@ -144,15 +144,15 @@ final class FormValidatorImpl: FormValidator {
       return false
     }
 
-    if shouldValidateHost && (components.host == nil || components.host?.isEmpty == true) {
+    if shouldValidateHost && components.host.isNullOrEmpty() {
       return false
     }
 
-    if shouldValidateSchema && (components.scheme == nil || components.scheme?.isEmpty == true) {
+    if shouldValidateSchema && components.scheme.isNullOrEmpty() {
       return false
     }
 
-    if shouldValidateQuery && (components.query == nil || components.query?.isEmpty == true) {
+    if shouldValidateQuery && components.query.isNullOrEmpty() {
       return false
     }