Merge pull request #114 from dtinit/user_oauth

User oauth

Author: aaronjae22

.env-example

@@ -2,4 +2,4 @@ PROJECT_NAME=ActivityPubTestbed
 DJANGO_SECRET_KEY=SECRETKEY
 DJANGO_DEBUG=True
 DJANGO_ALLOWED_HOSTS=localhost,127.0.0.1
-DJ_DATABASE_CONN_STRING=postgres://username:password@localhost:5432/database
+DJ_DATABASE_CONN_STRING=postgres://username:password@localhost:5432/database

static/scss/_base.scss

@@ -37,4 +37,3 @@ html {
   background: #fff;
   border-top: 1px solid #ccc;
 }
-

static/scss/index.scss

@@ -9,4 +9,54 @@
     padding: 10px;
     background: #f5f5f5;
   }
+
+  .messages {
+    list-style: none;
+    padding: 0;
+  }
+  .messages p {
+    margin-bottom: 1em;
+    padding: 0.7em;
+    border-radius: 4px;
+  }
+  .messages p.success {
+    background: #e3fdd7;
+    color: #102010;
+  }
+  .messages p.error {
+    background: #f2dede;
+    color: #a94442;
+  }
+
+  .oauth-form {
+    margin-top: 1em;
+  }
+  .oauth-form .form-group {
+    margin-bottom: 1em;
+  }
+  .oauth-form label {
+    font-weight: bold;
+    margin-bottom: 0.2em;
+    display: block;
+  }
+  .oauth-form .form-control {
+    width: 100%;
+    padding: 0.4em;
+    border: 1px solid #bbb;
+    border-radius: 4px;
+    box-sizing: border-box;
+    font-size: 1em;
+  }
+  .oauth-form .btn {
+    background: #1976d2;
+    color: #fff;
+    border: none;
+    padding: 0.5em 1.5em;
+    border-radius: 3px;
+    cursor: pointer;
+    font-size: 1em;
+  }
+  .oauth-form .btn:hover {
+    background: #1565c0;
+  }
 }

static/scss/reset.scss

@@ -5,7 +5,9 @@
   Modified to remove invalid property name
 */
 
-*, *::before, *::after {
+*,
+*::before,
+*::after {
   box-sizing: border-box;
 }
 
@@ -17,27 +19,45 @@ body {
   line-height: 1.5;
 }
 
-img, picture, video, canvas, svg {
+img,
+picture,
+video,
+canvas,
+svg {
   display: block;
   max-width: 100%;
 }
 
-input, button, textarea, select {
+input,
+button,
+textarea,
+select {
   font: inherit;
 }
 
-p, h1, h2, h3, h4, h5, h6 {
+p,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   overflow-wrap: break-word;
 }
 
 p {
   text-wrap: pretty;
 }
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   text-wrap: balance;
 }
 
-#root, #__next {
+#root,
+#__next {
   isolation: isolate;
 }
-

static/scss/site.scss

@@ -1,4 +1,3 @@
 @import "reset";
 @import "_base";
 @import "index";
-

testbed/core/forms/oauth_connection_form.py

@@ -0,0 +1,12 @@
+from django import forms
+from testbed.core.models import OauthConnection
+
+class OauthConnectionForm(forms.ModelForm):
+    class Meta:
+        model = OauthConnection
+        fields = ['client_id', 'client_secret', 'redirect_url']
+        widgets = {
+                    'client_id': forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'Client ID'}),
+                    'client_secret': forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'Client Secret'}),
+                    'redirect_url': forms.URLInput(attrs={'class': 'form-control', 'placeholder': 'Redirect URL'}),
+               }

testbed/core/migrations/0002_oauthconnection.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.1.3 on 2025-06-13 03:00
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OauthConnection',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('client_id', models.CharField(max_length=100)),
+                ('client_secret', models.CharField(max_length=255)),
+                ('redirect_url', models.URLField()),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

testbed/core/models.py

@@ -239,3 +239,13 @@ def add_activity(self, activity):
             self.activities_like.add(activity)
         elif isinstance(activity, FollowActivity):
             self.activities_follow.add(activity)
+
+class OauthConnection(models.Model):
+    user = models.OneToOneField(User, on_delete=models.CASCADE)
+    client_id = models.CharField(max_length=100)
+    client_secret = models.CharField(max_length=255)
+    redirect_url = models.URLField()
+
+    def __str__(self):
+        return f"OAuth for {self.user.username}"
+

testbed/core/templates/index.html

@@ -2,6 +2,13 @@
 
 {% block content %}
 <main class="index">
+  {% if messages %}
+  <ul class="messages">
+    {% for message in messages %}
+    <p class="{{ message.tags }}">{{ message }}</p>
+    {% endfor %}
+  </ul>
+  {% endif %}
   <h1>ActivityPub Account Portability Testbed</h1>
   <br />
   {% if user.is_authenticated %}
@@ -45,5 +52,19 @@ <h3>Destination</h3>
     Accounts on this site are not full ActivityPub accounts in that they are not shared to the Fediverse or truly federated with other ActivityPubservers.
   </p>
   {% endif %}
+    </div>
+
+  <h3>Update Your OAuth Connection</h3>
+
+      {% if oauth_form %}
+      <div class="actor">
+      <form method="post" class="oauth-form">
+        {% csrf_token %}
+        {{ oauth_form.as_p }}
+        <br/>
+        <button type="submit">Update</button>
+      </form>
+      </div>
+      {% endif %}
 </main>
 {% endblock %}

testbed/core/utils/utils.py

@@ -0,0 +1,8 @@
+import string
+import secrets
+
+def random_client_id(length=10):
+    return ''.join(secrets.choice(string.ascii_letters + string.digits) for _ in range(length))
+
+def random_client_secret(length=40):
+    return ''.join(secrets.choice(string.ascii_letters + string.digits) for _ in range(length))