django-chelseru 1.0.3__py3-none-any.whl → 1.0.5__py3-none-any.whl

{django_chelseru-1.0.3.dist-info → django_chelseru-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-chelseru
-Version: 1.0.3
+Version: 1.0.5
 Summary: Authentication system, online and real-time chat, SMS system for Iranian SMS services.
 Home-page: https://pipdjango.chelseru.com
 Author: Sobhan Bahman|Rashnu
@@ -59,9 +59,10 @@ pip install django-chelseru
 
 INSTALLED_APPS = [
     ...
-    'drfchelseru',
+    'channels',
     'rest_framework',
     'rest_framework_simplejwt',
+    'drfchelseru',
     ...
 ]
 

{django_chelseru-1.0.3.dist-info → django_chelseru-1.0.5.dist-info}/RECORD

@@ -1,15 +1,15 @@
-django_chelseru-1.0.3.dist-info/licenses/LICENSE,sha256=VupU5KV4NteHaNQb-WH31G_WZWezxXoomjiCIAHoQJo,1089
+django_chelseru-1.0.5.dist-info/licenses/LICENSE,sha256=VupU5KV4NteHaNQb-WH31G_WZWezxXoomjiCIAHoQJo,1089
 drfchelseru/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-drfchelseru/admin.py,sha256=sHmAevggh4O6sQJI1oFB_0vaDfXQ6vx7lP42GeJ6gSg,836
+drfchelseru/admin.py,sha256=8X67Sy8k5qQzZ4ifuJ_5O-UqVWby4uX53Iq-KNuODxM,948
 drfchelseru/apps.py,sha256=hOTTzFGLXiTPZeN8p_LLcSECLtsR2Q0SUo8zJzgM-qQ,211
-drfchelseru/consumers.py,sha256=3qP7nR56ozH2tMvhz4Wi7WsBg4qIS-Z4hwQ2A5r1HnA,2534
+drfchelseru/consumers.py,sha256=x64hPCd5FViFsFMyDIcxPOh2OWVpeNq1BaOdhYk0HUI,2620
 drfchelseru/middlewares.py,sha256=adrhoJE7uo4WISfSIXK41XMQQzMaBshq3r61RblMPAQ,2570
-drfchelseru/models.py,sha256=w_UMGSjOQUIrtg5iGmK5UTaC85lJfQoA-iEdkNHHwNw,3730
+drfchelseru/models.py,sha256=ssPPFNp2omohsvw9PCwFupo-MXFv4FWR4UsBxH9udPw,6361
 drfchelseru/routing.py,sha256=SEWMBmRFZs1NkKLuppXpmvRmyWiTY3KVIHmA4EpUyyI,167
 drfchelseru/serializers.py,sha256=tM7dN362Vdx0UXq6OfNmYh6rTN1bwFoEgOn1MG4CZIY,1299
-drfchelseru/services.py,sha256=V8mdeeHjmqUFAQLAyaEm3JTk-E8V8SfQMQhXoYdjt_c,10134
-drfchelseru/settings.py,sha256=pvGW6aMCrkW9kph_Zw6B_9qYeWb7wuIrUM1Lnu8kjhU,9055
-drfchelseru/signals.py,sha256=2jISUF_jQVZD06tOqHasXtneZKVCrpeIJQeHo9BjLc0,1428
+drfchelseru/services.py,sha256=FkJlsFtTSiwwQ6g-nkSuV8XvY-dX-abAY_0WGbD0Ppw,10139
+drfchelseru/settings.py,sha256=ksiuFgjf1HZC6dajQXEra67WyUH6vYqjcQT81NdhELw,9051
+drfchelseru/signals.py,sha256=nmFv208GW9nir9PAB0a1050OMh4I9em0n60O6Mgfwec,2554
 drfchelseru/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 drfchelseru/urls.py,sha256=2RllsBPgojGLxLkyaBsSGk7fU1q44nuA7I_VpeHCmbs,702
 drfchelseru/validators.py,sha256=jAJASfG4kPcqrGxxIcoR8VjS4L4n_EzZuxJtQ1g9qmo,480
@@ -20,8 +20,13 @@ drfchelseru/migrations/0003_rename_mobile_otpcode_mobile_number.py,sha256=eiD7t6
 drfchelseru/migrations/0004_rename_message_message_sms.py,sha256=FxsPAtgioB-Ei6cZFj7B0E1DpBDiYJvqKtom9YiXknM,357
 drfchelseru/migrations/0005_rename_message_sms_messagesms_chatroom_messagechat.py,sha256=ZJfFmeF4pXuhDSdz8ilOxXEBujEhnFQCAv564Dh4CGc,1586
 drfchelseru/migrations/0006_alter_chatroom_user_1_alter_chatroom_user_2_and_more.py,sha256=m7ew_V1jXVPOVkKZO7WoWS473hMRZU_NwfGDnU_ZN4o,1394
+drfchelseru/migrations/0007_chatroom_pinned_for_chatroom_status_chatroom_users_and_more.py,sha256=GRY3_oOuwCNyqXySIktKn7FiJ20ZBdbO4igxf-N3IbY,4532
+drfchelseru/migrations/0008_alter_chatroompermissions_user.py,sha256=d-LTEpAJhDlhCt895eNRPu9iXzveHqp5oWtgRRL3WhE,661
+drfchelseru/migrations/0009_alter_chatroom_status.py,sha256=QaAEUpERV8rnN-ifimA-HfQ8yLk4Gc8T6kER_DtBznk,488
+drfchelseru/migrations/0010_chatroom_banneds_chatroom_descriptions_chatroom_name_and_more.py,sha256=aeotKPmdFJSjeA2-9VGApLfpx-NJkOrRJI2j2mdkf1U,1198
+drfchelseru/migrations/0011_alter_chatroom_user_1_alter_chatroom_user_2.py,sha256=9R66LzIujkh_4BpWtobpOvx3NALsMKUmtI5GDZXoSxQ,971
 drfchelseru/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_chelseru-1.0.3.dist-info/METADATA,sha256=Y8drr6tJnUk04Z84_hhFm_2cACWE_n5bI2vDMHrSxls,9655
-django_chelseru-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_chelseru-1.0.3.dist-info/top_level.txt,sha256=fsaO1F03W3j4AYi0TfDGv5Cjb_Qrh6RSkwkWqfqaMns,12
-django_chelseru-1.0.3.dist-info/RECORD,,
+django_chelseru-1.0.5.dist-info/METADATA,sha256=W0SPfo8dGr3MCo31Qv9_nkSBlDlhBdMQCRjNhdbRddM,9671
+django_chelseru-1.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_chelseru-1.0.5.dist-info/top_level.txt,sha256=fsaO1F03W3j4AYi0TfDGv5Cjb_Qrh6RSkwkWqfqaMns,12
+django_chelseru-1.0.5.dist-info/RECORD,,

drfchelseru/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from .models import User, OTPCode, Session, MessageSMS, ChatRoom, MessageChat
+from .models import User, OTPCode, Session, MessageSMS, ChatRoom, MessageChat, ChatRoomPermissions, Organization
 
 
 @admin.register(User)
@@ -24,6 +24,10 @@ class MessageAdmin(admin.ModelAdmin):
     ordering = ('-created_at', )
 
 
+
+
+
 admin.site.register(ChatRoom)
 admin.site.register(MessageChat)
-
+admin.site.register(ChatRoomPermissions)
+admin.site.register(Organization)

drfchelseru/consumers.py

@@ -10,6 +10,8 @@ User = get_user_model()
 class ChatConsumer(AsyncWebsocketConsumer):
     @sync_to_async
     def is_user_in_chat_room(self, user, chat_room):
+        if chat_room.users.filter(user__id=user.id).exists():
+            return True
         return user == chat_room.user_1 or user == chat_room.user_2
 
     async def connect(self):

drfchelseru/migrations/0007_chatroom_pinned_for_chatroom_status_chatroom_users_and_more.py

@@ -0,0 +1,131 @@
+# Generated by Django 5.1.6 on 2025-08-16 09:02
+
+import django.db.models.deletion
+import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("drfchelseru", "0006_alter_chatroom_user_1_alter_chatroom_user_2_and_more"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="chatroom",
+            name="pinned_for",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="pinned_drf_chelseru",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AddField(
+            model_name="chatroom",
+            name="status",
+            field=models.IntegerField(
+                default=1, verbose_name=[(1, "Open"), (2, "Close")]
+            ),
+        ),
+        migrations.AddField(
+            model_name="chatroom",
+            name="users",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="users_drf_chelseru",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AddField(
+            model_name="messagechat",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True, default=django.utils.timezone.now
+            ),
+            preserve_default=False,
+        ),
+        migrations.CreateModel(
+            name="ChatRoomPermissions",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "access",
+                    models.IntegerField(
+                        choices=[
+                            (0, "Read Only"),
+                            (1, "Member"),
+                            (2, "Can Add Members"),
+                            (3, "Can Kick Members"),
+                            (4, "Can Ban Members"),
+                            (5, "Can Add Access"),
+                            (6, "Can Remove Accessa"),
+                            (7, "Can Kick Admins"),
+                            (8, "Can Close Chat Room"),
+                            (9, "Can ReOpen Chat Room"),
+                            (10, "Can Rename Chat Room"),
+                            (11, "Can Update Chatroom Avatar"),
+                            (12, "Can Delete Chat Room"),
+                        ],
+                        default=1,
+                    ),
+                ),
+                ("user", models.ManyToManyField(to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.AddField(
+            model_name="chatroom",
+            name="permissions",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="permissions_drf_chelseru",
+                to="drfchelseru.chatroompermissions",
+            ),
+        ),
+        migrations.CreateModel(
+            name="Organization",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=45)),
+                ("uname", models.CharField(max_length=45, unique=True)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                (
+                    "owner",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.DO_NOTHING,
+                        related_name="organization_drf_chelseru",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+        migrations.AddField(
+            model_name="chatroom",
+            name="organization",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                related_name="chatroom_drf_chelseru",
+                to="drfchelseru.organization",
+            ),
+        ),
+    ]

drfchelseru/migrations/0008_alter_chatroompermissions_user.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.1.6 on 2025-08-16 09:02
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "drfchelseru",
+            "0007_chatroom_pinned_for_chatroom_status_chatroom_users_and_more",
+        ),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="chatroompermissions",
+            name="user",
+            field=models.ManyToManyField(
+                related_name="user_drf_chelseru", to=settings.AUTH_USER_MODEL
+            ),
+        ),
+    ]

drfchelseru/migrations/0009_alter_chatroom_status.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.1.6 on 2025-08-16 09:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("drfchelseru", "0008_alter_chatroompermissions_user"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="chatroom",
+            name="status",
+            field=models.IntegerField(
+                default=1, verbose_name=[(1, "Open"), (2, "Close"), (3, "Hold")]
+            ),
+        ),
+    ]

drfchelseru/migrations/0010_chatroom_banneds_chatroom_descriptions_chatroom_name_and_more.py

@@ -0,0 +1,41 @@
+# Generated by Django 5.1.6 on 2025-08-16 09:30
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("drfchelseru", "0009_alter_chatroom_status"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="chatroom",
+            name="banneds",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="bans_drf_chelseru",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AddField(
+            model_name="chatroom",
+            name="descriptions",
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="chatroom",
+            name="name",
+            field=models.CharField(blank=True, max_length=45, null=True),
+        ),
+        migrations.AlterField(
+            model_name="chatroom",
+            name="status",
+            field=models.IntegerField(
+                choices=[(1, "Open"), (2, "Close"), (3, "Hold")], default=1
+            ),
+        ),
+    ]

drfchelseru/migrations/0011_alter_chatroom_user_1_alter_chatroom_user_2.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.1.6 on 2025-08-16 19:49
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('drfchelseru', '0010_chatroom_banneds_chatroom_descriptions_chatroom_name_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='chatroom',
+            name='user_1',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='user1_chats_drf_chelseru', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='chatroom',
+            name='user_2',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='user2_chats_drf_chelseru', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

drfchelseru/models.py

@@ -79,10 +79,75 @@ class MessageSMS(models.Model):
         return f'to: {self.mobile_number} , at: {self.created_at}'
     
 
+class Organization(models.Model):
+    owner = models.OneToOneField(UserGet, related_name='organization_drf_chelseru', on_delete=models.DO_NOTHING)
+    name = models.CharField(max_length=45)
+    uname = models.CharField(max_length=45, unique=True)
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return f'owner: {self.owner} - unique name: {self.uname}'
+
+
+class ChatRoomPermissions(models.Model):
+    READ_ONLY = 0
+    MEMBER = 1
+    CAN_ADD_MEMBER = 2
+    CAN_KICK_MEMBER = 3
+    CAN_BAN_MEMBER = 4
+    CAN_ADD_ACCESS = 5
+    CAN_REMOVE_ACCESS = 6
+    CAN_KICK_ADMIN = 7
+    CAN_CLOSE_CHAT = 8
+    CAN_REOPEN_CHAT = 9
+    CAN_RENAME_CHAT = 10
+    CAN_UPDATE_AVATAR = 11
+    CAN_DELETE_CHAT = 12
+
+    ACCESS_CHOICES = [
+        (READ_ONLY, 'Read Only'),
+        (MEMBER, 'Member'),
+        (CAN_ADD_MEMBER, 'Can Add Members'),
+        (CAN_KICK_MEMBER, 'Can Kick Members'),
+        (CAN_BAN_MEMBER, 'Can Ban Members'),
+        (CAN_ADD_ACCESS, 'Can Add Access'),
+        (CAN_REMOVE_ACCESS, 'Can Remove Accessa'),
+        (CAN_KICK_ADMIN, 'Can Kick Admins'),
+        (CAN_CLOSE_CHAT, 'Can Close Chat Room'),
+        (CAN_REOPEN_CHAT, 'Can ReOpen Chat Room'),
+        (CAN_RENAME_CHAT, 'Can Rename Chat Room'),
+        (CAN_UPDATE_AVATAR, 'Can Update Chatroom Avatar'),
+        (CAN_DELETE_CHAT, 'Can Delete Chat Room'),
+    ]
+    user = models.ManyToManyField(UserGet, related_name='user_drf_chelseru')
+    access = models.IntegerField(choices=ACCESS_CHOICES, default=MEMBER)
+
+    def __str__(self):
+        return f'user: {self.user} - access: {self.access}'
+
 
 class ChatRoom(models.Model):
-    user_1 = models.ForeignKey(UserGet, on_delete=models.CASCADE, related_name='user1_chats_drf_chelseru')
-    user_2 = models.ForeignKey(UserGet, on_delete=models.CASCADE, related_name='user2_chats_drf_chelseru')
+    STATUS_OPEN = 1
+    STATUS_CLOSE = 2
+    STATUS_HOLD = 3
+
+    STATUS_CHOICES = [
+        (STATUS_OPEN, 'Open'),
+        (STATUS_CLOSE, 'Close'),
+        (STATUS_HOLD, 'Hold')
+    ]
+
+    user_1 = models.ForeignKey(UserGet, on_delete=models.CASCADE, related_name='user1_chats_drf_chelseru', blank=True, null=True)
+    user_2 = models.ForeignKey(UserGet, on_delete=models.CASCADE, related_name='user2_chats_drf_chelseru', blank=True, null=True)
+
+    users = models.ManyToManyField(UserGet, blank=True, related_name='users_drf_chelseru')
+    organization = models.ForeignKey(Organization, on_delete=models.DO_NOTHING, related_name='chatroom_drf_chelseru', blank=True, null=True)
+    pinned_for = models.ManyToManyField(UserGet, blank=True, related_name='pinned_drf_chelseru')
+    permissions = models.ManyToManyField(ChatRoomPermissions, blank=True, related_name='permissions_drf_chelseru')
+    status = models.IntegerField(choices=STATUS_CHOICES, default=STATUS_OPEN)
+    banneds = models.ManyToManyField(UserGet, blank=True, related_name='bans_drf_chelseru')
+    name = models.CharField(max_length=45, blank=True, null=True)
+    descriptions = models.TextField(blank=True, null=True)
 
     created_at = models.DateTimeField(auto_now_add=True)
 
@@ -96,5 +161,7 @@ class MessageChat(models.Model):
     text = models.TextField()
     timestamp = models.DateTimeField(auto_now_add=True)
 
+    created_at = models.DateTimeField(auto_now_add=True)
+
     def __str__(self):
         return f"iD: {self.id} | Message from {self.sender.username} at {self.timestamp} | Chatroom ID: {self.chat_room.id}"

drfchelseru/services.py

@@ -152,7 +152,7 @@ class KavenegarCom:
 
 
 
-def send_message(mobile_number, message_text, data, template_id=None):
+def send_message(mobile_number, message_text, data=None, template_id=None):
     try:
         icheck = sms_init_check()
         if not (icheck and isinstance(icheck, dict) and 'SMS_SERVICE' in icheck and 'SETTINGS' in icheck):

drfchelseru/settings.py

@@ -6,7 +6,7 @@ DJANGO_CHELSERU = {
         'OPTIONS': {
             'OTP_LENGTH'            : 8,    # DEFAULT 8
             'OTP_EXPIRE_PER_MINUTES': 4,    # DEFAULT 4
-            'OTP_SMS_TEMPLATE_ID'       : 1,    
+            'OTP_SMS_TEMPLATE_ID'   : 1,    
         }
     },
     'SMS': {

drfchelseru/signals.py

@@ -4,6 +4,16 @@ from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
 import requests
 
+from urllib.parse import parse_qs
+from channels.middleware import BaseMiddleware
+from django.contrib.auth.models import AnonymousUser
+from rest_framework_simplejwt.tokens import AccessToken
+from django.contrib.auth import get_user_model
+from asgiref.sync import sync_to_async
+
+UserGet = get_user_model()
+
+
 # @receiver(post_save, sender=User)
 # def create_user_profile(sender, instance, created, **kwargs):
 #     if created:
@@ -35,4 +45,32 @@ def send_email_after_create(sender, instance, **kwargs):
     except:
         pass
 
-    
+    
+
+
+
+
+@sync_to_async
+def get_user(validated_token):
+    try:
+        user_id = validated_token["user_id"]
+        return UserGet.objects.get(id=user_id)
+    except UserGet.DoesNotExist:
+        return AnonymousUser()
+
+class JWTAuthMiddleware(BaseMiddleware):
+    async def __call__(self, scope, receive, send):
+        query_string = scope.get("query_string", b"").decode()
+        query_params = parse_qs(query_string)
+        token = query_params.get("token")
+        
+        if token:
+            try:
+                access_token = AccessToken(token[0])
+                scope["user"] = await get_user(access_token)
+            except Exception as e:
+                scope["user"] = AnonymousUser()
+        else:
+            scope["user"] = AnonymousUser()
+
+        return await super().__call__(scope, receive, send)