SN-1938 Validate user id

Inbal Tako · Inbal Tako · commit a2fbadce9fbb · 2020-08-24T13:53:09.000+03:00
diff --git a/README.md b/README.md
@@ -64,9 +64,12 @@ securenative = SecureNative.init_with_api_key("YOUR_API_KEY")
 ### Option 3: Initialize via ConfigurationBuilder
 ```python
 from securenative.securenative import SecureNative
+from securenative.config.securenative_options import SecureNativeOptions
 
 
-securenative = SecureNative.init_with_options(SecureNative.config_builder().with_api_key("API_KEY").with_max_events(10).with_log_level("ERROR").build())
+options = SecureNativeOptions(api_key="YOUR_API_KEY", auto_send=True, interval=10,
+                                      api_url="https://api.securenative-stg.com/collector/api/v1")
+securenative = SecureNative.init_with_options(options)
 ```
 
 ## Getting SecureNative instance
diff --git a/securenative/context/securenative_context.py b/securenative/context/securenative_context.py
@@ -30,4 +30,4 @@ def from_http_request(request):
 
         return SecureNativeContext(client_token, RequestUtils.get_client_ip_from_request(request),
                                    RequestUtils.get_remote_ip_from_request(request), headers, request.url,
-                                   request.method, request.body)
+                                   request.method, None)
diff --git a/tests/api_manager_test.py b/tests/api_manager_test.py
@@ -3,7 +3,7 @@
 import responses
 
 from securenative.api_manager import ApiManager
-from securenative.config.configuration_manager import ConfigurationManager
+from securenative.config.securenative_options import SecureNativeOptions
 from securenative.context.securenative_context import SecureNativeContext
 from securenative.enums.event_types import EventTypes
 from securenative.enums.risk_level import RiskLevel
@@ -28,11 +28,8 @@ def setUp(self):
 
     @responses.activate
     def test_track_event(self):
-        options = ConfigurationManager.config_builder(). \
-            with_api_key("YOUR_API_KEY"). \
-            with_auto_send(True). \
-            with_interval(10). \
-            with_api_url("https://api.securenative-stg.com/collector/api/v1")
+        options = SecureNativeOptions(api_key="YOUR_API_KEY", auto_send=True, interval=10,
+                                      api_url="https://api.securenative-stg.com/collector/api/v1")
 
         expected = "{\"eventType\":\"sn.user.login\",\"userId\":\"USER_ID\",\"userTraits\":{" \
                    "\"name\":\"USER_NAME\",\"email\":\"USER_EMAIL\",\"createdAt\":null},\"request\":{" \
@@ -54,11 +51,8 @@ def test_track_event(self):
 
     @responses.activate
     def test_securenative_invalid_options_exception(self):
-        options = ConfigurationManager.config_builder(). \
-            with_api_key("YOUR_API_KEY"). \
-            with_auto_send(True). \
-            with_interval(10). \
-            with_api_url("https://api.securenative-stg.com/collector/api/v1")
+        options = SecureNativeOptions(api_key="YOUR_API_KEY", auto_send=True, interval=10,
+                                      api_url="https://api.securenative-stg.com/collector/api/v1")
 
         properties = {}
         for i in range(1, 12):
@@ -78,9 +72,8 @@ def test_securenative_invalid_options_exception(self):
 
     @responses.activate
     def test_verify_event(self):
-        options = ConfigurationManager.config_builder(). \
-            with_api_key("YOUR_API_KEY"). \
-            with_api_url("https://api.securenative-stg.com/collector/api/v1")
+        options = SecureNativeOptions(api_key="YOUR_API_KEY",
+                                      api_url="https://api.securenative-stg.com/collector/api/v1")
 
         responses.add(responses.POST, "https://api.securenative-stg.com/collector/api/v1/verify",
                       json={
diff --git a/tests/event_manager_test.py b/tests/event_manager_test.py
@@ -4,7 +4,7 @@
 
 import responses
 
-from securenative.config.configuration_manager import ConfigurationManager
+from securenative.config.securenative_options import SecureNativeOptions
 from securenative.event_manager import EventManager
 from securenative.models.request_context import RequestContext
 from securenative.models.user_traits import UserTraits
@@ -29,9 +29,8 @@ def setUp(self):
 
     @responses.activate
     def test_should_successfully_send_sync_event_with_status_code_200(self):
-        options = ConfigurationManager.config_builder(). \
-            with_api_key("YOUR_API_KEY"). \
-            with_api_url("https://api.securenative-stg.com/collector/api/v1")
+        options = SecureNativeOptions(api_key="YOUR_API_KEY",
+                                      api_url="https://api.securenative-stg.com/collector/api/v1")
 
         res_body = "{\"data\": true}"
         responses.add(responses.POST, "https://api.securenative-stg.com/collector/api/v1/some-path/to-api",
@@ -43,9 +42,8 @@ def test_should_successfully_send_sync_event_with_status_code_200(self):
 
     @responses.activate
     def test_should_send_sync_event_and_fail_when_status_code_401(self):
-        options = ConfigurationManager.config_builder(). \
-            with_api_key("YOUR_API_KEY"). \
-            with_api_url("https://api.securenative-stg.com/collector/api/v1")
+        options = SecureNativeOptions(api_key="YOUR_API_KEY",
+                                      api_url="https://api.securenative-stg.com/collector/api/v1")
 
         responses.add(responses.POST, "https://api.securenative-stg.com/collector/api/v1/some-path/to-api",
                       json={}, status=401)
@@ -57,9 +55,8 @@ def test_should_send_sync_event_and_fail_when_status_code_401(self):
 
     @responses.activate
     def test_should_send_sync_event_and_fail_when_status_code_500(self):
-        options = ConfigurationManager.config_builder(). \
-            with_api_key("YOUR_API_KEY"). \
-            with_api_url("https://api.securenative-stg.com/collector/api/v1")
+        options = SecureNativeOptions(api_key="YOUR_API_KEY",
+                                      api_url="https://api.securenative-stg.com/collector/api/v1")
 
         responses.add(responses.POST, "https://api.securenative-stg.com/collector/api/v1/some-path/to-api",
                       json={}, status=500)
diff --git a/tests/securenative_http_client_test.py b/tests/securenative_http_client_test.py
@@ -2,17 +2,16 @@
 
 import responses
 
-from securenative.config.configuration_manager import ConfigurationManager
+from securenative.config.securenative_options import SecureNativeOptions
 from securenative.http.securenative_http_client import SecureNativeHttpClient
 
 
 class SecureNativeHttpClientTest(unittest.TestCase):
 
     @responses.activate
     def test_should_make_simple_post_call(self):
-        options = ConfigurationManager.config_builder(). \
-            with_api_key("YOUR_API_KEY").\
-            with_api_url("https://api.securenative-stg.com/collector/api/v1")
+        options = SecureNativeOptions(api_key="YOUR_API_KEY", auto_send=True, interval=10,
+                                      api_url="https://api.securenative-stg.com/collector/api/v1")
 
         responses.add(responses.POST, "https://api.securenative-stg.com/collector/api/v1/track",
                       json={"event": "SOME_EVENT_NAME"}, status=200)
diff --git a/tests/securenative_test.py b/tests/securenative_test.py
@@ -1,6 +1,6 @@
 import unittest
 
-from securenative.config.configuration_manager import ConfigurationManager
+from securenative.config.securenative_options import SecureNativeOptions
 from securenative.enums.failover_strategy import FailOverStrategy
 from securenative.exceptions.securenative_config_exception import SecureNativeConfigException
 from securenative.exceptions.securenative_sdk_Illegal_state_exception import SecureNativeSDKIllegalStateException
@@ -16,7 +16,7 @@ def test_get_sdk_instance_without_init_throws(self):
 
     def test_init_sdk_without_api_key_should_throw(self):
         with self.assertRaises(SecureNativeSDKException):
-            SecureNative.init_with_options(ConfigurationManager.config_builder())
+            SecureNative.init_with_options(SecureNativeOptions())
 
     def test_init_sdk_with_empty_api_key_should_throw(self):
         with self.assertRaises(SecureNativeConfigException):
@@ -52,10 +52,9 @@ def test_init_sdk_with_api_key_and_get_instance(self):
 
     def test_init_sdk_with_builder(self):
         SecureNative._flush()
-        securenative = SecureNative.init_with_options(SecureNative.config_builder().
-                                                      with_api_key("API_KEY").
-                                                      with_max_events(10).
-                                                      with_log_level("ERROR"))
+        options = SecureNativeOptions(api_key="YOUR_API_KEY", auto_send=True, interval=10,
+                                      api_url="https://api.securenative-stg.com/collector/api/v1")
+        securenative = SecureNative.init_with_options(options)
 
         options = securenative.get_options()
         self.assertEqual(options.api_key, "API_KEY")
