Merge branch 'develop' into feature/exchange

django/requirements.txt

@@ -1,7 +1,7 @@
 asgiref==3.8.1
-Django==5.1
+Django==5.1.1
 django-cors-headers==4.4.0
-djangorestframework==3.15.1
+djangorestframework==3.15.2
 pytz==2021.3
 sqlparse==0.5.1
 psycopg2==2.9.9
@@ -11,3 +11,6 @@ python-dotenv==1.0.1
 requests==2.31.0
 pyjwt==2.8.0
 mozilla-django-oidc==4.0.1
+channels==4.1.0
+daphne==4.1.2
+python-socketio==5.11.4

django/tts_be/asgi.py

@@ -8,9 +8,13 @@
 """
 
 import os
-
 from django.core.asgi import get_asgi_application
 
+import socketio
+from university.socket.views import sio
+
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tts_be.settings')
 
-application = get_asgi_application()
+django_app = get_asgi_application()
+
+application = socketio.ASGIApp(sio, django_app)

django/tts_be/settings.py

@@ -32,6 +32,9 @@
 
 JWT_KEY= CONFIG['JWT_KEY']
 
+DEBUG = os.getenv('DEBUG')
+DEBUG = int(DEBUG) != 0 if DEBUG else False
+
 DOMAIN = os.getenv('DOMAIN')
 DEBUG = False if int(CONFIG['DEBUG']) == 0 else True
 
@@ -43,14 +46,20 @@
     # 'django_extensions',
     'university',
     'corsheaders',
+    'daphne',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions', # legacy
     'django.contrib.messages',
     'rest_framework', 
     'django.contrib.staticfiles',
+<<<<<<< HEAD
     'mozilla_django_oidc'
+=======
+    'university',
+    'channels',
+>>>>>>> develop
 ]
 
 MIDDLEWARE = [
@@ -125,6 +134,8 @@
 
 OIDC_RENEW_ID_TOKEN_EXPIRY_SECONDS = 3600 * 60
 
+ASGI_APPLICATION = 'tts_be.asgi.application'
+
 # Database
 # https://docs.djangoproject.com/en/4.0/ref/settings/#databases
 

django/university/socket/sessionsserver.py

@@ -0,0 +1,11 @@
+import uuid
+
+class SessionsServer:
+    def __init__(self, sio):
+        self.sio = sio
+
+    def valid_token(self, token):
+        return True
+
+    def event(self, event):
+        return self.sio.event(event)

django/university/socket/views.py

@@ -0,0 +1,33 @@
+import os
+import socketio
+
+from university.socket.sessionsserver import SessionsServer
+
+async_mode = None
+
+basedir = os.path.dirname(os.path.realpath(__file__))
+sio = socketio.AsyncServer(
+    async_mode='asgi',
+    cors_allowed_origins="*",
+)
+
+session_server = SessionsServer(sio)
+
+@session_server.event
+async def connect(sid, environ, auth):
+    if auth is None or 'token' not in auth:
+        raise ConnectionRefusedError('Authentication failed: No token provided')
+    elif not session_server.valid_token(auth['token']):
+        raise ConnectionRefusedError('Authentication failed: Invalid token')
+    else:
+        print('Client connected')
+        await sio.emit('my_response', {'data': 'Connected', 'count': 0}, room=sid)
+
+
+@session_server.event
+def disconnect(sid):
+    print('Client disconnected')
+
+@session_server.event
+async def test(sid, environ):
+    await sio.emit('response', 'ya')

fetcher/requirements.txt

@@ -1 +1 @@
-requests==2.28.1
+requests==2.32.2