Token handling still not fixed but better

Author: Juliana Mashon

functions/authentication.py

@@ -12,8 +12,8 @@
 from .imports import *
 
 class Authentication():
-    def __init__(self):
-        self.token = None
+    def __init__(self, token):
+        self.token = token
         self.error = None
 
     def request_handling(self, response):

functions/basic_commands.py

@@ -13,9 +13,9 @@
 from .broker import BrokerConnect
 
 class BasicCommands():
-    def __init__(self):
-        self.token = None
-        self.broker = BrokerConnect()
+    def __init__(self, token):
+        self.token = token
+        self.broker = BrokerConnect(token)
 
     def wait(self, duration):
         # Tell bot to wait for some time

functions/broker.py

@@ -14,8 +14,8 @@
 from .imports import *
 
 class BrokerConnect():
-    def __init__(self):
-        self.token = None
+    def __init__(self, token):
+        self.token = token
         self.client = None
 
         self.last_message = None

functions/camera.py

@@ -11,9 +11,9 @@
 from .broker import BrokerConnect
 
 class Camera():
-    def __init__(self):
-        self.token = None
-        self.broker = BrokerConnect()
+    def __init__(self, token):
+        self.token = token
+        self.broker = BrokerConnect(token)
 
     def calibrate_camera(self):
         # Execute calibrate camera script

functions/information.py

@@ -18,11 +18,10 @@
 from .authentication import Authentication
 
 class Information():
-    def __init__(self):
-        self.token = None
-
-        self.broker = BrokerConnect()
-        self.auth = Authentication()
+    def __init__(self, token):
+        self.token = token
+        self.broker = BrokerConnect(token)
+        self.auth = Authentication(token)
 
     def get_info(self, endpoint, id=None):
         # Get endpoint info

functions/jobs.py

@@ -14,12 +14,11 @@
 from .resources import Resources
 
 class JobHandling():
-    def __init__(self):
-        self.token = None
-
-        self.broker = BrokerConnect()
-        self.info = Information()
-        self.resource = Resources()
+    def __init__(self, token):
+        self.token = token
+        self.broker = BrokerConnect(token)
+        self.info = Information(token)
+        self.resource = Resources(token)
 
     def get_job(self, job_str):
         # Get all or single job by name

functions/messages.py

@@ -13,11 +13,10 @@
 from .authentication import Authentication
 
 class MessageHandling():
-    def __init__(self):
-        self.token = None
-
-        self.broker = BrokerConnect()
-        self.auth = Authentication()
+    def __init__(self, token):
+        self.token = token
+        self.broker = BrokerConnect(token)
+        self.auth = Authentication(token)
 
     def log(self, message_str, type=None, channel=None):
         # Send new log message via API

functions/movements.py

@@ -15,11 +15,10 @@
 from .information import Information
 
 class MovementControls():
-    def __init__(self):
-        self.token = None
-
-        self.broker = BrokerConnect()
-        self.info = Information()
+    def __init__(self, token):
+        self.token = token
+        self.broker = BrokerConnect(token)
+        self.info = Information(token)
 
     def move(self, x, y, z):
         def axis_overwrite(axis, value):

functions/peripherals.py

@@ -14,11 +14,10 @@
 from .information import Information
 
 class Peripherals():
-    def __init__(self):
-        self.token = None
-
-        self.broker = BrokerConnect()
-        self.info = Information()
+    def __init__(self, token):
+        self.token = token
+        self.broker = BrokerConnect(token)
+        self.info = Information(token)
 
     def control_servo(self, pin, angle):
         # Change servo values

functions/resources.py

@@ -17,11 +17,10 @@
 from .information import Information
 
 class Resources():
-    def __init__(self):
-        self.token = None
-
-        self.broker = BrokerConnect()
-        self.info = Information()
+    def __init__(self, token):
+        self.token = token
+        self.broker = BrokerConnect(token)
+        self.info = Information(token)
 
     def mark_coord(self, x, y, z, property, mark_as): # TODO: Fix "label" and TODO: rename mark_point()
         # Mark xyz coordinate

functions/tools.py

@@ -14,11 +14,10 @@
 from .resources import Resources
 
 class ToolControls():
-    def __init__(self):
-        self.token = None
-
-        self.broker = BrokerConnect()
-        self.resource = Resources()
+    def __init__(self, token):
+        self.token = token
+        self.broker = BrokerConnect(token)
+        self.resource = Resources(token)
 
     # TODO: verify_tool() --> get broker message example
         # Verify tool exists at xyz coord

imports.py

@@ -18,14 +18,14 @@
 
 # Classes
 
-auth = Authentication()
-basic = BasicCommands()
-broker = BrokerConnect()
-camera = Camera()
-info = Information()
-job = JobHandling()
-message = MessageHandling()
-move = MovementControls()
-peripheral = Peripherals()
-resource = Resources()
-tool = ToolControls()
+# auth = Authentication()
+# basic = BasicCommands()
+# broker = BrokerConnect()
+# camera = Camera()
+# info = Information()
+# job = JobHandling()
+# message = MessageHandling()
+# move = MovementControls()
+# peripheral = Peripherals()
+# resource = Resources()
+# tool = ToolControls()