sticker-convert 2.13.3.0__py3-none-any.whl → 2.15.0.0__py3-none-any.whl

sticker_convert/gui_components/windows/kakao_get_auth_window.py

@@ -1,16 +1,16 @@
 #!/usr/bin/env python3
 import platform
-from functools import partial
 from threading import Thread
 from typing import Any, Optional
 
 from ttkbootstrap import Button, Entry, Frame, Label, LabelFrame  # type: ignore
 
+from sticker_convert.auth.auth_kakao_android_login import AuthKakaoAndroidLogin
+from sticker_convert.auth.auth_kakao_desktop_login import AuthKakaoDesktopLogin
+from sticker_convert.auth.auth_kakao_desktop_memdump import AuthKakaoDesktopMemdump
 from sticker_convert.gui_components.frames.right_clicker import RightClicker
 from sticker_convert.gui_components.gui_utils import GUIUtils
 from sticker_convert.gui_components.windows.base_window import BaseWindow
-from sticker_convert.utils.auth.get_kakao_auth import GetKakaoAuth
-from sticker_convert.utils.auth.get_kakao_desktop_auth import GetKakaoDesktopAuth
 
 
 class KakaoGetAuthWindow(BaseWindow):
@@ -19,75 +19,76 @@ class KakaoGetAuthWindow(BaseWindow):
 
         self.title("Get Kakao auth_token")
 
-        self.cb_msg_block_kakao = partial(self.gui.cb_msg_block, parent=self)
-        self.cb_ask_str_kakao = partial(self.gui.cb_ask_str, parent=self)
-
-        self.frame_from_desktop = LabelFrame(
-            self.scrollable_frame, text="Method 1: From KakaoTalk Desktop"
+        self.frame_desktop_memdump = LabelFrame(
+            self.scrollable_frame, text="Method 1: KakaoTalk Desktop memdump"
+        )
+        self.frame_desktop_login = LabelFrame(
+            self.scrollable_frame, text="Method 2: Simulate Desktop login"
         )
-        self.frame_simulate_login = LabelFrame(
-            self.scrollable_frame, text="Method 2: Simulate login"
+        self.frame_android_login = LabelFrame(
+            self.scrollable_frame, text="Method 3: Simulate Android login"
         )
         self.frame_login_btn = Frame(self.scrollable_frame)
 
-        self.frame_from_desktop.grid(column=0, row=0, sticky="news", padx=3, pady=3)
-        self.frame_simulate_login.grid(column=0, row=1, sticky="news", padx=3, pady=3)
+        self.frame_desktop_memdump.grid(column=0, row=0, sticky="news", padx=3, pady=3)
+        self.frame_desktop_login.grid(column=0, row=1, sticky="news", padx=3, pady=3)
+        self.frame_android_login.grid(column=0, row=2, sticky="news", padx=3, pady=3)
 
         # Method 1 frame
         self.explanation1_1_lbl = Label(
-            self.frame_from_desktop,
+            self.frame_desktop_memdump,
             text="This will get Kakao auth_token from Kakao Desktop",
             justify="left",
             anchor="w",
         )
         self.explanation1_2_lbl = Label(
-            self.frame_from_desktop,
+            self.frame_desktop_memdump,
             text="Download Kakao Desktop, login and press 'Get auth_token'",
             justify="left",
             anchor="w",
         )
         self.explanation1_3_lbl = Label(
-            self.frame_from_desktop,
+            self.frame_desktop_memdump,
             text="This can take about a minute.",
             justify="left",
             anchor="w",
         )
         if platform.system() != "Darwin":
             self.explanation1_4_lbl = Label(
-                self.frame_from_desktop,
+                self.frame_desktop_memdump,
                 text="Note: This will download ProcDump and read memory of KakaoTalk Desktop",
                 justify="left",
                 anchor="w",
             )
         else:
             self.explanation1_4_lbl = Label(
-                self.frame_from_desktop,
+                self.frame_desktop_memdump,
                 text="Note: This will read memory of KakaoTalk Desktop",
                 justify="left",
                 anchor="w",
             )
         self.kakao_bin_path_lbl = Label(
-            self.frame_from_desktop,
+            self.frame_desktop_memdump,
             text="Kakao app path (Optional):",
             justify="left",
             anchor="w",
         )
         self.kakao_bin_path_entry = Entry(
-            self.frame_from_desktop,
+            self.frame_desktop_memdump,
             textvariable=self.gui.kakao_bin_path_var,
             width=30,
         )
         self.launch_desktop_btn = Button(
-            self.frame_from_desktop,
+            self.frame_desktop_memdump,
             text="Launch Desktop app",
             command=self.cb_launch_desktop,
             width=24,
             bootstyle="secondary",  # type: ignore
         )
         self.get_auth_desktop_btn = Button(
-            self.frame_from_desktop,
+            self.frame_desktop_memdump,
             text="Get auth_token",
-            command=self.cb_from_desktop,
+            command=self.cb_get_auth_desktop_memdump,
             width=24,
         )
 
@@ -110,128 +111,294 @@ class KakaoGetAuthWindow(BaseWindow):
 
         # Method 2 frame
         self.explanation2_1_lbl = Label(
-            self.frame_simulate_login,
-            text="This will simulate login to Android Kakao app",
+            self.frame_desktop_login,
+            text="This will simulate login to Desktop Kakao app",
             justify="left",
             anchor="w",
         )
         self.explanation2_2_lbl = Label(
-            self.frame_simulate_login,
-            text="You will send / receive verification code via SMS",
+            self.frame_desktop_login,
+            text="You may receive verification code from Kakao app on phone",
             justify="left",
             anchor="w",
         )
         self.explanation2_3_lbl = Label(
-            self.frame_simulate_login,
+            self.frame_desktop_login,
+            text="It is not necessary to download Desktop Kakao app",
+            justify="left",
+            anchor="w",
+        )
+
+        self.kakao_username_help_btn2 = Button(
+            self.frame_desktop_login,
+            text="?",
+            width=1,
+            command=lambda: self.gui.cb.put(
+                (
+                    "msg_block",
+                    None,
+                    {
+                        "message": self.gui.help["cred"]["kakao_username"],
+                        "parent": self,
+                    },
+                )
+            ),
+            bootstyle="secondary",  # type: ignore
+        )
+        self.kakao_username_lbl2 = Label(
+            self.frame_desktop_login,
+            text="Username",
+            width=18,
+            justify="left",
+            anchor="w",
+        )
+        self.kakao_username_entry2 = Entry(
+            self.frame_desktop_login,
+            textvariable=self.gui.kakao_username_var,
+            width=30,
+        )
+        self.kakao_username_entry2.bind("<Button-3><ButtonRelease-3>", RightClicker)
+
+        self.kakao_password_help_btn2 = Button(
+            self.frame_desktop_login,
+            text="?",
+            width=1,
+            command=lambda: self.gui.cb.put(
+                (
+                    "msg_block",
+                    None,
+                    {
+                        "message": self.gui.help["cred"]["kakao_password"],
+                        "parent": self,
+                    },
+                )
+            ),
+            bootstyle="secondary",  # type: ignore
+        )
+        self.kakao_password_lbl2 = Label(
+            self.frame_desktop_login, text="Password", justify="left", anchor="w"
+        )
+        self.kakao_password_entry2 = Entry(
+            self.frame_desktop_login,
+            textvariable=self.gui.kakao_password_var,
+            width=30,
+        )
+        self.kakao_password_entry2.bind("<Button-3><ButtonRelease-3>", RightClicker)
+
+        self.kakao_device_uuid_help_btn = Button(
+            self.frame_desktop_login,
+            text="?",
+            width=1,
+            command=lambda: self.gui.cb.put(
+                (
+                    "msg_block",
+                    None,
+                    {
+                        "message": self.gui.help["cred"]["kakao_device_uuid"],
+                        "parent": self,
+                    },
+                )
+            ),
+            bootstyle="secondary",  # type: ignore
+        )
+        self.kakao_device_uuid_lbl = Label(
+            self.frame_desktop_login,
+            text="Device UUID (Optional)",
+            justify="left",
+            anchor="w",
+        )
+        self.kakao_device_uuid_entry = Entry(
+            self.frame_desktop_login,
+            textvariable=self.gui.kakao_device_uuid_var,
+            width=30,
+        )
+        self.kakao_device_uuid_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
+
+        self.login_btn2 = Button(
+            self.frame_desktop_login,
+            text="Login and get auth_token",
+            command=self.cb_get_auth_desktop_login,
+            width=24,
+        )
+
+        self.explanation2_1_lbl.grid(
+            column=0, row=0, columnspan=3, sticky="w", padx=3, pady=3
+        )
+        self.explanation2_2_lbl.grid(
+            column=0, row=1, columnspan=3, sticky="w", padx=3, pady=3
+        )
+        self.explanation2_3_lbl.grid(
+            column=0, row=2, columnspan=3, sticky="w", padx=3, pady=3
+        )
+
+        self.kakao_username_help_btn2.grid(column=0, row=3, sticky="w", padx=3, pady=3)
+        self.kakao_username_lbl2.grid(column=1, row=3, sticky="w", padx=3, pady=3)
+        self.kakao_username_entry2.grid(column=2, row=3, sticky="w", padx=3, pady=3)
+
+        self.kakao_password_help_btn2.grid(column=0, row=4, sticky="w", padx=3, pady=3)
+        self.kakao_password_lbl2.grid(column=1, row=4, sticky="w", padx=3, pady=3)
+        self.kakao_password_entry2.grid(column=2, row=4, sticky="w", padx=3, pady=3)
+
+        self.kakao_device_uuid_help_btn.grid(
+            column=0, row=5, sticky="w", padx=3, pady=3
+        )
+        self.kakao_device_uuid_lbl.grid(column=1, row=5, sticky="w", padx=3, pady=3)
+        self.kakao_device_uuid_entry.grid(column=2, row=5, sticky="w", padx=3, pady=3)
+
+        self.login_btn2.grid(column=0, row=6, columnspan=3, padx=3, pady=3)
+
+        # Method 3 frame
+        self.explanation3_1_lbl = Label(
+            self.frame_android_login,
+            text="This will simulate login to Android Kakao app",
+            justify="left",
+            anchor="w",
+        )
+        self.explanation3_2_lbl = Label(
+            self.frame_android_login,
+            text="You will send / receive verification code via SMS",
+            justify="left",
+            anchor="w",
+        )
+        self.explanation3_3_lbl = Label(
+            self.frame_android_login,
             text="You will be logged out of existing device",
             justify="left",
             anchor="w",
         )
 
-        self.kakao_username_help_btn = Button(
-            self.frame_simulate_login,
+        self.kakao_username_help_btn3 = Button(
+            self.frame_android_login,
             text="?",
             width=1,
-            command=lambda: self.cb_msg_block_kakao(
-                self.gui.help["cred"]["kakao_username"]
+            command=lambda: self.gui.cb.put(
+                (
+                    "msg_block",
+                    None,
+                    {
+                        "message": self.gui.help["cred"]["kakao_username"],
+                        "parent": self,
+                    },
+                )
             ),
             bootstyle="secondary",  # type: ignore
         )
-        self.kakao_username_lbl = Label(
-            self.frame_simulate_login,
+        self.kakao_username_lbl3 = Label(
+            self.frame_android_login,
             text="Username",
             width=18,
             justify="left",
             anchor="w",
         )
-        self.kakao_username_entry = Entry(
-            self.frame_simulate_login,
+        self.kakao_username_entry3 = Entry(
+            self.frame_android_login,
             textvariable=self.gui.kakao_username_var,
             width=30,
         )
-        self.kakao_username_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
+        self.kakao_username_entry3.bind("<Button-3><ButtonRelease-3>", RightClicker)
 
-        self.kakao_password_help_btn = Button(
-            self.frame_simulate_login,
+        self.kakao_password_help_btn3 = Button(
+            self.frame_android_login,
             text="?",
             width=1,
-            command=lambda: self.cb_msg_block_kakao(
-                self.gui.help["cred"]["kakao_password"]
+            command=lambda: self.gui.cb.put(
+                (
+                    "msg_block",
+                    None,
+                    {
+                        "message": self.gui.help["cred"]["kakao_password"],
+                        "parent": self,
+                    },
+                )
             ),
             bootstyle="secondary",  # type: ignore
         )
-        self.kakao_password_lbl = Label(
-            self.frame_simulate_login, text="Password", justify="left", anchor="w"
+        self.kakao_password_lbl3 = Label(
+            self.frame_android_login, text="Password", justify="left", anchor="w"
         )
-        self.kakao_password_entry = Entry(
-            self.frame_simulate_login,
+        self.kakao_password_entry3 = Entry(
+            self.frame_android_login,
             textvariable=self.gui.kakao_password_var,
             width=30,
         )
-        self.kakao_password_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
+        self.kakao_password_entry3.bind("<Button-3><ButtonRelease-3>", RightClicker)
 
         self.kakao_country_code_help_btn = Button(
-            self.frame_simulate_login,
+            self.frame_android_login,
             text="?",
             width=1,
-            command=lambda: self.cb_msg_block_kakao(
-                self.gui.help["cred"]["kakao_country_code"]
+            command=lambda: self.gui.cb.put(
+                (
+                    "msg_block",
+                    None,
+                    {
+                        "message": self.gui.help["cred"]["kakao_country_code"],
+                        "parent": self,
+                    },
+                )
             ),
             bootstyle="secondary",  # type: ignore
         )
         self.kakao_country_code_lbl = Label(
-            self.frame_simulate_login, text="Country code", justify="left", anchor="w"
+            self.frame_android_login, text="Country code", justify="left", anchor="w"
         )
         self.kakao_country_code_entry = Entry(
-            self.frame_simulate_login,
+            self.frame_android_login,
             textvariable=self.gui.kakao_country_code_var,
             width=30,
         )
         self.kakao_country_code_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
 
         self.kakao_phone_number_help_btn = Button(
-            self.frame_simulate_login,
+            self.frame_android_login,
             text="?",
             width=1,
-            command=lambda: self.cb_msg_block_kakao(
-                self.gui.help["cred"]["kakao_phone_number"]
+            command=lambda: self.gui.cb.put(
+                (
+                    "msg_block",
+                    None,
+                    {
+                        "message": self.gui.help["cred"]["kakao_phone_number"],
+                        "parent": self,
+                    },
+                )
             ),
             bootstyle="secondary",  # type: ignore
         )
         self.kakao_phone_number_lbl = Label(
-            self.frame_simulate_login, text="Phone number", justify="left", anchor="w"
+            self.frame_android_login, text="Phone number", justify="left", anchor="w"
         )
         self.kakao_phone_number_entry = Entry(
-            self.frame_simulate_login,
+            self.frame_android_login,
             textvariable=self.gui.kakao_phone_number_var,
             width=30,
         )
         self.kakao_phone_number_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
 
-        self.login_btn = Button(
-            self.frame_simulate_login,
+        self.login_btn3 = Button(
+            self.frame_android_login,
             text="Login and get auth_token",
-            command=self.cb_simulate_login,
+            command=self.cb_get_auth_android_login,
             width=24,
         )
 
-        self.explanation2_1_lbl.grid(
+        self.explanation3_1_lbl.grid(
             column=0, row=0, columnspan=3, sticky="w", padx=3, pady=3
         )
-        self.explanation2_2_lbl.grid(
+        self.explanation3_2_lbl.grid(
             column=0, row=1, columnspan=3, sticky="w", padx=3, pady=3
         )
-        self.explanation2_3_lbl.grid(
+        self.explanation3_3_lbl.grid(
             column=0, row=2, columnspan=3, sticky="w", padx=3, pady=3
         )
 
-        self.kakao_username_help_btn.grid(column=0, row=3, sticky="w", padx=3, pady=3)
-        self.kakao_username_lbl.grid(column=1, row=3, sticky="w", padx=3, pady=3)
-        self.kakao_username_entry.grid(column=2, row=3, sticky="w", padx=3, pady=3)
+        self.kakao_username_help_btn3.grid(column=0, row=3, sticky="w", padx=3, pady=3)
+        self.kakao_username_lbl3.grid(column=1, row=3, sticky="w", padx=3, pady=3)
+        self.kakao_username_entry3.grid(column=2, row=3, sticky="w", padx=3, pady=3)
 
-        self.kakao_password_help_btn.grid(column=0, row=4, sticky="w", padx=3, pady=3)
-        self.kakao_password_lbl.grid(column=1, row=4, sticky="w", padx=3, pady=3)
-        self.kakao_password_entry.grid(column=2, row=4, sticky="w", padx=3, pady=3)
+        self.kakao_password_help_btn3.grid(column=0, row=4, sticky="w", padx=3, pady=3)
+        self.kakao_password_lbl3.grid(column=1, row=4, sticky="w", padx=3, pady=3)
+        self.kakao_password_entry3.grid(column=2, row=4, sticky="w", padx=3, pady=3)
 
         self.kakao_country_code_help_btn.grid(
             column=0, row=5, sticky="w", padx=3, pady=3
@@ -244,23 +411,18 @@ class KakaoGetAuthWindow(BaseWindow):
         )
         self.kakao_phone_number_lbl.grid(column=1, row=6, sticky="w", padx=3, pady=3)
         self.kakao_phone_number_entry.grid(column=2, row=6, sticky="w", padx=3, pady=3)
-        self.login_btn.grid(column=0, row=7, columnspan=3, padx=3, pady=3)
+        self.login_btn3.grid(column=0, row=7, columnspan=3, padx=3, pady=3)
 
         GUIUtils.finalize_window(self)
 
-    def cb_simulate_login(self) -> None:
-        Thread(target=self.cb_simulate_login_thread, daemon=True).start()
+    def cb_get_auth_android_login(self) -> None:
+        Thread(target=self.cb_get_auth_android_login_thread, daemon=True).start()
 
-    def cb_simulate_login_thread(self, *_: Any) -> None:
+    def cb_get_auth_desktop_login_thread(self, *_: Any) -> None:
         self.gui.save_creds()
-        m = GetKakaoAuth(
-            opt_cred=self.gui.get_opt_cred(),
-            cb_msg=self.gui.cb_msg,
-            cb_msg_block=self.cb_msg_block_kakao,
-            cb_ask_str=self.cb_ask_str_kakao,
-        )
+        m = AuthKakaoDesktopLogin(self.gui.get_opt_cred(), self.gui.cb)
 
-        auth_token = m.get_cred()
+        auth_token, msg = m.get_cred()
 
         if auth_token:
             if not self.gui.creds.get("kakao"):
@@ -268,16 +430,33 @@ class KakaoGetAuthWindow(BaseWindow):
             self.gui.creds["kakao"]["auth_token"] = auth_token
             self.gui.kakao_auth_token_var.set(auth_token)
 
-            self.cb_msg_block_kakao(f"Got auth_token successfully: {auth_token}")
             self.gui.save_creds()
             self.gui.highlight_fields()
-        else:
-            self.cb_msg_block_kakao("Failed to get auth_token")
+
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
+
+    def cb_get_auth_desktop_login(self) -> None:
+        Thread(target=self.cb_get_auth_desktop_login_thread, daemon=True).start()
+
+    def cb_get_auth_android_login_thread(self, *_: Any) -> None:
+        self.gui.save_creds()
+        m = AuthKakaoAndroidLogin(self.gui.get_opt_cred(), self.gui.cb)
+
+        auth_token, msg = m.get_cred()
+
+        if auth_token:
+            if not self.gui.creds.get("kakao"):
+                self.gui.creds["kakao"] = {}
+            self.gui.creds["kakao"]["auth_token"] = auth_token
+            self.gui.kakao_auth_token_var.set(auth_token)
+
+            self.gui.save_creds()
+            self.gui.highlight_fields()
+
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
 
     def cb_launch_desktop(self) -> None:
-        m = GetKakaoDesktopAuth(
-            cb_ask_str=self.cb_ask_str_kakao,
-        )
+        m = AuthKakaoDesktopMemdump(self.gui.get_opt_cred(), self.gui.cb)
         if self.gui.kakao_bin_path_var.get() != "":
             bin_path = self.gui.kakao_bin_path_var.get()
         else:
@@ -286,20 +465,16 @@ class KakaoGetAuthWindow(BaseWindow):
         if bin_path is not None:
             m.launch_kakao(bin_path)
         else:
-            self.cb_msg_block_kakao(
-                "Error: Cannot launch Kakao Desktop. Is it installed?"
-            )
+            msg = "Error: Cannot launch Kakao Desktop. Is it installed?"
+            self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
 
-    def cb_from_desktop(self) -> None:
-        Thread(target=self.cb_from_desktop_thread, daemon=True).start()
+    def cb_get_auth_desktop_memdump(self) -> None:
+        Thread(target=self.cb_get_auth_desktop_memdump_thread, daemon=True).start()
 
-    def cb_from_desktop_thread(self, *_: Any) -> None:
+    def cb_get_auth_desktop_memdump_thread(self, *_: Any) -> None:
         self.gui.save_creds()
-        self.gui.cb_msg("Getting auth_token, this may take a minute...")
-        self.gui.cb_bar("indeterminate")
-        m = GetKakaoDesktopAuth(
-            cb_ask_str=self.cb_ask_str_kakao,
-        )
+        self.gui.cb.bar("indeterminate")
+        m = AuthKakaoDesktopMemdump(self.gui.get_opt_cred(), self.gui.cb)
 
         bin_path: Optional[str]
         if self.gui.kakao_bin_path_var.get() != "":
@@ -317,5 +492,5 @@ class KakaoGetAuthWindow(BaseWindow):
             self.gui.save_creds()
             self.gui.highlight_fields()
 
-        self.cb_msg_block_kakao(msg)
-        self.gui.cb_bar("clear")
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
+        self.gui.cb.bar("clear")

sticker_convert/gui_components/windows/line_get_auth_window.py

@@ -1,14 +1,13 @@
 #!/usr/bin/env python3
 import webbrowser
-from functools import partial
 from threading import Thread
 from typing import Any
 
 from ttkbootstrap import Button, Frame, Label  # type: ignore
 
+from sticker_convert.auth.auth_line import AuthLine
 from sticker_convert.gui_components.gui_utils import GUIUtils
 from sticker_convert.gui_components.windows.base_window import BaseWindow
-from sticker_convert.utils.auth.get_line_auth import GetLineAuth
 
 
 class LineGetAuthWindow(BaseWindow):
@@ -17,8 +16,6 @@ class LineGetAuthWindow(BaseWindow):
 
         self.title("Get Line cookie")
 
-        self.cb_msg_block_line = partial(self.gui.cb_msg_block, parent=self)
-
         self.frame_info = Frame(self.scrollable_frame)
         self.frame_btn = Frame(self.scrollable_frame)
 
@@ -72,7 +69,7 @@ class LineGetAuthWindow(BaseWindow):
         line_login_site = "https://store.line.me/login"
         success = webbrowser.open(line_login_site)
         if not success:
-            self.gui.cb_ask_str(
+            self.gui.cb.ask_str(
                 "Cannot open web browser for you. Install web browser and open:",
                 initialvalue=line_login_site,
             )
@@ -81,22 +78,16 @@ class LineGetAuthWindow(BaseWindow):
         Thread(target=self.cb_get_cookies_thread, daemon=True).start()
 
     def cb_get_cookies_thread(self, *_: Any) -> None:
-        m = GetLineAuth()
+        m = AuthLine(self.gui.get_opt_cred(), self.gui.cb)
 
         line_cookies = None
-        line_cookies = m.get_cred()
-
+        line_cookies, msg = m.get_cred()
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
         if line_cookies:
             if not self.gui.creds.get("line"):
                 self.gui.creds["line"] = {}
             self.gui.creds["line"]["cookies"] = line_cookies
             self.gui.line_cookies_var.set(line_cookies)
-
-            self.cb_msg_block_line("Got Line cookies successfully")
             self.gui.save_creds()
             self.gui.highlight_fields()
             return
-
-        self.cb_msg_block_line(
-            "Failed to get Line cookies. Have you logged in the web browser?"
-        )

sticker_convert/gui_components/windows/signal_get_auth_window.py

@@ -1,13 +1,12 @@
 #!/usr/bin/env python3
-from functools import partial
 from threading import Thread
 from typing import Any
 
 from ttkbootstrap import Button, Frame, Label  # type: ignore
 
+from sticker_convert.auth.auth_signal import AuthSignal
 from sticker_convert.gui_components.gui_utils import GUIUtils
 from sticker_convert.gui_components.windows.base_window import BaseWindow
-from sticker_convert.utils.auth.get_signal_auth import GetSignalAuth
 
 
 class SignalGetAuthWindow(BaseWindow):
@@ -16,9 +15,6 @@ class SignalGetAuthWindow(BaseWindow):
 
         self.title("Get Signal uuid and password")
 
-        self.cb_msg_block_signal = partial(self.gui.cb_msg_block, parent=self)
-        self.cb_ask_str_signal = partial(self.gui.cb_ask_str, parent=self)
-
         self.frame_info = Frame(self.scrollable_frame)
         self.frame_start_btn = Frame(self.scrollable_frame)
 
@@ -68,9 +64,10 @@ class SignalGetAuthWindow(BaseWindow):
         Thread(target=self.cb_login_thread, daemon=True).start()
 
     def cb_login_thread(self, *args: Any) -> None:
-        m = GetSignalAuth(cb_msg=self.gui.cb_msg, cb_ask_str=self.cb_ask_str_signal)
+        m = AuthSignal(self.gui.get_opt_cred(), self.gui.cb)
 
-        uuid, password = m.get_cred()
+        uuid, password, msg = m.get_cred()
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
         if uuid and password:
             if not self.gui.creds.get("signal"):
                 self.gui.creds["signal"] = {}
@@ -79,11 +76,6 @@ class SignalGetAuthWindow(BaseWindow):
             self.gui.signal_uuid_var.set(uuid)
             self.gui.signal_password_var.set(password)
 
-            self.cb_msg_block_signal(
-                f"Got uuid and password successfully:\nuuid={uuid}\npassword={password}"
-            )
             self.gui.save_creds()
             self.gui.highlight_fields()
             return
-
-        self.cb_msg_block_signal("Failed to get uuid and password")