SN-1938 Validate user id

Author: Inbal Tako

securenative/models/request_context.py

@@ -10,52 +10,3 @@ def __init__(self, cid=None, vid=None, fp=None, ip=None,
         self.headers = headers
         self.url = url
         self.method = method
-
-
-class RequestContextBuilder(object):
-
-    def __init__(self, cid=None, vid=None, fp=None, ip=None,
-                 remote_ip=None, headers=None, url=None, method=None):
-        self.cid = cid
-        self.vid = vid
-        self.fp = fp
-        self.ip = ip
-        self.remote_ip = remote_ip
-        self.headers = headers
-        self.url = url
-        self.method = method
-
-    def with_cid(self, cid):
-        self.cid = cid
-        return self
-
-    def with_vid(self, vid):
-        self.vid = vid
-        return self
-
-    def with_fp(self, fp):
-        self.fp = fp
-        return self
-
-    def with_ip(self, ip):
-        self.ip = ip
-        return self
-
-    def with_remote_ip(self, remote_ip):
-        self.remote_ip = remote_ip
-        return self
-
-    def with_headers(self, headers):
-        self.headers = headers
-        return self
-
-    def with_url(self, url):
-        self.url = url
-        return self
-
-    def with_method(self, method):
-        self.method = method
-        return self
-
-    def build(self):
-        return RequestContext(self.cid, self.vid, self.fp, self.ip, self.remote_ip, self.headers, self.url, self.method)

securenative/models/sdk_event.py

@@ -1,8 +1,8 @@
 import uuid
 
-from securenative.context.context_builder import ContextBuilder
+from securenative.context.securenative_context import SecureNativeContext
 from securenative.exceptions.securenative_invalid_options_exception import SecureNativeInvalidOptionsException
-from securenative.models.request_context import RequestContextBuilder
+from securenative.models.request_context import RequestContext
 from securenative.models.user_traits import UserTraits
 from securenative.utils.date_utils import DateUtils
 from securenative.utils.encryption_utils import EncryptionUtils
@@ -11,13 +11,13 @@
 class SDKEvent(object):
 
     def __init__(self, event_options, securenative_options):
-        if event_options.user_id is None or len(event_options.user_id) <=0 or event_options.user_id == "":
+        if event_options.user_id is None or len(event_options.user_id) <= 0 or event_options.user_id == "":
             raise SecureNativeInvalidOptionsException("Invalid event structure; User Id is missing")
 
         if event_options.context is not None:
             self.context = event_options.context
         else:
-            self.context = ContextBuilder.default_context_builder().build()
+            self.context = SecureNativeContext()
 
         if self.context.client_token:
             client_token = EncryptionUtils.decrypt(self.context.client_token, securenative_options.api_key)
@@ -38,16 +38,14 @@ def __init__(self, event_options, securenative_options):
         self.event_type = event_options.event if event_options.event else ""
         self.user_id = event_options.user_id
         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 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.request = RequestContext(cid=client_token.cid if client_token else "",
+                                      vid=client_token.vid if client_token else "",
+                                      fp=client_token.fp if client_token else "",
+                                      ip=self.context.ip if self.context.ip else "",
+                                      remote_ip=self.context.remote_ip if self.context.remote_ip else "",
+                                      headers=self.context.headers if self.context.headers else None,
+                                      url=self.context.url if self.context.url else "",
+                                      method=self.context.method if self.context.method else "")
 
         self.timestamp = DateUtils.to_timestamp(event_options.timestamp)
         self.properties = event_options.properties