Merge pull request #150 from specklesystems/hotfix-authtoken

fix(auth): hotfix for serializing authTokens in blender file

bpy_speckle/convert/util.py

@@ -1,5 +1,5 @@
 import math
-from typing import Optional, Tuple
+from typing import Any, Optional, Tuple
 from bmesh.types import BMesh
 import bpy, struct, idprop
 
@@ -42,6 +42,16 @@ def to_argb_int(rgba_color: list[float]) -> int:
 
     return int.from_bytes(int_color, byteorder="big", signed=True)
 
+def set_custom_property(key: str, value: Any, blender_object: Object) -> None:
+    try:
+        #Expected c types: float, int, string, float[], int[]
+        blender_object[key] = value
+    except (OverflowError, TypeError) as ex:
+        print(f"Skipping setting property ({key}={value}) on {blender_object.name_full}, Reason: {ex}")
+    except Exception as ex:
+        #TODO: Log this as it's unexpected!!!
+        print(f"Skipping setting property ({key}={value}) on {blender_object.name_full}, Reason: {ex}")
+
 def add_custom_properties(speckle_object: Base, blender_object: Object):
     if blender_object is None:
         return
@@ -58,18 +68,18 @@ def add_custom_properties(speckle_object: Base, blender_object: Object):
             continue
 
         if isinstance(val, (int, str, float)):
-            blender_object[key] = val
+            set_custom_property(key, val, blender_object)
         elif key == "properties" and isinstance(val, Base):
             val["applicationId"] = None
             add_custom_properties(val, blender_object)
         elif isinstance(val, list):
             items = [item for item in val if not isinstance(item, Base)]
             if items:
-                blender_object[key] = items
+                set_custom_property(key, items, blender_object)
         elif isinstance(val,dict):
             for (k,v) in val.items():
                 if not isinstance(v, Base):
-                    blender_object[k] = v
+                    set_custom_property(k, v, blender_object)
 
 
 def render_material_to_native(speckle_mat: RenderMaterial) -> Material:

bpy_speckle/installer.py

@@ -17,7 +17,7 @@ def modules_path() -> Path:
 
     # set user modules path at beginning of paths for earlier hit
     if sys.path[1] != modules_path:
-        sys.path.insert(1, modules_path)
+        sys.path.insert(1, str(modules_path))
 
     return modules_path
 

bpy_speckle/operators/users.py

@@ -40,7 +40,6 @@ class LoadUsers(bpy.types.Operator):
             user.name = profile.userInfo.name
             user.email = profile.userInfo.email
             user.company = profile.userInfo.company or ""
-            user.authToken = profile.token
             try:
                 client = SpeckleClient(
                     host=profile.serverInfo.url,

bpy_speckle/properties/scene.py

@@ -73,7 +73,6 @@ class SpeckleUserObject(bpy.types.PropertyGroup):
     name: StringProperty(default="Speckle User")
     email: StringProperty(default="user@speckle.xyz")
     company: StringProperty(default="SpeckleSystems")
-    authToken: StringProperty(default="", subtype='PASSWORD')
     streams: CollectionProperty(type=SpeckleStreamObject)
     active_stream: IntProperty(default=0)