Merge branch 'v2.5-export' into nightly

2020-10-02 20:45:11 -07:00
parent 14b98a32e0 34c9ede9c9
commit 739c977cd7
45 changed files with 6500 additions and 521 deletions
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -789,6 +789,12 @@ class Users(object):
        return session.friendly_name_to_username(result)

    def get_tokens(self, user_id=None):
+        tokens = {
+            'allow_guest': 0,
+            'user_token': '',
+            'server_token': ''
+        }
+
        if user_id:
            try:
                monitor_db = database.MonitorDatabase()
@@ -802,11 +808,11 @@ class Users(object):
                              }
                    return tokens
                else:
-                    return None
+                    return tokens
            except:
-                return None
+                return tokens

-        return None
+        return tokens

    def get_filters(self, user_id=None):
        if not user_id: