Merge branch 'feat/self_hosted_instance' of github.com:makeplane/plane into develop-deploy

apiserver/plane/bgtasks/magic_link_code_task.py

@@ -33,8 +33,8 @@ def magic_link(email, key, token, current_site):
             username=get_configuration_value(instance_configuration, "EMAIL_HOST_USER"),
             password=get_configuration_value(instance_configuration, "EMAIL_HOST_PASSWORD"),
             use_tls=bool(get_configuration_value(instance_configuration, "EMAIL_USE_TLS", "1")),
-            use_ssl=bool(get_configuration_value(instance_configuration, "EMAIL_USE_SSL", "0")),
         )
+
         # Initiate email alternatives
         msg = EmailMultiAlternatives(subject=subject, body=text_content, from_email=get_configuration_value(instance_configuration, "EMAIL_FROM"), to=[email], connection=connection)
         msg.attach_alternative(html_content, "text/html")

apiserver/plane/license/migrations/0002_alter_instanceadmin_unique_together.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.5 on 2023-11-16 09:45
+
+from django.conf import settings
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('license', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='instanceadmin',
+            unique_together={('instance', 'user')},
+        ),
+    ]

apiserver/plane/license/models/instance.py

@@ -53,6 +53,7 @@ class InstanceAdmin(BaseModel):
     role = models.PositiveIntegerField(choices=ROLE_CHOICES, default=15)
 
     class Meta:
+        unique_together = ["instance", "user"]
         verbose_name = "Instance Admin"
         verbose_name_plural = "Instance Admins"
         db_table = "instance_admins"