From 0daaa41adafdfbfed10c0dca27ef5eef008441da Mon Sep 17 00:00:00 2001
From: zsloan
Date: Fri, 26 Mar 2021 19:41:25 +0000
Subject: Added try/except to deal with the possibility of user_id being stored
 in Redis as both string and bytes

---
 wqflask/wqflask/user_session.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/user_session.py b/wqflask/wqflask/user_session.py
index d6f3b3fc..c5a577df 100644
--- a/wqflask/wqflask/user_session.py
+++ b/wqflask/wqflask/user_session.py
@@ -129,7 +129,10 @@ class UserSession(object):
         if b'user_id' not in self.record:
             self.record[b'user_id'] = str(uuid.uuid4())
 
-        return self.record[b'user_id']
+        try:
+            return self.record[b'user_id'].decode("utf-8")
+        except:
+            return self.record[b'user_id']
 
     @property
     def redis_user_id(self):
-- 
cgit v1.2.3