first commit

accounts/management/commands/check_all_social_tables.py

@@ -0,0 +1,30 @@
+from django.core.management.base import BaseCommand
+from allauth.socialaccount.models import SocialApp, SocialAccount, SocialToken
+from django.contrib.sites.models import Site
+
+class Command(BaseCommand):
+    help = 'Check all social auth related tables'
+
+    def handle(self, *args, **options):
+        # Check SocialApp
+        self.stdout.write('\nChecking SocialApp table:')
+        for app in SocialApp.objects.all():
+            self.stdout.write(f'ID: {app.id}, Provider: {app.provider}, Name: {app.name}, Client ID: {app.client_id}')
+            self.stdout.write('Sites:')
+            for site in app.sites.all():
+                self.stdout.write(f'  - {site.domain}')
+
+        # Check SocialAccount
+        self.stdout.write('\nChecking SocialAccount table:')
+        for account in SocialAccount.objects.all():
+            self.stdout.write(f'ID: {account.id}, Provider: {account.provider}, UID: {account.uid}')
+
+        # Check SocialToken
+        self.stdout.write('\nChecking SocialToken table:')
+        for token in SocialToken.objects.all():
+            self.stdout.write(f'ID: {token.id}, Account: {token.account}, App: {token.app}')
+
+        # Check Site
+        self.stdout.write('\nChecking Site table:')
+        for site in Site.objects.all():
+            self.stdout.write(f'ID: {site.id}, Domain: {site.domain}, Name: {site.name}')

accounts/management/commands/check_social_apps.py

@@ -0,0 +1,19 @@
+from django.core.management.base import BaseCommand
+from allauth.socialaccount.models import SocialApp
+
+class Command(BaseCommand):
+    help = 'Check social app configurations'
+
+    def handle(self, *args, **options):
+        social_apps = SocialApp.objects.all()
+        
+        if not social_apps:
+            self.stdout.write(self.style.ERROR('No social apps found'))
+            return
+        
+        for app in social_apps:
+            self.stdout.write(self.style.SUCCESS(f'\nProvider: {app.provider}'))
+            self.stdout.write(f'Name: {app.name}')
+            self.stdout.write(f'Client ID: {app.client_id}')
+            self.stdout.write(f'Secret: {app.secret}')
+            self.stdout.write(f'Sites: {", ".join(str(site.domain) for site in app.sites.all())}')

accounts/management/commands/cleanup_social_auth.py

@@ -0,0 +1,22 @@
+from django.core.management.base import BaseCommand
+from django.db import connection
+
+class Command(BaseCommand):
+    help = 'Clean up social auth tables and migrations'
+
+    def handle(self, *args, **options):
+        with connection.cursor() as cursor:
+            # Drop social auth tables
+            cursor.execute("DROP TABLE IF EXISTS socialaccount_socialapp")
+            cursor.execute("DROP TABLE IF EXISTS socialaccount_socialapp_sites")
+            cursor.execute("DROP TABLE IF EXISTS socialaccount_socialaccount")
+            cursor.execute("DROP TABLE IF EXISTS socialaccount_socialtoken")
+            
+            # Remove migration records
+            cursor.execute("DELETE FROM django_migrations WHERE app='socialaccount'")
+            cursor.execute("DELETE FROM django_migrations WHERE app='accounts' AND name LIKE '%social%'")
+            
+            # Reset sequences
+            cursor.execute("DELETE FROM sqlite_sequence WHERE name LIKE '%social%'")
+            
+            self.stdout.write(self.style.SUCCESS('Successfully cleaned up social auth configuration'))

accounts/management/commands/create_social_apps.py

@@ -0,0 +1,48 @@
+from django.core.management.base import BaseCommand
+from django.contrib.sites.models import Site
+from allauth.socialaccount.models import SocialApp
+
+class Command(BaseCommand):
+    help = 'Create social apps for authentication'
+
+    def handle(self, *args, **options):
+        # Get the default site
+        site = Site.objects.get_or_create(
+            id=1,
+            defaults={
+                'domain': 'localhost:8000',
+                'name': 'ThrillWiki Development'
+            }
+        )[0]
+
+        # Create Discord app
+        discord_app, created = SocialApp.objects.get_or_create(
+            provider='discord',
+            defaults={
+                'name': 'Discord',
+                'client_id': '1299112802274902047',
+                'secret': 'ece7Pe_M4mD4mYzAgcINjTEKL_3ftL11',
+            }
+        )
+        if not created:
+            discord_app.client_id = '1299112802274902047'
+            discord_app.secret = 'ece7Pe_M4mD4mYzAgcINjTEKL_3ftL11'
+            discord_app.save()
+        discord_app.sites.add(site)
+        self.stdout.write(f'{"Created" if created else "Updated"} Discord app')
+
+        # Create Google app
+        google_app, created = SocialApp.objects.get_or_create(
+            provider='google',
+            defaults={
+                'name': 'Google',
+                'client_id': '135166769591-nopcgmo0fkqfqfs9qe783a137mtmcrt2.apps.googleusercontent.com',
+                'secret': 'GOCSPX-Wd_0Ue0Ue0Ue0Ue0Ue0Ue0Ue0Ue',
+            }
+        )
+        if not created:
+            google_app.client_id = '135166769591-nopcgmo0fkqfqfs9qe783a137mtmcrt2.apps.googleusercontent.com'
+            google_app.secret = 'GOCSPX-Wd_0Ue0Ue0Ue0Ue0Ue0Ue0Ue0Ue'
+            google_app.save()
+        google_app.sites.add(site)
+        self.stdout.write(f'{"Created" if created else "Updated"} Google app')

accounts/management/commands/fix_social_apps.py

@@ -0,0 +1,35 @@
+from django.core.management.base import BaseCommand
+from allauth.socialaccount.models import SocialApp
+from django.contrib.sites.models import Site
+import os
+
+class Command(BaseCommand):
+    help = 'Fix social app configurations'
+
+    def handle(self, *args, **options):
+        # Delete all existing social apps
+        SocialApp.objects.all().delete()
+        self.stdout.write('Deleted all existing social apps')
+        
+        # Get the default site
+        site = Site.objects.get(id=1)
+        
+        # Create Google provider
+        google_app = SocialApp.objects.create(
+            provider='google',
+            name='Google',
+            client_id=os.getenv('GOOGLE_CLIENT_ID'),
+            secret=os.getenv('GOOGLE_CLIENT_SECRET'),
+        )
+        google_app.sites.add(site)
+        self.stdout.write(f'Created Google app with client_id: {google_app.client_id}')
+        
+        # Create Discord provider
+        discord_app = SocialApp.objects.create(
+            provider='discord',
+            name='Discord',
+            client_id=os.getenv('DISCORD_CLIENT_ID'),
+            secret=os.getenv('DISCORD_CLIENT_SECRET'),
+        )
+        discord_app.sites.add(site)
+        self.stdout.write(f'Created Discord app with client_id: {discord_app.client_id}')

accounts/management/commands/reset_social_apps.py

@@ -0,0 +1,36 @@
+from django.core.management.base import BaseCommand
+from allauth.socialaccount.models import SocialApp
+from django.contrib.sites.models import Site
+from django.db import connection
+
+class Command(BaseCommand):
+    help = 'Reset social apps configuration'
+
+    def handle(self, *args, **options):
+        # Delete all social apps using raw SQL to bypass Django's ORM
+        with connection.cursor() as cursor:
+            cursor.execute("DELETE FROM socialaccount_socialapp_sites")
+            cursor.execute("DELETE FROM socialaccount_socialapp")
+        
+        # Get the default site
+        site = Site.objects.get(id=1)
+        
+        # Create Discord app
+        discord_app = SocialApp.objects.create(
+            provider='discord',
+            name='Discord',
+            client_id='1299112802274902047',
+            secret='ece7Pe_M4mD4mYzAgcINjTEKL_3ftL11',
+        )
+        discord_app.sites.add(site)
+        self.stdout.write(f'Created Discord app with ID: {discord_app.id}')
+        
+        # Create Google app
+        google_app = SocialApp.objects.create(
+            provider='google',
+            name='Google',
+            client_id='135166769591-nopcgmo0fkqfqfs9qe783a137mtmcrt2.apps.googleusercontent.com',
+            secret='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',
+        )
+        google_app.sites.add(site)
+        self.stdout.write(f'Created Google app with ID: {google_app.id}')

accounts/management/commands/reset_social_auth.py

@@ -0,0 +1,17 @@
+from django.core.management.base import BaseCommand
+from django.db import connection
+
+class Command(BaseCommand):
+    help = 'Reset social auth configuration'
+
+    def handle(self, *args, **options):
+        with connection.cursor() as cursor:
+            # Delete all social apps
+            cursor.execute("DELETE FROM socialaccount_socialapp")
+            cursor.execute("DELETE FROM socialaccount_socialapp_sites")
+            
+            # Reset sequences
+            cursor.execute("DELETE FROM sqlite_sequence WHERE name='socialaccount_socialapp'")
+            cursor.execute("DELETE FROM sqlite_sequence WHERE name='socialaccount_socialapp_sites'")
+            
+            self.stdout.write(self.style.SUCCESS('Successfully reset social auth configuration'))

accounts/management/commands/setup_groups.py

@@ -0,0 +1,42 @@
+from django.core.management.base import BaseCommand
+from django.contrib.auth.models import Group, Permission
+from django.contrib.contenttypes.models import ContentType
+from accounts.models import User
+from accounts.signals import create_default_groups
+
+class Command(BaseCommand):
+    help = 'Set up default groups and permissions for user roles'
+
+    def handle(self, *args, **options):
+        self.stdout.write('Creating default groups and permissions...')
+        
+        try:
+            # Create default groups with permissions
+            create_default_groups()
+            
+            # Sync existing users with groups based on their roles
+            users = User.objects.exclude(role=User.Roles.USER)
+            for user in users:
+                group = Group.objects.filter(name=user.role).first()
+                if group:
+                    user.groups.add(group)
+                    
+                    # Update staff/superuser status based on role
+                    if user.role == User.Roles.SUPERUSER:
+                        user.is_superuser = True
+                        user.is_staff = True
+                    elif user.role in [User.Roles.ADMIN, User.Roles.MODERATOR]:
+                        user.is_staff = True
+                    user.save()
+            
+            self.stdout.write(self.style.SUCCESS('Successfully set up groups and permissions'))
+            
+            # Print summary
+            for group in Group.objects.all():
+                self.stdout.write(f'\nGroup: {group.name}')
+                self.stdout.write('Permissions:')
+                for perm in group.permissions.all():
+                    self.stdout.write(f'  - {perm.codename}')
+                
+        except Exception as e:
+            self.stdout.write(self.style.ERROR(f'Error setting up groups: {str(e)}'))

accounts/management/commands/setup_site.py

@@ -0,0 +1,17 @@
+from django.core.management.base import BaseCommand
+from django.contrib.sites.models import Site
+
+class Command(BaseCommand):
+    help = 'Set up default site'
+
+    def handle(self, *args, **options):
+        # Delete any existing sites
+        Site.objects.all().delete()
+        
+        # Create default site
+        site = Site.objects.create(
+            id=1,
+            domain='localhost:8000',
+            name='ThrillWiki Development'
+        )
+        self.stdout.write(self.style.SUCCESS(f'Created site: {site.domain}'))

accounts/management/commands/setup_social_auth.py

@@ -0,0 +1,63 @@
+from django.core.management.base import BaseCommand
+from django.contrib.sites.models import Site
+from allauth.socialaccount.models import SocialApp
+from dotenv import load_dotenv
+import os
+
+class Command(BaseCommand):
+    help = 'Sets up social authentication apps'
+
+    def handle(self, *args, **kwargs):
+        # Load environment variables
+        load_dotenv()
+
+        # Get environment variables
+        google_client_id = os.getenv('GOOGLE_CLIENT_ID')
+        google_client_secret = os.getenv('GOOGLE_CLIENT_SECRET')
+        discord_client_id = os.getenv('DISCORD_CLIENT_ID')
+        discord_client_secret = os.getenv('DISCORD_CLIENT_SECRET')
+
+        if not all([google_client_id, google_client_secret, discord_client_id, discord_client_secret]):
+            self.stdout.write(self.style.ERROR('Missing required environment variables'))
+            return
+
+        # Get or create the default site
+        site, _ = Site.objects.get_or_create(
+            id=1,
+            defaults={
+                'domain': 'localhost:8000',
+                'name': 'localhost'
+            }
+        )
+
+        # Set up Google
+        google_app, created = SocialApp.objects.get_or_create(
+            provider='google',
+            defaults={
+                'name': 'Google',
+                'client_id': google_client_id,
+                'secret': google_client_secret,
+            }
+        )
+        if not created:
+            google_app.client_id = google_client_id
+            google_app.[SECRET-REMOVED]
+            google_app.save()
+        google_app.sites.add(site)
+
+        # Set up Discord
+        discord_app, created = SocialApp.objects.get_or_create(
+            provider='discord',
+            defaults={
+                'name': 'Discord',
+                'client_id': discord_client_id,
+                'secret': discord_client_secret,
+            }
+        )
+        if not created:
+            discord_app.client_id = discord_client_id
+            discord_app.[SECRET-REMOVED]
+            discord_app.save()
+        discord_app.sites.add(site)
+
+        self.stdout.write(self.style.SUCCESS('Successfully set up social auth apps'))

accounts/management/commands/setup_social_auth_admin.py

@@ -0,0 +1,60 @@
+from django.core.management.base import BaseCommand
+from django.contrib.sites.models import Site
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import Permission
+from allauth.socialaccount.models import SocialApp
+
+User = get_user_model()
+
+class Command(BaseCommand):
+    help = 'Set up social authentication through admin interface'
+
+    def handle(self, *args, **options):
+        # Get or create the default site
+        site, _ = Site.objects.get_or_create(
+            id=1,
+            defaults={
+                'domain': 'localhost:8000',
+                'name': 'ThrillWiki Development'
+            }
+        )
+        if not _:
+            site.domain = 'localhost:8000'
+            site.name = 'ThrillWiki Development'
+            site.save()
+        self.stdout.write(f'{"Created" if _ else "Updated"} site: {site.domain}')
+
+        # Create superuser if it doesn't exist
+        if not User.objects.filter(username='admin').exists():
+            User.objects.create_superuser('admin', 'admin@example.com', 'admin')
+            self.stdout.write('Created superuser: admin/admin')
+
+        self.stdout.write(self.style.SUCCESS('''
+Social auth setup instructions:
+
+1. Run the development server:
+   python manage.py runserver
+
+2. Go to the admin interface:
+   http://localhost:8000/admin/
+
+3. Log in with:
+   Username: admin
+   Password: admin
+
+4. Add social applications:
+   - Go to "Social applications" under "Social Accounts"
+   - Add Discord app:
+     Provider: discord
+     Name: Discord
+     Client id: 1299112802274902047
+     Secret key: ece7Pe_M4mD4mYzAgcINjTEKL_3ftL11
+     Sites: Add "localhost:8000"
+
+   - Add Google app:
+     Provider: google
+     Name: Google
+     Client id: 135166769591-nopcgmo0fkqfqfs9qe783a137mtmcrt2.apps.googleusercontent.com
+     Secret key: GOCSPX-Wd_0Ue0Ue0Ue0Ue0Ue0Ue0Ue0Ue
+     Sites: Add "localhost:8000"
+'''))

accounts/management/commands/test_discord_auth.py

@@ -0,0 +1,60 @@
+from django.core.management.base import BaseCommand
+from django.urls import reverse
+from django.test import Client
+from allauth.socialaccount.models import SocialApp
+from urllib.parse import urljoin
+
+class Command(BaseCommand):
+    help = 'Test Discord OAuth2 authentication flow'
+
+    def handle(self, *args, **options):
+        client = Client(HTTP_HOST='localhost:8000')
+        
+        # Get Discord app
+        try:
+            discord_app = SocialApp.objects.get(provider='discord')
+            self.stdout.write('Found Discord app configuration:')
+            self.stdout.write(f'Client ID: {discord_app.client_id}')
+            
+            # Test login URL
+            login_url = '/accounts/discord/login/'
+            response = client.get(login_url, HTTP_HOST='localhost:8000')
+            self.stdout.write(f'\nTesting login URL: {login_url}')
+            self.stdout.write(f'Status code: {response.status_code}')
+            
+            if response.status_code == 302:
+                redirect_url = response['Location']
+                self.stdout.write(f'Redirects to: {redirect_url}')
+                
+                # Parse OAuth2 parameters
+                self.stdout.write('\nOAuth2 Parameters:')
+                if 'client_id=' in redirect_url:
+                    self.stdout.write('✓ client_id parameter present')
+                if 'redirect_uri=' in redirect_url:
+                    self.stdout.write('✓ redirect_uri parameter present')
+                if 'scope=' in redirect_url:
+                    self.stdout.write('✓ scope parameter present')
+                if 'response_type=' in redirect_url:
+                    self.stdout.write('✓ response_type parameter present')
+                if 'code_challenge=' in redirect_url:
+                    self.stdout.write('✓ PKCE enabled (code_challenge present)')
+            
+            # Show callback URL
+            callback_url = 'http://localhost:8000/accounts/discord/login/callback/'
+            self.stdout.write('\nCallback URL to configure in Discord Developer Portal:')
+            self.stdout.write(callback_url)
+            
+            # Show frontend login URL
+            frontend_url = 'http://localhost:5173'
+            self.stdout.write('\nFrontend configuration:')
+            self.stdout.write(f'Frontend URL: {frontend_url}')
+            self.stdout.write('Discord login button should use:')
+            self.stdout.write('/accounts/discord/login/?process=login')
+            
+            # Show allauth URLs
+            self.stdout.write('\nAllauth URLs:')
+            self.stdout.write('Login URL: /accounts/discord/login/?process=login')
+            self.stdout.write('Callback URL: /accounts/discord/login/callback/')
+            
+        except SocialApp.DoesNotExist:
+            self.stdout.write(self.style.ERROR('Discord app not found'))

accounts/management/commands/update_social_apps_sites.py

@@ -0,0 +1,20 @@
+from django.core.management.base import BaseCommand
+from allauth.socialaccount.models import SocialApp
+from django.contrib.sites.models import Site
+
+class Command(BaseCommand):
+    help = 'Update social apps to be associated with all sites'
+
+    def handle(self, *args, **options):
+        # Get all sites
+        sites = Site.objects.all()
+        
+        # Update each social app
+        for app in SocialApp.objects.all():
+            self.stdout.write(f'Updating {app.provider} app...')
+            # Clear existing sites
+            app.sites.clear()
+            # Add all sites
+            for site in sites:
+                app.sites.add(site)
+            self.stdout.write(f'Added sites: {", ".join(site.domain for site in sites)}')

accounts/management/commands/verify_discord_settings.py

@@ -0,0 +1,36 @@
+from django.core.management.base import BaseCommand
+from allauth.socialaccount.models import SocialApp
+from django.contrib.sites.models import Site
+from django.urls import reverse
+from django.conf import settings
+
+class Command(BaseCommand):
+    help = 'Verify Discord OAuth2 settings'
+
+    def handle(self, *args, **options):
+        # Get Discord app
+        try:
+            discord_app = SocialApp.objects.get(provider='discord')
+            self.stdout.write('Found Discord app configuration:')
+            self.stdout.write(f'Client ID: {discord_app.client_id}')
+            self.stdout.write(f'Secret: {discord_app.secret}')
+            
+            # Get sites
+            sites = discord_app.sites.all()
+            self.stdout.write('\nAssociated sites:')
+            for site in sites:
+                self.stdout.write(f'- {site.domain} ({site.name})')
+            
+            # Show callback URL
+            callback_url = f'http://localhost:8000/accounts/discord/login/callback/'
+            self.stdout.write('\nCallback URL to configure in Discord Developer Portal:')
+            self.stdout.write(callback_url)
+            
+            # Show OAuth2 settings
+            self.stdout.write('\nOAuth2 settings in settings.py:')
+            discord_settings = settings.SOCIALACCOUNT_PROVIDERS.get('discord', {})
+            self.stdout.write(f'PKCE Enabled: {discord_settings.get("OAUTH_PKCE_ENABLED", False)}')
+            self.stdout.write(f'Scopes: {discord_settings.get("SCOPE", [])}')
+            
+        except SocialApp.DoesNotExist:
+            self.stdout.write(self.style.ERROR('Discord app not found'))