Merge pull request #52 from launchdarkly/dr/blankUserKey

Allow blank user key when evaluating flags. Fix redis all()

Author: drichelson

ldclient/client.py

@@ -180,14 +180,14 @@ def _send_event(self, event):
 
     def track(self, event_name, user, data=None):
         self._sanitize_user(user)
-        if user.get('key', "") == "":
-            log.warn("Missing or empty User key when calling track().")
+        if user is None or user.get('key') is None:
+            log.warn("Missing user or user key when calling track().")
         self._send_event({'kind': 'custom', 'key': event_name, 'user': user, 'data': data})
 
     def identify(self, user):
         self._sanitize_user(user)
-        if user.get('key', "") == "":
-            log.warn("Missing or empty User key when calling identify().")
+        if user is None or user.get('key') is None:
+            log.warn("Missing user or user key when calling identify().")
         self._send_event({'kind': 'identify', 'key': user.get('key'), 'user': user})
 
     def is_offline(self):
@@ -222,11 +222,14 @@ def send_event(value, version=None):
             send_event(default)
             return default
 
-        if user.get('key', "") == "":
-            log.warn("Missing or empty User key when evaluating Feature Flag key: " + key + ". Returning default.")
+        if user is None or user.get('key') is None:
+            log.warn("Missing user or user key when evaluating Feature Flag key: " + key + ". Returning default.")
             send_event(default)
             return default
 
+        if user.get('key', "") == "":
+            log.warn("User key is blank. Flag evaluation will proceed, but the user will not be stored in LaunchDarkly.")
+
         flag = self._store.get(key)
         if not flag:
             log.warn("Feature Flag key: " + key + " not found in Feature Store. Returning default.")
@@ -254,14 +257,14 @@ def all_flags(self, user):
             log.warn("all_flags() called before client has finished initializing! Returning None")
             return None
 
-        if user.get('key', "") == "":
-            log.warn("Missing or empty User key when calling all_flags(). Returning None.")
+        if user is None or user.get('key') is None:
+            log.warn("User or user key is None when calling all_flags(). Returning None.")
             return None
 
         return {k: evaluate(v, user, self._store)[0] for k, v in self._store.all().items() or {}}
 
     def secure_mode_hash(self, user):
-        if user.get('key', "") == "":
+        if user.get('key') is None:
             return ""
         return hmac.new(self._sdk_key.encode(), user.get('key').encode(), hashlib.sha256).hexdigest()
 

ldclient/redis_feature_store.py

@@ -1,4 +1,5 @@
 import json
+from pprint import pprint
 
 import redis
 
@@ -43,8 +44,12 @@ def init(self, features):
     def all(self):
         r = redis.Redis(connection_pool=self._pool)
         all_features = r.hgetall(self._features_key)
+        if all_features is None or all_features is "":
+            log.warn("RedisFeatureStore: call to get all flags returned no results. Returning None.")
+            return None
+
         results = {}
-        for f_json in all_features:
+        for k, f_json in all_features.items() or {}:
             f = json.loads(f_json.decode('utf-8'))
             if 'deleted' in f and f['deleted'] is False:
                 results[f['key']] = f