Merge pull request #277 from TelegramSam/feature/validate_additional

Added additional date formats to validation.
openwallet-foundation · Nov 22, 2019 · f71dacf · f71dacf
2 parents 46634cf + 2d1c70f
commit f71dacf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/aries_cloudagent/messaging/tests/test_valid.py b/aries_cloudagent/messaging/tests/test_valid.py
@@ -165,7 +165,6 @@ def test_indy_date(self):
             "2020-01-01",
             "2020-01-01:00:00:00Z",
             "2020.01.01 00:00:00Z",
-            "2020-01-01T00:00:00",
             "2020-01-01T00:00.123456+00:00",
             "2020-01-01T00:00:00.123456+0:00"
         ]
@@ -175,6 +174,8 @@ def test_indy_date(self):
 
         INDY_ISO8601_DATETIME["validate"]("2020-01-01 00:00:00Z")
         INDY_ISO8601_DATETIME["validate"]("2020-01-01T00:00:00Z")
+        INDY_ISO8601_DATETIME["validate"]("2020-01-01T00:00:00")
+        INDY_ISO8601_DATETIME["validate"]("2020-01-01 00:00:00")
         INDY_ISO8601_DATETIME["validate"]("2020-01-01 00:00:00+00:00")
         INDY_ISO8601_DATETIME["validate"]("2020-01-01 00:00:00-00:00")
         INDY_ISO8601_DATETIME["validate"]("2020-01-01 00:00-00:00")

diff --git a/aries_cloudagent/messaging/valid.py b/aries_cloudagent/messaging/valid.py
@@ -144,7 +144,7 @@ def __init__(self):
 
         super().__init__(
             r"^\d{4}-\d\d-\d\d[T ]\d\d:\d\d"
-            r"(?:\:(?:\d\d(?:\.\d{1,6})?))?(?:[+-]\d\d:?\d\d|Z)$",
+            r"(?:\:(?:\d\d(?:\.\d{1,6})?))?(?:[+-]\d\d:?\d\d|Z|)$",
             error="Value {input} is not a date in valid format."
         )