Changes to allow user to connect with previously received User authToken

sky-sharma · sky-sharma · commit 4d0cb37f889d · 2020-12-18T15:27:18.000-06:00
1. Modified AnonUser logout method to only logout if the user was truly
anonymous. Otherwise other user sessions get killed and token
immediately expires.
2. Modified User class init to accept password and authToken as
optional.
diff --git a/clearblade/Users.py b/clearblade/Users.py
@@ -54,12 +54,11 @@ def authenticate(self):
         cbLogs.info("Successfully authenticated!")
 
     def logout(self):
-        restcall.post(self.url + "/logout", headers=self.headers, sslVerify=self.system.sslVerify)
         if self in self.system.users:
             self.system.users.remove(self)
-        try:
-            cbLogs.info(self.credentials["email"], "has been logged out.")
-        except AttributeError:
+        # Only logging out Anonymous Users
+        if "email" not in self.credentials:
+            restcall.post(self.url + "/logout", headers=self.headers, sslVerify=self.system.sslVerify)
             cbLogs.info("Anonymous user has been logged out.")
 
     def checkAuth(self):
@@ -71,12 +70,16 @@ def checkAuth(self):
 
 
 class User(AnonUser):
-    def __init__(self, system, email, password):
+    def __init__(self, system, email, password="", authToken=""):
         super(User, self).__init__(system)
         self.credentials = {
             "email": email,
             "password": password
         }
+        self.token = authToken
+        self.headers.pop("ClearBlade-UserToken", None)
+        self.headers["ClearBlade-UserToken"] = self.token
+
 
 class ServiceUser(AnonUser):
     def __init__(self, system, email, token):
@@ -87,9 +90,9 @@ def __init__(self, system, email, token):
         self.token = token
         self.headers.pop("ClearBlade-UserToken", None)
         self.headers["ClearBlade-UserToken"] = self.token
-    
+
     def authenticate(self):
         cbLogs.warn("Method 'authenticate' is not applicable for service users")
 
     def logout(self):
-        cbLogs.warn("Method 'logout' is not applicable for service users")
+        cbLogs.warn("Method 'logout' is not applicable for service users")
