From 1028b6c1e1675556ce39aa1c5c758b9a694fe8f4 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Thu, 3 Oct 2024 09:02:03 +0300
Subject: [PATCH] l

---
 .DS_Store                                     | Bin 8196 -> 8196 bytes
 osinaweb/.DS_Store                            | Bin 10244 -> 10244 bytes
 osinaweb/db.sqlite3                           | Bin 1990656 -> 1990656 bytes
 .../__pycache__/consumers.cpython-310.pyc     | Bin 19388 -> 19308 bytes
 osinaweb/osichat/consumers.py                 |  63 ++++++++----------
 .../__pycache__/consumers.cpython-310.pyc     | Bin 5714 -> 5714 bytes
 .../templates/chat_templates/chat-widget.html |   1 -
 .../osinaweb/__pycache__/asgi.cpython-310.pyc | Bin 947 -> 2281 bytes
 osinaweb/osinaweb/asgi.py                     |  51 +++++++++++---
 osinaweb/static/.DS_Store                     | Bin 10244 -> 10244 bytes
 osinaweb/static/images/.DS_Store              | Bin 10244 -> 10244 bytes
 osinaweb/static/js/osichat-admin/osichat.js   |   2 -
 12 files changed, 70 insertions(+), 47 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 34876ef90d16b08508421437de98dd6312248236..163881c9eab3f7651f872593bd7b0d9a2c0b6cb7 100644
GIT binary patch
delta 87
zcmZp1XmQwZRgg(qa`JV-JJJ!E$@zJ~nN_Lr0{q1p`Q@HKZa`6LS!Qba<a0t+;;9Q5
kK!7tOFF!9;*&zVTW8j=DFRaKYFxgR9oUv$gr0{AU020d?-2eap

delta 87
zcmZp1XmQwZRgg(iX7Y8xJJRt2{KXmh<(|p;c>zVKWtpkv5t%@CaAsBN<a0t+;(-Sk
kK!7tOFF!ApQ`sQ^%w?D?FRaKYIoVNIoH1*2r0{AU01vYn>i_@%

diff --git a/osinaweb/.DS_Store b/osinaweb/.DS_Store
index f1bb4d718863817c28929ba54d2f6365c29b784b..639018227dadb7090838fce4dfc1b7225db926bd 100644
GIT binary patch
delta 16
XcmZn(XbIS`S#<I;MwiXsMR|n)Jj(`s

delta 16
XcmZn(XbIS`S#)x=xclZ`qFh1%J0%87

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index ee8b69d3a6cd2cf0167f988985a4c1eb4ab29e60..d6d1ef972e253dae94ad2caa5982fce0ace97773 100644
GIT binary patch
delta 4645
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

delta 3810
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

diff --git a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc
index 502837df74878e5ed6d690dc0beeba01cbcd0049..5888301d418a234c4fd567b16f9b15f76997d469 100644
GIT binary patch
delta 5273
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
B$FBeY

delta 5369
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
bZQ`VAS$9T10nN!HjWz1x%etKVD_8v+#0%LQ

diff --git a/osinaweb/osichat/consumers.py b/osinaweb/osichat/consumers.py
index 2e9f1d42..3c709c6d 100644
--- a/osinaweb/osichat/consumers.py
+++ b/osinaweb/osichat/consumers.py
@@ -59,6 +59,7 @@ class OsitcomVisitor(WebsocketConsumer):
 
 class Osichat(WebsocketConsumer):
     def connect(self):
+        self.user = self.scope["user"]
         async_to_sync(self.channel_layer.group_add)(
             'osichat', self.channel_name
         )
@@ -75,7 +76,6 @@ class Osichat(WebsocketConsumer):
         
         if event_type == 'set_client_type':
             self.client_type = data.get('client_type')
-            self.user_id =  data.get('user_id')
             event = {
                 'type': 'get_chats_handler',
             }
@@ -112,10 +112,8 @@ class Osichat(WebsocketConsumer):
                 default=F('last_update'),
                 output_field=DateTimeField(),)).filter(chatroomguest__isnull=False).order_by('-order_key')
 
-        user = get_object_or_404(User, id=self.user_id)
-
         for room in chat_rooms:
-            room.number_of_unread = room.unread_messages(user)
+            room.number_of_unread = room.unread_messages(self.user)
         context = {
             'chat_rooms': chat_rooms,
         }
@@ -125,7 +123,7 @@ class Osichat(WebsocketConsumer):
             for chat_room in chat_rooms:
                 last_message = ChatMessage.objects.filter(room=chat_room).last()
                 room_data = model_to_dict(chat_room)
-                room_data['number_of_unread'] = chat_room.unread_messages(user)
+                room_data['number_of_unread'] = chat_room.unread_messages(self.user)
                 if last_message:
                     room_data['last_message'] = model_to_dict(last_message)
                 else:
@@ -158,8 +156,7 @@ class Osichat(WebsocketConsumer):
 
     def new_chat_update_handler(self, event):
         chat_room = get_object_or_404(ChatRoom, id=event['chatroom_id'])
-        user = get_object_or_404(User, id=self.user_id)
-        number_of_unread = ChatMessage.objects.filter(room=chat_room).exclude(member=user).exclude(chatmessageseen__member=user).count()
+        number_of_unread = ChatMessage.objects.filter(room=chat_room).exclude(member=self.user).exclude(chatmessageseen__member=self.user).count()
         last_message = ChatMessage.objects.filter(room=chat_room).last()
 
         context = {
@@ -189,40 +186,38 @@ class Osichat(WebsocketConsumer):
 
 
     def get_dms_handler(self, event):
-        if self.scope["user"].is_authenticated:
-            chat_rooms = ChatRoom.objects.annotate(last_update=Max('chatmessage__date_sent'),order_key=Case(
+        chat_rooms = ChatRoom.objects.annotate(last_update=Max('chatmessage__date_sent'),order_key=Case(
                     When(last_update__isnull=True, then=F('date_created')),
                     default=F('last_update'),
-                    output_field=DateTimeField(),)).filter(chatroomguest__isnull=True, chatmember__member=self.scope["user"]).order_by('-order_key')
-        else:
-            chat_rooms = None
+                    output_field=DateTimeField(),)).filter(chatroomguest__isnull=True, chatmember__member=self.user).order_by('-order_key')
         context = {
             'chat_rooms': chat_rooms,
         }
         if self.client_type == 'mobile_admin':
             chat_rooms_data = []
-            for chat_room in chat_rooms:
-                last_message = ChatMessage.objects.filter(room=chat_room).last()
-                chat_room_data = {
-                    'id': chat_room.id,
-                    'name': chat_room.name,
-                    'last_update': chat_room.last_updated,
-                    'date_created': chat_room.date_created,
-                    'unread_messages': chat_room.unread_messages(self.scope["user"]),
-                    'last_message': model_to_dict(last_message) if last_message else None
-                }
-                members = chat_room.chatmember_set.all()
-                member_data = []
-                for member in members:
-                    member_data.append({
-                        'id': member.member.id,
-                        'first_name': member.member.first_name,
-                        'last_name': member.member.last_name,
-                        'image': member.member.staffprofile.image.url if member.member.staffprofile and member.member.staffprofile.image else None
-                    })
-                
-                chat_room_data['members'] = member_data
-                chat_rooms_data.append(chat_room_data)
+            if chat_rooms:
+                for chat_room in chat_rooms:
+                    last_message = ChatMessage.objects.filter(room=chat_room).last()
+                    chat_room_data = {
+                        'id': chat_room.id,
+                        'name': chat_room.name,
+                        'last_update': chat_room.last_updated,
+                        'date_created': chat_room.date_created,
+                        'unread_messages': chat_room.unread_messages(self.user),
+                        'last_message': model_to_dict(last_message) if last_message else None
+                    }
+                    members = chat_room.chatmember_set.all()
+                    member_data = []
+                    for member in members:
+                        member_data.append({
+                            'id': member.member.id,
+                            'first_name': member.member.first_name,
+                            'last_name': member.member.last_name,
+                            'image': member.member.staffprofile.image.url if member.member.staffprofile and member.member.staffprofile.image else None
+                        })
+                    
+                    chat_room_data['members'] = member_data
+                    chat_rooms_data.append(chat_room_data)
     
             self.send(text_data=json.dumps({
                 'event_type': 'get_dms',
diff --git a/osinaweb/osinacore/__pycache__/consumers.cpython-310.pyc b/osinaweb/osinacore/__pycache__/consumers.cpython-310.pyc
index 9ec7b02772e7744a8cef673815105cd65186a28e..80ce340bd0f1ab5b2e6c4c629c8c598ed5f314ae 100644
GIT binary patch
delta 20
acmcblb4iCgpO=@50SFR={%+)U7Xtt}{skid

delta 20
acmcblb4iCgpO=@50SNY)9^c6AE(QQRR0VDT

diff --git a/osinaweb/osinacore/templates/chat_templates/chat-widget.html b/osinaweb/osinacore/templates/chat_templates/chat-widget.html
index 189eb5b8..ea969c75 100644
--- a/osinaweb/osinacore/templates/chat_templates/chat-widget.html
+++ b/osinaweb/osinacore/templates/chat_templates/chat-widget.html
@@ -1,5 +1,4 @@
 {% load static %}
-<p id="userId" class="hidden">{{request.user.id}}</p>
 <div id="osichatWidget" class="hidden fixed bg-black bg-opacity-50 inset-0 z-50 h-[100vh]">
     <div
         class="w-[950px] min-h-[500px] h-[80%] bg-white rounded-md border border-gray-200 shadow-xl z-20 right-9 bottom-24 grid grid-cols-3 fixed">
diff --git a/osinaweb/osinaweb/__pycache__/asgi.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/asgi.cpython-310.pyc
index d1b02939b42bac11e4b036f84b12002d01a70b30..a48d98417dc5ac7a7d489cb9c86a9821d61421a6 100644
GIT binary patch
literal 2281
zcmZuyOK;pZ5GJ)+t@fGq`jOa48ljiMee9w@(L)gwacb9bkl01mX;7i4EQ{Q=)|9A_
zT-$4`ffmlS|DXr^*jxWY|3sl{Prdh4ppPLHZ(OtzI2sN|)NsCUM!eaqA-EoTe-1iT
zgnreN>sJLP4`9gOK@j94f{DejkImEaEqIn#DY1PU>ouE|6UTRqUS^fV^<ASopjZ8>
z(JQQ$)ctzW@Ed0CvS!lqTSl+48%f)58@*Qe8NJTtl8)aodV|d;3;u%9n`|*z@|TR>
zVmEhn3^&-VWZ7TFh~m-8#ck3ibC(v(>~rMb*+is6=3gN)e{T7AX`SAoZF-lsXoGgn
zadDG{AFOlizeTJ*T3tN-rMA}J-0~ux4&tFV;KJiFPQzom?`49IXr#Ke+LrR@Nya6W
zo;sjj@kYp4xX-8;N-y*hPR5LWz~~WW-ccxGvy_GjCEng%m}M-ELKX9LZx8nS96pn9
zLA^MIFD7Qe<0)(&OK%V}`o1SAtsN+p$xnJc!Xw!wqc9!vtC%95^k~}qsQY2>fFCQ~
zBQ#@tlF(H3LOG0kwch|!w7rV+g&|dewguP10J|%xQgJ$zpxe(S74U4Xr97P^d@PN@
z$~#{Ou6V@R?j)nn_*hYqSD!z7QmF98{MuL@JdFuq^f(l>ufpgM%(vGV<HwXd;!?>S
z5f9_^%aFw+R2;q|9Ec6P79q`&M~4vLSg<TquzjlI>Fn(5)UR_Yx4GIliKPOon}tHs
z;HCD!?}Au@{lfhaY;uxDf#PsZQ1Yeq$7|c0J3)VAcXw-hvmZR&S%3ay<8<x{+wRrb
zBb}w|mj#mtFr){9BB%wV>%cD&i<Dj=-zGLG!?R2r;7=u=d;DVe-zhl#`b|1K#eq3W
zgpu;V5vGSU^#+0`hDeY|@8y_^i3cYGuE6nuOeq2Mm2nsYEI<;Y%ZO*R8|eVAF0JeF
z84RgweTt_jfKrCgu*SX|rzrqy<+h}3Am+g3M<nLq@y9nk4YBOe1o%c7izl?VPUWHE
zS+5UJCEk-T(~}(;D@`|(yIx9<jZ)CDFanBi6wS15Hp$%}h|^dF!95+Ej<SYNSN@Z&
z?v-0)gUi(g-3saR{0u|>1mZh9g|4)WF3=@9vlX7&=lHBVEnirG3mW1}KxY}9Ia5bG
zJiVn#QwP>7%2wr(GlF`bR*1cfNcnrb1?hQ&&fKXBJ39B#3zXiok*bVb7*$mplqPE!
z>08y$A)(smE0i{mk!noQs0n-FsWmN~mx`VGXo@bHh3#@?Tdi#84Fhc;m4GVC%LaRa
z;V`+Qag7N8WW^-6^=!43JA_7@P|?sXC8*lmIRdxAM6|#nbbj&*H-#bd(&$*_iyJ3d
zEGX&6!!%T5K{tfpBCoHTjm$*U^}A&)TrD&OR;!`|kGyOsl~)9fXnaI9Nm3$~^wR6t
z4K1a(sZBL=fIyd=SOJ5fQ6U!eIshI)PYi;$VJ7c@u)b|rF799(TiC^Sa04&l7PkJr
zWiMF&PlaNG?Nvwbrn_el<h39ux-007Ab2?r+3S@`5I}1T0<oyWc}ELP?Q22@CfXqG
z!jL)vF0vt(M#)%pVdy5CS7(iA^`3YS+;WRcp_%Kq3#NA?=+|9MZlSrH*JtK*AWGV@
z^2P#)?{`CJj9rMFGHI|gAo%U*AcUG^vMZpQ0x?W46#7@}H)m`5U4xf@duEd~8jDy>
zy0ch?E)%~!Yid_J>dJxMXnq()-1H=(ng0Dq!-u>9?Uq4|rlA_b`SWI*;*?q3h1i(%
z>$9(ueZ#`MLeryI@HDSMk0Nvsj+ydr6yKWtWlVDO`nCVfHB1ad1!L|Pz<#QWLVgUw
iMy?C!yuRBrO<T0RWjR*MvX(7il!a@+CF}3TU;hAb?S5zg

delta 398
zcmYjNyH3ME5WHKz9XoNF2vI~r&{#oE1r<VwKR|TXSjKlG4rgCvJEB3P$QPh%DS(ce
z9*K&7a7)D}qyf&ZnAPsiOfk~#_wdbH3*UE<!u!$Z^+ZGHs}=uYDsiT|x>tiDf+(iI
zF~MqU9CD3lxb<|d=LRuylbD@0xRu+)?zqXF+$C<uE#AvL;$g(_!hf3fsZE_{P*U3<
zGGGQ9Fq^r|WZnk1Mcqf(U=mQcL}5=J;H^A|eR&6CNnuC6z({UkavVaV&+B^GIJfMo
z66p=A!(n5^F%@YXHy|n%u}F%Uh*D9qD5+*y3G%@jnd)j(>hi<dJ2Vs}emYNzg7GR!
zR`tAWA3y?8WksT*qf)HuteBOSys*Pj(@U01o~22hiQ*NNL7NrGU7bx&azR&|onmEG
YV>NVSJ01ks>#DDrpnw6p7=FE<KMT)YA^-pY

diff --git a/osinaweb/osinaweb/asgi.py b/osinaweb/osinaweb/asgi.py
index cb95ebcd..10c36f8b 100644
--- a/osinaweb/osinaweb/asgi.py
+++ b/osinaweb/osinaweb/asgi.py
@@ -6,25 +6,56 @@ It exposes the ASGI callable as a module-level variable named ``application``.
 For more information on this file, see
 https://docs.djangoproject.com/en/4.1/howto/deployment/asgi/
 """
-
 import os
-
+import jwt
 from django.core.asgi import get_asgi_application
-from channels.routing import ProtocolTypeRouter, URLRouter  
-from channels.security.websocket import AllowedHostsOriginValidator
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.contrib.auth.models import AnonymousUser
+from channels.routing import ProtocolTypeRouter, URLRouter
 from channels.auth import AuthMiddlewareStack
-from osinaweb.routing import websocket_urlpatterns
-
+from channels.security.websocket import AllowedHostsOriginValidator
+from channels.routing import ProtocolTypeRouter
+from osinaweb.routing import websocket_urlpatterns  
+from django.core.exceptions import ObjectDoesNotExist
+from urllib.parse import parse_qs
+from osinacore.api.utils import *
+from channels.db import database_sync_to_async
 
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'osinaweb.settings')
 
 django_asgi_app = get_asgi_application()
 
+class JWTAuthMiddleware:
+    """Middleware to extract JWT token from the URL query parameters and set the user in the scope."""
+    def __init__(self, inner):
+        self.inner = inner
+
+    async def __call__(self, scope, receive, send):
+        # Extract the token from the URL query parameters
+        query_string = scope['query_string'].decode()  # Decode the query string
+        query_params = parse_qs(query_string)  # Parse the query string
+        token = query_params.get('token', [None])[0]
+        if token:
+            try:
+                token_data = verify(token)
+                user =  await database_sync_to_async(User.objects.get)(id=token_data['userid'])
+                scope['user'] = user
+            except (jwt.ExpiredSignatureError, jwt.DecodeError, ObjectDoesNotExist):
+                scope['user'] = AnonymousUser()  # Set user to AnonymousUser if there's an error
+        else:
+            # No JWT token provided, fallback to default authentication
+            return await AuthMiddlewareStack(self.inner)(scope, receive, send)
+
+        return await self.inner(scope, receive, send)
+
+
+
 application = ProtocolTypeRouter({
     "http": django_asgi_app,
-     "websocket": AllowedHostsOriginValidator(
-        AuthMiddlewareStack(URLRouter(websocket_urlpatterns))
+    "websocket": AllowedHostsOriginValidator(
+        JWTAuthMiddleware(
+            AuthMiddlewareStack(URLRouter(websocket_urlpatterns))
+        )
     ),
 })
-
- 
diff --git a/osinaweb/static/.DS_Store b/osinaweb/static/.DS_Store
index 2276b057b341345e23502f6cad76658a79cb3d06..5980bbe50cb1b1fa7c81ab0efe65da12e6314b6b 100644
GIT binary patch
delta 25
gcmZn(XbITxL72nD)I>+Y*vNRYjkx`0bCI*c0B$S?=l}o!

delta 20
bcmZn(XbITxL73Ud(rmK1xXWg9k+Z@8Pjm+Z

diff --git a/osinaweb/static/images/.DS_Store b/osinaweb/static/images/.DS_Store
index 277ba293fb8725cbc5f41afefe0dba7e289a49d8..4bca0c9aff9922f6d222a7a0e88a8af1dd47e352 100644
GIT binary patch
delta 288
zcmZn(XbITxKy>m3$x;pzQxhEpV<Y3qx>EL&r$|Uo-XUhpEF>j8`JI@!P`m(taYlZ*
zXL5dCKv8O0W@`E5JmJG)(dk8*DZvGa$(ecS%Jv@^z<_h|4{?ofw+09&BriWNRoNi`
zBB$)&4Ph{FFlaM4G6XZkFcdO0FidAy%&?x}Aj3I^#|&Q?nHhN*#Tb<swHb97O&QG@
t9T*)MgBYV3V;B=R=S$3B-^`|Pi<MkQYh!n`vV#W1WdaP!P$x2Q002HyNWB06

delta 327
zcmZn(XbITxKy<RNP^qY~p@EKquA!NEt&T#qg_*IAf`ysM<m*DllP60^Pu?zO%q%G-
zIr*)aIA=s=a(-TLW>xCsJmFnh@dEtC8TsX&K(T<L)UwRf^62!U%#`4Q#N^DpbY=Sw
z3}B$_5HQ(aL?=+$A+iB1z!{R4pO?z1?BESiz`((v&EUx3#SqMp!BEc7$1saw8N&{S
zqYSqg-Z1=PWMLFzRASU-G-0%5v}g2S^kj@;OlC}B%-ozOF@t?GyTVOYO1xo1yf+}u
MRd&#TFa#Ks0qCh$p#T5?

diff --git a/osinaweb/static/js/osichat-admin/osichat.js b/osinaweb/static/js/osichat-admin/osichat.js
index 246fd19c..bd31082e 100644
--- a/osinaweb/static/js/osichat-admin/osichat.js
+++ b/osinaweb/static/js/osichat-admin/osichat.js
@@ -1,7 +1,6 @@
 let admin_chat_ws_scheme = window.location.protocol === "https:" ? "wss" : "ws";
 let protocol = window.location.protocol === "https:" ? "https" : "http";
 let admin_chat_domain = "osina.ositcom.com";
-let userId = document.getElementById('userId').textContent.trim();
 let osichatadminroomSocket = null;
 let currentChatId = null;
 let whereAmI = null;
@@ -39,7 +38,6 @@ function initializeOsichat(){
         osichatroomsSocket.send(JSON.stringify({
             'event_type': 'set_client_type',
             'client_type': 'website_admin',
-            'user_id': userId,
             'whereAmI': whereAmI === 'Visitors' ? 'Visitors' : 'Chats' // Default to 'Chats' if not 'Visitors'         
         }));
     };