", unsafe_allow_html=True)
- st.markdown(f"
", unsafe_allow_html=True)
- st.markdown(f"
"
- f"{type_icon}{row['title']}
", unsafe_allow_html=True)
- st.markdown("
", unsafe_allow_html=True)
- col1, col2, col3 = st.columns([1, 1, 1])
- with col1:
- if st.button("β‘", key=f"generate_{item_key}", help="Generate with AI Blog Writer", use_container_width=True):
- on_generate()
- with col2:
- if st.button("βοΈ", key=f"edit_{item_key}", help="Edit Content", use_container_width=True):
- on_edit()
- with col3:
- if st.button("ποΈ", key=f"delete_{item_key}", help="Delete Content", use_container_width=True):
- on_delete()
- st.markdown("
", unsafe_allow_html=True)
- st.markdown("
", unsafe_allow_html=True)
- st.markdown(f"
{platform_icon} {platform_disp} | {type_disp} | {status_disp}
", unsafe_allow_html=True)
- st.markdown("
Connection Successful. You can close this window.
+
+
+
+"""
+ return HTMLResponse(content=html)
else:
logger.error("Failed to handle GSC OAuth callback")
- raise HTTPException(status_code=400, detail="Failed to connect GSC")
+ html = """
+
+
+ Connection Failed. Please close this window and try again.
+
+
+
+"""
+ return HTMLResponse(status_code=400, content=html)
except Exception as e:
logger.error(f"Error handling GSC OAuth callback: {e}")
- raise HTTPException(status_code=500, detail=f"Error handling OAuth callback: {str(e)}")
+ html = f"""
+
+
+ Connection Error. Please close this window and try again.
+ There was an error connecting to WordPress.com.
+ You can close this window and try again.
+
+
+ """
+ return HTMLResponse(content=html_content, headers={
+ "Cross-Origin-Opener-Policy": "unsafe-none",
+ "Cross-Origin-Embedder-Policy": "unsafe-none"
+ })
+
+ if not code or not state:
+ logger.error("Missing code or state parameter in WordPress OAuth callback")
+ html_content = """
+
+
+
+ Missing required parameters.
+ You can close this window and try again.
+
+
+ """
+ return HTMLResponse(content=html_content, headers={
+ "Cross-Origin-Opener-Policy": "unsafe-none",
+ "Cross-Origin-Embedder-Policy": "unsafe-none"
+ })
+
+ # Exchange code for token
+ result = oauth_service.handle_oauth_callback(code, state)
+
+ if not result or not result.get('success'):
+ logger.error("Failed to exchange WordPress OAuth code for token")
+ html_content = """
+
+
+
+ Failed to exchange authorization code for access token.
+ You can close this window and try again.
+
+
+ """
+ return HTMLResponse(content=html_content)
+
+ # Return success page with postMessage script
+ blog_url = result.get('blog_url', '')
+ html_content = f"""
+
+
+
+ Your WordPress.com site has been connected successfully.
+ You can close this window now.
+
+
+ """
+
+ return HTMLResponse(content=html_content, headers={
+ "Cross-Origin-Opener-Policy": "unsafe-none",
+ "Cross-Origin-Embedder-Policy": "unsafe-none"
+ })
+
+ except Exception as e:
+ logger.error(f"Error handling WordPress OAuth callback: {e}")
+ html_content = """
+
+
+
+ An unexpected error occurred during connection.
+ You can close this window and try again.
+
+
+ """
+ return HTMLResponse(content=html_content, headers={
+ "Cross-Origin-Opener-Policy": "unsafe-none",
+ "Cross-Origin-Embedder-Policy": "unsafe-none"
+ })
+
+@router.get("/status", response_model=WordPressStatusResponse)
+async def get_wordpress_oauth_status(
+ user: Dict[str, Any] = Depends(get_current_user)
+):
+ """Get WordPress OAuth connection status."""
+ try:
+ user_id = user.get('id')
+ if not user_id:
+ raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="User ID not found.")
+
+ status_data = oauth_service.get_connection_status(user_id)
+ return WordPressStatusResponse(**status_data)
+
+ except Exception as e:
+ logger.error(f"Error getting WordPress OAuth status: {e}")
+ raise HTTPException(
+ status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+ detail="Failed to get WordPress connection status."
+ )
+
+@router.delete("/disconnect/{token_id}")
+async def disconnect_wordpress_site(
+ token_id: int,
+ user: Dict[str, Any] = Depends(get_current_user)
+):
+ """Disconnect a WordPress site."""
+ try:
+ user_id = user.get('id')
+ if not user_id:
+ raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="User ID not found.")
+
+ success = oauth_service.revoke_token(user_id, token_id)
+ if not success:
+ raise HTTPException(
+ status_code=status.HTTP_404_NOT_FOUND,
+ detail="WordPress token not found or could not be disconnected."
+ )
+
+ return {"success": True, "message": f"WordPress site disconnected successfully."}
+
+ except Exception as e:
+ logger.error(f"Error disconnecting WordPress site: {e}")
+ raise HTTPException(
+ status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+ detail="Failed to disconnect WordPress site."
+ )
+
+@router.get("/health")
+async def wordpress_oauth_health():
+ """WordPress OAuth health check."""
+ return {
+ "status": "healthy",
+ "service": "wordpress_oauth",
+ "timestamp": "2024-01-01T00:00:00Z",
+ "version": "1.0.0"
+ }
diff --git a/backend/scripts/setup_gsc.py b/backend/scripts/setup_gsc.py
new file mode 100644
index 00000000..ab964779
--- /dev/null
+++ b/backend/scripts/setup_gsc.py
@@ -0,0 +1,197 @@
+#!/usr/bin/env python3
+"""
+Google Search Console Setup Script for ALwrity
+
+This script helps set up the GSC integration by:
+1. Checking if credentials file exists
+2. Validating database tables
+3. Testing OAuth flow
+"""
+
+import os
+import sys
+import sqlite3
+import json
+from pathlib import Path
+
+def check_credentials_file():
+ """Check if GSC credentials file exists and is valid."""
+ credentials_path = Path("gsc_credentials.json")
+
+ if not credentials_path.exists():
+ print("β GSC credentials file not found!")
+ print("π Please create gsc_credentials.json with your Google OAuth credentials.")
+ print("π Use gsc_credentials_template.json as a template.")
+ return False
+
+ try:
+ with open(credentials_path, 'r') as f:
+ credentials = json.load(f)
+
+ required_fields = ['web', 'client_id', 'client_secret']
+ web_config = credentials.get('web', {})
+
+ if not all(field in web_config for field in ['client_id', 'client_secret']):
+ print("β GSC credentials file is missing required fields!")
+ print("π Please ensure client_id and client_secret are present.")
+ return False
+
+ if 'YOUR_GOOGLE_CLIENT_ID' in web_config.get('client_id', ''):
+ print("β GSC credentials file contains placeholder values!")
+ print("π Please replace placeholder values with actual Google OAuth credentials.")
+ return False
+
+ print("β
GSC credentials file is valid!")
+ return True
+
+ except json.JSONDecodeError:
+ print("β GSC credentials file is not valid JSON!")
+ return False
+ except Exception as e:
+ print(f"β Error reading credentials file: {e}")
+ return False
+
+def check_database_tables():
+ """Check if GSC database tables exist."""
+ db_path = "alwrity.db"
+
+ if not os.path.exists(db_path):
+ print("β Database file not found!")
+ print("π Please ensure the database is initialized.")
+ return False
+
+ try:
+ with sqlite3.connect(db_path) as conn:
+ cursor = conn.cursor()
+
+ # Check for GSC tables
+ tables = [
+ 'gsc_credentials',
+ 'gsc_data_cache',
+ 'gsc_oauth_states'
+ ]
+
+ for table in tables:
+ cursor.execute(f"SELECT name FROM sqlite_master WHERE type='table' AND name='{table}'")
+ if not cursor.fetchone():
+ print(f"β Table '{table}' not found!")
+ return False
+
+ print("β
All GSC database tables exist!")
+ return True
+
+ except Exception as e:
+ print(f"β Error checking database: {e}")
+ return False
+
+def check_environment_variables():
+ """Check if required environment variables are set."""
+ required_vars = ['GSC_REDIRECT_URI']
+ missing_vars = []
+
+ for var in required_vars:
+ if not os.getenv(var):
+ missing_vars.append(var)
+
+ if missing_vars:
+ print(f"β Missing environment variables: {', '.join(missing_vars)}")
+ print("π Please set these in your .env file:")
+ for var in missing_vars:
+ if var == 'GSC_REDIRECT_URI':
+ print(f" {var}=http://localhost:8000/gsc/callback")
+ return False
+
+ print("β
All required environment variables are set!")
+ return True
+
+def create_database_tables():
+ """Create GSC database tables if they don't exist."""
+ db_path = "alwrity.db"
+
+ try:
+ with sqlite3.connect(db_path) as conn:
+ cursor = conn.cursor()
+
+ # GSC credentials table
+ cursor.execute('''
+ CREATE TABLE IF NOT EXISTS gsc_credentials (
+ user_id TEXT PRIMARY KEY,
+ credentials_json TEXT NOT NULL,
+ created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+ )
+ ''')
+
+ # GSC data cache table
+ cursor.execute('''
+ CREATE TABLE IF NOT EXISTS gsc_data_cache (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ user_id TEXT NOT NULL,
+ site_url TEXT NOT NULL,
+ data_type TEXT NOT NULL,
+ data_json TEXT NOT NULL,
+ created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ expires_at TIMESTAMP NOT NULL,
+ FOREIGN KEY (user_id) REFERENCES gsc_credentials (user_id)
+ )
+ ''')
+
+ # GSC OAuth states table
+ cursor.execute('''
+ CREATE TABLE IF NOT EXISTS gsc_oauth_states (
+ state TEXT PRIMARY KEY,
+ user_id TEXT NOT NULL,
+ created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+ )
+ ''')
+
+ conn.commit()
+ print("β
GSC database tables created successfully!")
+ return True
+
+ except Exception as e:
+ print(f"β Error creating database tables: {e}")
+ return False
+
+def main():
+ """Main setup function."""
+ print("π§ Google Search Console Setup Check")
+ print("=" * 50)
+
+ # Change to backend directory
+ backend_dir = Path(__file__).parent.parent
+ os.chdir(backend_dir)
+
+ all_good = True
+
+ # Check credentials file
+ print("\n1. Checking GSC credentials file...")
+ if not check_credentials_file():
+ all_good = False
+
+ # Check environment variables
+ print("\n2. Checking environment variables...")
+ if not check_environment_variables():
+ all_good = False
+
+ # Check/create database tables
+ print("\n3. Checking database tables...")
+ if not check_database_tables():
+ print("π Creating missing database tables...")
+ if not create_database_tables():
+ all_good = False
+
+ # Summary
+ print("\n" + "=" * 50)
+ if all_good:
+ print("β
GSC setup is complete!")
+ print("π You can now test the GSC integration in onboarding step 5.")
+ else:
+ print("β GSC setup is incomplete!")
+ print("π Please fix the issues above before testing.")
+ print("π See GSC_SETUP_GUIDE.md for detailed instructions.")
+
+ return 0 if all_good else 1
+
+if __name__ == "__main__":
+ sys.exit(main())
diff --git a/backend/services/gsc_service.py b/backend/services/gsc_service.py
index ff87996e..a8b59156 100644
--- a/backend/services/gsc_service.py
+++ b/backend/services/gsc_service.py
@@ -17,7 +17,16 @@ class GSCService:
def __init__(self, db_path: str = "alwrity.db"):
"""Initialize GSC service with database connection."""
self.db_path = db_path
- self.credentials_file = "gsc_credentials.json"
+ # Resolve credentials file robustly: env override or project-relative default
+ env_credentials_path = os.getenv("GSC_CREDENTIALS_FILE")
+ if env_credentials_path:
+ self.credentials_file = env_credentials_path
+ else:
+ # Default to