added some changes based on service account's desired behavior

clearbladeplatform · clearbladeplatform · commit 41e06d35340b · 2020-03-10T17:11:24.000-05:00
diff --git a/clearblade/ClearBladeCore.py b/clearblade/ClearBladeCore.py
@@ -53,9 +53,12 @@ def registerUser(self, authenticatedUser, email, password):
 
     def ServiceUser(self, email, token):
         user = Users.ServiceUser(self, email, token)
-        user.serviceAuthCheck()
-        return user
-        
+        if user.checkAuth():
+            return user
+        else:
+            cbLogs.error("Service User ", email, "failed to Auth")
+            exit(-1)
+
     ###############
     #   DEVICES   #
     ###############
diff --git a/clearblade/Users.py b/clearblade/Users.py
@@ -82,17 +82,14 @@ class ServiceUser(AnonUser):
     def __init__(self, system, email, token):
         super(ServiceUser, self).__init__(system)
         self.credentials = {
-            "email": email,
-            "token": token
+            "email": email
         }
-    
-    def serviceAuthCheck(self):
+        self.token = token
         self.headers.pop("ClearBlade-UserToken", None)
-        self.token = self.credentials["token"]
         self.headers["ClearBlade-UserToken"] = self.token
-        if not AnonUser.checkAuth(self):
-            cbLogs.error("Service Auth check failed for", self.credentials["email"])
-            return
-        if self not in self.system.users:
-            self.system.users.append(self)
-        cbLogs.info("Successfully authenticated!")
+    
+    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")
