Revert "Make it work"

This reverts commit 9fe578d.

Author: mwbrooks

pydantic-ai/app_oauth.py

@@ -1,13 +1,16 @@
 import logging
 import os
 
+from dotenv import load_dotenv
 from slack_bolt import App
+from slack_bolt.oauth.oauth_settings import OAuthSettings
 from slack_sdk import WebClient
 
 from agent import get_model
 from listeners import register_listeners
-from oauth import oauth_settings
+from oauth import BOT_SCOPES, USER_SCOPES, installation_store, state_store
 
+load_dotenv(dotenv_path=".env", override=False)
 get_model()  # Fail fast if no AI provider key is configured
 
 logging.basicConfig(level=logging.DEBUG)
@@ -22,7 +25,14 @@
     # Allow bot-posted messages (e.g. issue modal submissions with metadata)
     # to reach the message handler instead of being silently dropped
     ignoring_self_events_enabled=False,
-    oauth_settings=oauth_settings,
+    oauth_settings=OAuthSettings(
+        client_id=os.environ.get("SLACK_CLIENT_ID"),
+        client_secret=os.environ.get("SLACK_CLIENT_SECRET"),
+        scopes=BOT_SCOPES,
+        user_scopes=USER_SCOPES,
+        installation_store=installation_store,
+        state_store=state_store,
+    ),
 )
 
 register_listeners(app)

pydantic-ai/listeners/actions/account_connection.py

@@ -21,16 +21,17 @@ def handle_disconnect_account(
     """Handle the Disconnect button click on App Home."""
     ack()
     try:
-        from oauth import install_uri, oauth_settings
+        from oauth import authorize_url_generator, installation_store, state_store
 
         user_id = context.user_id
-        oauth_settings.installation_store.delete_installation(
-                enterprise_id=context.enterprise_id,
-                team_id=context.team_id,
-                user_id=user_id,
-            )
-        oauth_settings.installation_store.delete_bot
-        view = build_app_home_view(authorize_url=install_uri)
+        installation_store.delete_installation(
+            enterprise_id=context.enterprise_id or "",
+            team_id=context.team_id or "",
+            user_id=user_id,
+        )
+        state = state_store.issue()
+        authorize_url = authorize_url_generator.generate(state)
+        view = build_app_home_view(authorize_url=authorize_url)
         client.views_publish(user_id=user_id, view=view)
     except Exception as e:
         logger.exception(f"Failed to handle disconnect: {e}")

pydantic-ai/listeners/events/app_home_opened.py

@@ -15,12 +15,18 @@ def handle_app_home_opened(client: WebClient, context: BoltContext, logger: Logg
         is_connected = False
 
         if os.environ.get("SLACK_CLIENT_ID"):
-            from oauth import install_uri
+            from oauth import authorize_url_generator, installation_store, state_store
 
-            if context.authorize_result.user_token:
+            installation = installation_store.find_installation(
+                enterprise_id=context.enterprise_id or "",
+                team_id=context.team_id or "",
+                user_id=user_id,
+            )
+            if installation and installation.user_token:
                 is_connected = True
             else:
-                authorize_url = install_uri
+                state = state_store.issue()
+                authorize_url = authorize_url_generator.generate(state)
 
         view = build_app_home_view(
             authorize_url=authorize_url, is_connected=is_connected

pydantic-ai/oauth.py

@@ -1,16 +1,11 @@
 import json
 import os
 from pathlib import Path
-from urllib.parse import urljoin
-from dotenv import load_dotenv
 
-
-from slack_bolt.oauth.oauth_settings import OAuthSettings
+from slack_sdk.oauth import AuthorizeUrlGenerator
 from slack_sdk.oauth.installation_store import FileInstallationStore
 from slack_sdk.oauth.state_store import FileOAuthStateStore
 
-load_dotenv(dotenv_path=".env", override=False)
-
 _manifest = json.loads(Path("manifest.json").read_text())
 BOT_SCOPES = _manifest["oauth_config"]["scopes"]["bot"]
 
@@ -25,18 +20,19 @@
     "users:read",
 ]
 
-oauth_settings = OAuthSettings(
-    client_id=os.environ.get("SLACK_CLIENT_ID"),
-    client_secret=os.environ.get("SLACK_CLIENT_SECRET"),
-    redirect_uri=os.environ.get("SLACK_REDIRECT_URI"),
+installation_store = FileInstallationStore(
+    base_dir="./data/installations",
+    historical_data_enabled=False,
+)
+
+state_store = FileOAuthStateStore(
+    expiration_seconds=600,
+    base_dir="./data/states",
+)
+
+authorize_url_generator = AuthorizeUrlGenerator(
+    client_id=os.environ.get("SLACK_CLIENT_ID", ""),
+    redirect_uri=os.environ.get("SLACK_REDIRECT_URI", ""),
     scopes=BOT_SCOPES,
     user_scopes=USER_SCOPES,
-    installation_store=FileInstallationStore(
-        base_dir="./data/installations",
-    ),
-    state_store=FileOAuthStateStore(
-        expiration_seconds=600,
-        base_dir="./data/states",
-    ),
 )
-install_uri = urljoin(oauth_settings.redirect_uri, oauth_settings.install_path)