Merge pull request #1518 from breatheco-de/main

Merge main into dev

breathecode/admissions/migrations/0065_alter_cohortuser_educational_status.py

@@ -0,0 +1,32 @@
+# Generated by Django 5.1.2 on 2024-11-29 17:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("admissions", "0064_academy_legal_name"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="cohortuser",
+            name="educational_status",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("ACTIVE", "Active"),
+                    ("POSTPONED", "Postponed"),
+                    ("GRADUATED", "Graduated"),
+                    ("SUSPENDED", "Suspended"),
+                    ("DROPPED", "Dropped"),
+                    ("NOT_COMPLETING", "Not Completing"),
+                ],
+                db_index=True,
+                default="ACTIVE",
+                max_length=15,
+                null=True,
+            ),
+        ),
+    ]

breathecode/admissions/models.py

@@ -468,12 +468,14 @@ def __str__(self):
 SUSPENDED = "SUSPENDED"
 GRADUATED = "GRADUATED"
 DROPPED = "DROPPED"
+NOT_COMPLETING = "NOT_COMPLETING"
 EDU_STATUS = (
     (ACTIVE, "Active"),
     (POSTPONED, "Postponed"),
     (GRADUATED, "Graduated"),
     (SUSPENDED, "Suspended"),
     (DROPPED, "Dropped"),
+    (NOT_COMPLETING, "Not Completing"),
 )
 
 

breathecode/assignments/management/commands/schedule_repository_deletions.py

@@ -17,7 +17,7 @@
 
 class Command(BaseCommand):
     help = "Clean data from marketing module"
-    github_url_pattern = re.compile(r"https?:\/\/github\.com\/(?P<user>[^\/]+)\/(?P<repo>[^\/\s]+)\/?")
+    github_url_pattern = re.compile(r"https?://github\.com/(?P<user>[^/\s]+)/(?P<repo>[^/\s]+)/?")
 
     def handle(self, *args, **options):
         self.fill_whitelist()

breathecode/assignments/migrations/0020_alter_userattachment_mime.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.2 on 2024-11-29 20:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("assignments", "0019_repositorydeletionorder_starts_transferring_at"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="userattachment",
+            name="mime",
+            field=models.CharField(max_length=120),
+        ),
+    ]

breathecode/assignments/migrations/0021_alter_repositorydeletionorder_repository_name_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 5.1.4 on 2024-12-09 20:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("assignments", "0020_alter_userattachment_mime"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="repositorydeletionorder",
+            name="repository_name",
+            field=models.CharField(max_length=256),
+        ),
+        migrations.AlterField(
+            model_name="repositorydeletionorder",
+            name="repository_user",
+            field=models.CharField(max_length=256),
+        ),
+        migrations.AlterField(
+            model_name="repositorywhitelist",
+            name="repository_name",
+            field=models.CharField(max_length=256),
+        ),
+        migrations.AlterField(
+            model_name="repositorywhitelist",
+            name="repository_user",
+            field=models.CharField(max_length=256),
+        ),
+    ]

breathecode/assignments/models.py

@@ -13,7 +13,7 @@
 class UserAttachment(models.Model):
     slug = models.SlugField(max_length=150, unique=True)
     name = models.CharField(max_length=150)
-    mime = models.CharField(max_length=60)
+    mime = models.CharField(max_length=120)
     url = models.URLField(max_length=255)
     hash = models.CharField(max_length=64)
 
@@ -268,8 +268,8 @@ def __init__(self, *args, **kwargs):
     status = models.CharField(max_length=15, choices=Status, default=Status.PENDING)
     status_text = models.TextField(default=None, null=True, blank=True)
 
-    repository_user = models.CharField(max_length=100)
-    repository_name = models.CharField(max_length=100)
+    repository_user = models.CharField(max_length=256)
+    repository_name = models.CharField(max_length=256)
 
     starts_transferring_at = models.DateTimeField(default=None, null=True, blank=True)
     created_at = models.DateTimeField(auto_now_add=True, editable=False)
@@ -296,8 +296,8 @@ class RepositoryWhiteList(models.Model):
     Provider = Provider
 
     provider = models.CharField(max_length=15, choices=Provider, default=Provider.GITHUB)
-    repository_user = models.CharField(max_length=100)
-    repository_name = models.CharField(max_length=100)
+    repository_user = models.CharField(max_length=256)
+    repository_name = models.CharField(max_length=256)
 
     created_at = models.DateTimeField(auto_now_add=True, editable=False)
 

breathecode/assignments/views.py

@@ -64,6 +64,8 @@
     "application/octet-stream",
     "application/json",
     "text/plain",
+    "application/msword",
+    "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
 ]
 
 IMAGES_MIME_ALLOW = ["image/png", "image/svg+xml", "image/jpeg", "image/jpg"]

breathecode/authenticate/admin.py

@@ -162,7 +162,7 @@ def clear_user_password(modeladmin, request, queryset):
 
 @admin.register(UserProxy)
 class UserAdmin(UserAdmin):
-    list_display = ("username", "email", "first_name", "last_name", "is_staff", "github_login")
+    list_display = ("username", "email", "first_name", "last_name", "is_staff", "github_login", "google_login")
     actions = [clean_all_tokens, clean_expired_tokens, send_reset_password, clear_user_password]
 
     def get_queryset(self, request):
@@ -176,6 +176,11 @@ def github_login(self, obj):
             f"<a rel='noopener noreferrer' target='_blank' href='/v1/auth/github/?user={obj.id}&url={self.github_callback}'>connect github</a>"
         )
 
+    def google_login(self, obj):
+        return format_html(
+            "<a rel='noopener noreferrer' target='_blank' href='/v1/auth/academy/google'>connect google</a>"
+        )
+
 
 @admin.register(Role)
 class RoleAdmin(admin.ModelAdmin):
@@ -473,12 +478,21 @@ def clean_errors(modeladmin, request, queryset):
 
 @admin.register(AcademyAuthSettings)
 class AcademyAuthSettingsAdmin(admin.ModelAdmin):
-    list_display = ("academy", "github_is_sync", "github_errors", "github_username", "github_owner", "authenticate")
+    list_display = (
+        "academy",
+        "github_is_sync",
+        "github_errors",
+        "github_username",
+        "github_owner",
+        "authenticate_github",
+        "authenticate_google",
+    )
     search_fields = ["academy__slug", "academy__name", "github__username", "academy__id"]
     actions = (clean_errors, activate_github_sync, deactivate_github_sync, sync_github_members)
     raw_id_fields = ["github_owner", "google_cloud_owner"]
 
     def get_queryset(self, request):
+        self.admin_request = request
 
         self.github_callback = "https://4geeks.com"
         self.github_callback = str(base64.urlsafe_b64encode(self.github_callback.encode("utf-8")), "utf-8")
@@ -490,16 +504,27 @@ def github_errors(self, obj):
         else:
             return format_html("<span class='badge bg-success'>No errors</span>")
 
-    def authenticate(self, obj):
+    def authenticate_github(self, obj):
         settings = AcademyAuthSettings.objects.get(id=obj.id)
         if settings.github_owner is None:
             return format_html("no owner")
 
         scopes = str(base64.urlsafe_b64encode(b"user repo admin:org"), "utf-8")
         return format_html(
-            f"<a href='/v1/auth/github?user={obj.github_owner.id}&url={self.github_callback}&scope={scopes}'>connect owner</a>"
+            f"<a href='/v1/auth/github?user={obj.github_owner.id}&url={self.github_callback}&scope={scopes}'>connect github</a>"
         )
 
+    def authenticate_google(self, obj):
+        settings = AcademyAuthSettings.objects.get(id=obj.id)
+        if settings.google_cloud_owner is None:
+            return format_html("no google cloud owner")
+
+        request = getattr(self, "admin_request", None)
+        current_url = f"{request.scheme}://{request.get_host()}{request.get_full_path()}"
+        current_url = str(base64.urlsafe_b64encode(current_url.encode("utf-8")), "utf-8")
+
+        return format_html(f"<a href='/v1/auth/academy/google?url={current_url}'>connect google</a>")
+
 
 @admin.register(GoogleWebhook)
 class GoogleWebhookAdmin(admin.ModelAdmin):

breathecode/authenticate/flags.py

@@ -2,7 +2,7 @@
 
 from capyc.core.managers import feature
 
-flags = feature.flags
+flags = feature._flags
 
 
 @feature.availability("authenticate.set_google_credentials")

breathecode/authenticate/management/commands/create_academy_roles.py

@@ -95,6 +95,8 @@
     {"slug": "read_mentorship_bill", "description": "Read all mentroship bills from one academy"},
     {"slug": "read_asset", "description": "Read all academy registry assets"},
     {"slug": "crud_asset", "description": "Update, create and delete registry assets"},
+    {"slug": "read_asset_error", "description": "Update, create and delete asset errors"},
+    {"slug": "crud_asset_error", "description": "Update, create and delete asset errors"},
     {"slug": "read_content_variables", "description": "Read all academy content variables used in the asset markdowns"},
     {
         "slug": "crud_content_variables",
@@ -361,6 +363,8 @@ def extend_roles(roles: list[RoleType]) -> None:
                 "read_my_academy",
                 "read_asset",
                 "crud_asset",
+                "read_asset_error",
+                "crud_asset_error",
                 "read_category",
                 "crud_category",
                 "read_content_variables",

breathecode/authenticate/urls.py

@@ -37,8 +37,8 @@
     LoginView,
     LogoutView,
     MeInviteView,
-    MeProfileAcademyInvite,
     MemberView,
+    MeProfileAcademyInvite,
     PasswordResetView,
     ProfileInviteMeView,
     ProfileMePictureView,
@@ -63,6 +63,7 @@
     pick_password,
     receive_google_webhook,
     render_academy_invite,
+    render_google_connect,
     render_invite,
     render_user_invite,
     reset_password_view,
@@ -154,6 +155,7 @@
     # google authentication oath2.0
     path("google/callback", save_google_token, name="google_callback"),
     path("google/<str:token>", get_google_token, name="google_token"),
+    path("academy/google", render_google_connect, name="academy_google_token"),
     path("gitpod/sync", sync_gitpod_users_view, name="sync_gitpod_users"),
     # sync with gitHUB
     path("academy/github/user", GithubUserView.as_view(), name="github_user"),

breathecode/authenticate/views.py

@@ -6,7 +6,7 @@
 import re
 import urllib.parse
 from datetime import timedelta
-from urllib.parse import parse_qs, urlencode
+from urllib.parse import parse_qs, urlencode, urlparse
 
 import aiohttp
 import requests
@@ -2251,6 +2251,28 @@ async def async_iter(iterable: list):
                 raise APIException("Error from google credentials")
 
 
+@private_view()
+def render_google_connect(request, token):
+    callback_url = request.GET.get("url", None)
+
+    if not callback_url:
+        # Fallback to HTTP_REFERER if 'url' is not in the query string
+        referrer = request.META.get("HTTP_REFERER", "")
+        # Optionally, parse query parameters from the referrer if needed
+        if referrer:
+            parsed_referrer = urlparse(referrer)
+            query_params = parse_qs(parsed_referrer.query)
+            callback_url = str(base64.urlsafe_b64encode(query_params.get("url", [None])[0].encode("utf-8")), "utf-8")
+
+    if callback_url is None:
+        raise ValidationException("Callback URL specified", slug="no-callback")
+
+    token, created = Token.get_or_create(user=request.user, token_type="one_time")
+
+    url = f"/v1/auth/google/{token}?url={callback_url}"
+    return HttpResponseRedirect(redirect_to=url)
+
+
 @api_view(["POST"])
 @permission_classes([AllowAny])
 def receive_google_webhook(request):

breathecode/marketing/migrations/0092_coursetranslation_heading.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1.2 on 2024-12-12 14:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("marketing", "0091_course_cohorts_order"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="coursetranslation",
+            name="heading",
+            field=models.CharField(
+                blank=True,
+                default=None,
+                help_text="Heading that will be used in the landing page",
+                max_length=160,
+                null=True,
+            ),
+        ),
+    ]

breathecode/marketing/migrations/0093_alter_coursetranslation_heading.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1.2 on 2024-12-12 14:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("marketing", "0092_coursetranslation_heading"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="coursetranslation",
+            name="heading",
+            field=models.TextField(
+                blank=True,
+                default=None,
+                help_text="Heading that will be used in the landing page",
+                max_length=400,
+                null=True,
+            ),
+        ),
+    ]

breathecode/marketing/models.py

@@ -867,6 +867,9 @@ class CourseTranslation(models.Model):
     course = models.ForeignKey(Course, on_delete=models.CASCADE)
     lang = models.CharField(max_length=5, validators=[validate_language_code])
     title = models.CharField(max_length=60)
+    heading = models.TextField(
+        max_length=400, help_text="Heading that will be used in the landing page", default=None, null=True, blank=True
+    )
     description = models.TextField(max_length=400)
     short_description = models.CharField(max_length=120, null=True, default=None, blank=True)
     video_url = models.URLField(

breathecode/marketing/serializers.py

@@ -2,6 +2,7 @@
 import re
 from datetime import timedelta
 
+from capyc.rest_framework.exceptions import ValidationException
 from django.db.models.query_utils import Q
 from django.utils import timezone
 from rest_framework import serializers
@@ -11,7 +12,6 @@
 from breathecode.services.activecampaign.client import acp_ids
 from breathecode.utils import serpy
 from breathecode.utils.integer_to_base import to_base
-from capyc.rest_framework.exceptions import ValidationException
 
 from .models import AcademyAlias, ActiveCampaignAcademy, Automation, CourseTranslation, FormEntry, ShortLink, Tag
 
@@ -408,6 +408,7 @@ class GetCourseTranslationSerializer(serpy.Serializer):
     landing_variables = serpy.Field()
     landing_url = serpy.Field()
     video_url = serpy.Field()
+    heading = serpy.Field()
 
 
 class GetCourseSmallSerializer(serpy.Serializer):