feat: delete tokens if addon is uninstalled

Author: TimilsinaBimal

app/api/endpoints/tokens.py

@@ -126,7 +126,7 @@ async def create_token(payload: TokenRequest, request: Request) -> TokenResponse
             await refresh_catalogs_for_credentials(payload_to_store, auth_key=verified_auth_key)
         except Exception as exc:  # pragma: no cover - remote dependency
             logger.error(f"[{redact_token(token)}] Initial catalog refresh failed: {{}}", exc, exc_info=True)
-            await token_store.delete_token(token)
+            await token_store.delete_token(token=token)
             raise HTTPException(
                 status_code=502,
                 detail="Credentials verified, but Watchly couldn't refresh your catalogs yet. Please try again.",

app/core/config.py

@@ -17,7 +17,7 @@ class Settings(BaseSettings):
     PORT: int = 8000
     ADDON_ID: str = "com.bimal.watchly"
     ADDON_NAME: str = "Watchly"
-    APP_VERSION: str = "0.1.4"
+    APP_VERSION: str = "0.1.5"
     REDIS_URL: str = "redis://redis:6379/0"
     TOKEN_SALT: str = "change-me"
     TOKEN_TTL_SECONDS: int = 0  # 0 = never expire

app/services/catalog_updater.py

@@ -16,13 +16,25 @@
 MAX_CONCURRENT_UPDATES = 5
 
 
-async def refresh_catalogs_for_credentials(credentials: dict[str, Any], auth_key: str | None = None) -> bool:
+async def refresh_catalogs_for_credentials(
+    credentials: dict[str, Any], auth_key: str | None = None, key: str | None = None
+) -> bool:
     """Regenerate catalogs for the provided credentials and push them to Stremio."""
     stremio_service = StremioService(
         username=credentials.get("username") or "",
         password=credentials.get("password") or "",
         auth_key=auth_key or credentials.get("authKey"),
     )
+    # check if user has addon installed or not
+    try:
+        addon_installed = await stremio_service.is_addon_installed()
+        if not addon_installed:
+            logger.info("User has not installed addon. Removing token from redis")
+            await token_store.delete_token(key=key)
+            return True
+    except Exception as e:
+        logger.exception(f"Failed to check if addon is installed: {e}")
+
     try:
         library_items = await stremio_service.get_library_items()
         dynamic_catalog_service = DynamicCatalogService(stremio_service=stremio_service)
@@ -104,7 +116,7 @@ async def _update_safe(key: str, payload: dict[str, Any]) -> None:
 
             async with sem:
                 try:
-                    updated = await refresh_catalogs_for_credentials(payload)
+                    updated = await refresh_catalogs_for_credentials(payload, key=key)
                     logger.info(
                         f"Background refresh for {self._mask_key(key)} completed (updated={updated})",
                     )

app/services/stremio_service.py

@@ -302,3 +302,11 @@ async def update_catalogs(self, catalogs: list[dict], auth_key: str | None = Non
                 addon["manifest"]["catalogs"] = catalogs
                 break
         return await self.update_addon(addons, auth_key)
+
+    async def is_addon_installed(self, auth_key: str | None = None):
+        auth_key = auth_key or await self.get_auth_key()
+        addons = await self.get_addons(auth_key)
+        for addon in addons:
+            if addon.get("manifest", {}).get("id") == settings.ADDON_ID:
+                return True
+        return False

app/services/token_store.py

@@ -133,9 +133,12 @@ async def get_payload(self, token: str) -> dict[str, Any] | None:
             logger.warning("Failed to decrypt or decode cached payload for token. Key might have changed.")
             return None
 
-    async def delete_token(self, token: str) -> None:
-        hashed = self._hash_token(token)
-        key = self._format_key(hashed)
+    async def delete_token(self, token: str = None, key: str = None) -> None:
+        if not token and not key:
+            raise ValueError("Either token or key must be provided")
+        if token:
+            hashed = self._hash_token(token)
+            key = self._format_key(hashed)
         client = await self._get_client()
         await client.delete(key)