Merge pull request #52 from hyp3rd/fix/API

auth endpoints improvements

api/routers/auth.py

@@ -1,5 +1,6 @@
 """Bridge Auth Router."""
 import json
+import os
 
 from fastapi import APIRouter
 
@@ -62,3 +63,49 @@ async def telegram_auth(auth: TelegramAuthSchema):
             error="",
         )
     )
+
+
+@router.delete(
+    "/telegram",
+    name="Sign out from Telegram",
+    summary="Clears the Telegram authentication.",
+    description="Clears the Telegram authentication and session files.",
+    response_model=TelegramAuthResponseSchema,
+)
+async def telegram_deauth():
+    """Clears the Telegram authentication"""
+    config = Config.get_instance()
+
+    try:
+        # Remove the Telegram auth file.
+        if os.path.isfile(config.api.telegram_auth_file):
+            os.remove(config.api.telegram_auth_file)
+
+        # Remove the session file.
+        if os.path.isfile(f"{config.application.name}.session"):
+            os.remove(f"{config.application.name}.session")
+
+        return TelegramAuthResponseSchema(
+            auth=TelegramAuthResponse(
+                status="success",
+                message="signed out from the Telegram API successfully.",
+                error="",
+            )
+        )
+
+    except OSError as ex:
+        return TelegramAuthResponseSchema(
+            auth=TelegramAuthResponse(
+                status="failed",
+                message="failed to sign out from the Telegram API.",
+                error=ex.strerror,
+            )
+        )
+    except Exception as ex:  # pylint: disable=broad-except
+        return TelegramAuthResponseSchema(
+            auth=TelegramAuthResponse(
+                status="failed",
+                message="failed to sign out from the Telegram API.",
+                error=str(ex),
+            )
+        )

api/routers/config.py

@@ -247,7 +247,7 @@ async def post_config(self, config_schema: ConfigSchema) -> BaseResponse:
 
         # validate the config with pydantic
         try:
-            _ = ConfigYAMLSchema(**config_schema.config.dict())
+            _ = ConfigYAMLSchema(**config_schema.config.model_dump())
         except ValidationError as exc:
             for error in exc.errors():
                 logger.error(error)
@@ -262,7 +262,7 @@ async def post_config(self, config_schema: ConfigSchema) -> BaseResponse:
 
         with open(config_file_name, "w", encoding="utf-8") as new_config_file:
             yaml.dump(
-                config_schema.config.dict(),
+                config_schema.config.model_dump(),
                 new_config_file,
                 allow_unicode=False,
                 encoding="utf-8",

bridge/config/config.py

@@ -6,7 +6,7 @@
 import yaml
 
 # from pydantic import RootModel  # pylint: disable=import-error
-from pydantic import SecretStr  # pylint: disable=import-error
+# from pydantic import SecretStr  # pylint: disable=import-error
 from pydantic import BaseModel, StrictInt, model_validator, validator
 
 _instances: Dict[str, "Config"] = {}
@@ -226,7 +226,7 @@ class TelegramConfig(BaseModel):  # pylint: disable=too-few-public-methods
     """Telegram config."""
 
     phone: str
-    password: SecretStr
+    password: str
     api_id: StrictInt
     api_hash: str
     log_unhandled_dialogs: bool = False
@@ -237,9 +237,9 @@ class TelegramConfig(BaseModel):  # pylint: disable=too-few-public-methods
     class Config:
         """Telegram config."""
 
-        json_encoders = {
-            SecretStr: lambda val: val.get_secret_value(),
-        }
+        # json_encoders = {
+        #     SecretStr: lambda val: val.get_secret_value(),
+        # }
 
     @validator("api_hash")
     def api_hash_alphanumeric(cls, val):

bridge/telegram/core.py

@@ -5,10 +5,12 @@
 from asyncio.events import AbstractEventLoop
 
 from telethon import TelegramClient
-from telethon.errors.rpcerrorlist import (FloodWaitError,
-                                          PhoneCodeInvalidError,
-                                          SessionPasswordNeededError,
-                                          SessionRevokedError)
+from telethon.errors.rpcerrorlist import (
+    FloodWaitError,
+    PhoneCodeInvalidError,
+    SessionPasswordNeededError,
+    SessionRevokedError,
+)
 
 from bridge.config import Config
 from bridge.events import EventDispatcher
@@ -207,7 +209,8 @@ def password_callback():
                     json.dump(auth_data, auth_file)
             raise
 
-        # os.remove(config.telegram.auth_file)
+        if os.path.isfile(config.api.telegram_auth_file):
+            os.remove(config.api.telegram_auth_file)
 
         bot_identity = await telegram_client.get_me(input_peer=False)
         logger.info(

tools/kill-server.bash

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+kill -9 "$(ps aux | grep python | awk '{print $2}')"