Fix event parsing

Author: Inbal Tako

VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

securenative/event_manager.py

@@ -132,20 +132,20 @@ def serialize(obj):
             "eventType": obj.event_type,
             "userId": obj.user_id,
             "userTraits": {
-                "name": obj.user_traits.name,
-                "email": obj.user_traits.email,
-                "phone": obj.user_traits.phone,
-                "createdAt": obj.user_traits.created_at,
+                "name": obj.user_traits.name if obj.user_traits else "",
+                "email": obj.user_traits.email if obj.user_traits else "",
+                "phone": obj.user_traits.phone if obj.user_traits else "",
+                "createdAt": obj.user_traits.created_at if obj.user_traits else "",
             },
             "request": {
-                "cid": obj.request.cid,
-                "vid": obj.request.vid,
-                "fp": obj.request.fp,
-                "ip": obj.request.ip,
-                "remoteIp": obj.request.remote_ip,
-                "method": obj.request.method,
-                "url": obj.request.url,
-                "headers": obj.request.headers
+                "cid": obj.request.cid if obj.request else "",
+                "vid": obj.request.vid if obj.request else "",
+                "fp": obj.request.fp if obj.request else "",
+                "ip": obj.request.ip if obj.request else "",
+                "remoteIp": obj.request.remote_ip if obj.request else "",
+                "method": obj.request.method if obj.request else "",
+                "url": obj.request.url if obj.request else "",
+                "headers": obj.request.headers if obj.request else None
             },
             "timestamp": obj.timestamp,
             "properties": obj.properties,

securenative/models/sdk_event.py

@@ -2,6 +2,7 @@
 
 from securenative.context.context_builder import ContextBuilder
 from securenative.models.request_context import RequestContextBuilder
+from securenative.models.user_traits import UserTraits
 from securenative.utils.date_utils import DateUtils
 from securenative.utils.encryption_utils import EncryptionUtils
 
@@ -14,21 +15,34 @@ def __init__(self, event_options, securenative_options):
         else:
             self.context = ContextBuilder.default_context_builder().build()
 
-        client_token = EncryptionUtils.decrypt(self.context.client_token, securenative_options.api_key)
+        if self.context.client_token:
+            client_token = EncryptionUtils.decrypt(self.context.client_token, securenative_options.api_key)
+        else:
+            client_token = None
+
+        if event_options.user_traits and isinstance(event_options.user_traits, dict):
+            user_traits = UserTraits(event_options.user_traits.get("name", ""),
+                                     event_options.user_traits.get("email", ""),
+                                     event_options.user_traits.get("phone", ""),
+                                     event_options.user_traits.get("created_at", ""))
+        elif event_options.user_traits:
+            user_traits = event_options.user_traits
+        else:
+            user_traits = UserTraits()
 
         self.rid = str(uuid.uuid4())
-        self.event_type = event_options.event.value
-        self.user_id = event_options.user_id
-        self.user_traits = event_options.user_traits
+        self.event_type = event_options.event if event_options.event else ""
+        self.user_id = event_options.user_id if event_options.user_id else ""
+        self.user_traits = user_traits
         self.request = RequestContextBuilder() \
             .with_cid(client_token.cid if client_token else "") \
             .with_vid(client_token.vid if client_token else "") \
             .with_fp(client_token.fp if client_token else "") \
-            .with_ip(self.context.ip) \
-            .with_remote_ip(self.context.remote_ip) \
-            .with_method(self.context.method) \
-            .with_url(self.context.url) \
-            .with_headers(self.context.headers) \
+            .with_ip(self.context.ip if self.context.ip else "") \
+            .with_remote_ip(self.context.remote_ip if self.context.remote_ip else "") \
+            .with_method(self.context.method if self.context.method else "") \
+            .with_url(self.context.url if self.context.url else "") \
+            .with_headers(self.context.headers if self.context.headers else None) \
             .build()
 
         self.timestamp = DateUtils.to_timestamp(event_options.timestamp)

securenative/utils/date_utils.py

@@ -5,6 +5,9 @@ class DateUtils(object):
 
     @staticmethod
     def to_timestamp(date):
-        if not date:
-            return datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%S.%f')[:-3] + 'Z'
-        return datetime.strptime(date, '%Y-%m-%dT%H:%M:%S.%f'[:-3] + 'Z')
+        try:
+            if not date or date is "":
+                return datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%S.%f')[:-3] + 'Z'
+            return datetime.strptime(date, '%Y-%m-%dT%H:%M:%S.%f'[:-3] + 'Z')
+        except Exception:
+            return ""

securenative/utils/version_utils.py

@@ -2,4 +2,4 @@ class VersionUtils(object):
 
     @staticmethod
     def get_version():
-        return "0.2.4"
+        return "0.2.5"