2025-12-01

scripts/addons/poliigon-addon-blender/operators/operator_user.py

@@ -20,13 +20,12 @@ import datetime
 from threading import Event
 import time
 
+import bpy
 from bpy.types import Operator
 from bpy.props import (BoolProperty, StringProperty)
-import bpy
 
 from ..modules.poliigon_core.api_remote_control import ApiJob
 from ..modules.poliigon_core.api_remote_control_params import CmdLoginMode
-from ..dialogs.dlg_login import ERR_CREDS_FORMAT
 from ..toolbox import get_context
 from .. import reporting
 
@@ -111,7 +110,8 @@ class POLIIGON_OT_user(Operator):
             email = None
             pwd = None
             login_elapsed_s = cTB.login_elapsed_s
-        elif self.mode == "login":
+            cTB.login_is_signup = False  # Flag to indicate login was clicked
+        elif self.mode == "login":  # Now only used in tests
             mode = CmdLoginMode.LOGIN_CREDENTIALS
             callback_cancel = None
             callback_done = callback_login_done
@@ -119,8 +119,6 @@ class POLIIGON_OT_user(Operator):
             pwd = bpy.context.window_manager.poliigon_props.vPassHide
             login_elapsed_s = cTB.login_elapsed_s
         elif self.mode == "logout":
-            bpy.ops.poliigon.poliigon_setting(mode="clear_email")
-            bpy.ops.poliigon.poliigon_setting(mode="clear_pass")
             mode = CmdLoginMode.LOGOUT
             callback_cancel = None
             callback_done = callback_logout_done
@@ -145,25 +143,16 @@ class POLIIGON_OT_user(Operator):
     def execute(self, context):
         global cTB
 
-        props = bpy.context.window_manager.poliigon_props
-
-        if self.mode == "login":
-            if "@" not in props.vEmail or len(props.vPassHide) < 6:
-                cTB.clear_user_invalidated()
-                cTB.last_login_error = ERR_CREDS_FORMAT
-                return {"CANCELLED"}
-
         self._login_determine_elapsed()
 
         if self.mode in ["login", "login_with_website", "logout"]:
             self._do_login(cTB)
         elif self.mode == "login_cancel":
             cTB.login_cancelled = True
-        elif self.mode == "login_switch_to_email":
+            # Reset the login_in_progress flag to return UI to normal state
+            cTB.login_in_progress = False
+            cTB.login_is_signup = False  # Reset signup flag when cancelling
             cTB.last_login_error = None
-            cTB.login_mode_browser = False
-        elif self.mode == "login_switch_to_browser":
-            cTB.login_mode_browser = True
         else:
             cTB.logger.error(
                 f"POLIIGON_OT_user UNKNOWN LOGIN COMMAND {self.mode}")