Merge pull request #261 from introlab/dev

Main merge for 1.3.0 release
introlab · Jan 21, 2025 · b0fe8a2 · b0fe8a2
2 parents 342ee24 + 437ee12
commit b0fe8a2
Show file tree

Hide file tree

Showing 399 changed files with 19,021 additions and 3,870 deletions.
diff --git a/.github/workflows/run_tests_on_pull_request.yml b/.github/workflows/run_tests_on_pull_request.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.11.4]
+        python-version: [3.11.9]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: Set up Python ${{ matrix.python-version }}
@@ -44,6 +44,8 @@ jobs:
         sudo -u postgres psql -c "grant all privileges on database openteralogs to TeraAgent;"
         sudo -u postgres psql -c "create database openterafiles;" 
         sudo -u postgres psql -c "grant all privileges on database openterafiles to TeraAgent;"
+        sudo -u postgres psql -c "create database openteraemails;" 
+        sudo -u postgres psql -c "grant all privileges on database openteraemails to TeraAgent;"
         sudo -u postgres psql -c "\l"
         
     - name: Install Miniconda3
@@ -115,4 +117,9 @@ jobs:
       working-directory: teraserver/python/tests/services/LoggingService
       run: |
         $OPENTERA_PYTHON -m unittest discover . "test_*.py"
+    
+    - name: Run EmailService Tests
+      working-directory: teraserver/python/tests/services/EmailService
+      run: |
+        $OPENTERA_PYTHON -m unittest discover . "test_*.py"
   
diff --git a/docs/conf.py b/docs/conf.py
@@ -9,7 +9,7 @@
 project = 'OpenTera'
 copyright = '2024, Simon Brière, Dominic Létourneau'
 author = 'Simon Brière, Dominic Létourneau'
-release = '1.2.6'
+release = '1.3.0'
 version = release
 
 html_logo = 'images/LogoOpenTera200px.png'

diff --git a/docs/services/teraserver/OpenTera_AccessRoles.md b/docs/services/teraserver/OpenTera_AccessRoles.md
@@ -53,10 +53,10 @@ access.
 | **Sessions**: Read               | ![ True](images/on_.png) | ![ True](images/on_.png) | ![ True](images/on_.png) | ![ True](images/on_.png)  | ![ True](images/on_.png) |
 | **Sessions**: Update             | ![ True](images/on_.png) | ![ True](images/on_.png) | ![ True](images/on_.png) | ![ True](images/on_.png)  | ![ True](images/on_.png) |
 | **Sessions**: Delete             | ![ True](images/on_.png) | ![ True](images/on_.png) | ![False](images/off.png) | ![ True](images/on_.png)  | ![False](images/off.png) |
-| **Sessions Types**: Create       | ![ True](images/on_.png) | ![ True](images/on_.png) | ![ True](images/off.png) | ![ True](images/on_.png)  | ![ True](images/off.png) |
+| **Sessions Types**: Create       | ![ True](images/on_.png) | ![ True](images/on_.png) | ![False](images/off.png) | ![False](images/off.png)  | ![False](images/off.png) |
 | **Sessions Types**: Read         | ![ True](images/on_.png) | ![ True](images/on_.png) | ![ True](images/on_.png) | ![ True](images/on_.png)  | ![ True](images/on_.png) |
-| **Sessions Types**: Update       | ![ True](images/on_.png) | ![ True](images/on_.png) | ![False](images/off.png) | ![ True](images/on_.png)  | ![False](images/off.png) |
-| **Sessions Types**: Delete       | ![ True](images/on_.png) | ![ True](images/on_.png) | ![False](images/off.png) | ![ True](images/on_.png)  | ![False](images/off.png) |
+| **Sessions Types**: Update       | ![ True](images/on_.png) | ![ True](images/on_.png) | ![False](images/off.png) | ![False](images/off.png)  | ![False](images/off.png) |
+| **Sessions Types**: Delete       | ![ True](images/on_.png) | ![ True](images/on_.png) | ![False](images/off.png) | ![False](images/off.png)  | ![False](images/off.png) |
 | **Sessions Events**: Create      | ![ True](images/on_.png) | ![ True](images/on_.png) | ![ True](images/on_.png) | ![ True](images/on_.png)  | ![ True](images/on_.png) |
 | **Sessions Events**: Read        | ![ True](images/on_.png) | ![ True](images/on_.png) | ![ True](images/on_.png) | ![ True](images/on_.png)  | ![ True](images/on_.png) |
 | **Sessions Events**: Update      | ![ True](images/on_.png) | ![ True](images/on_.png) | ![ True](images/on_.png) | ![ True](images/on_.png)  | ![ True](images/on_.png) |

diff --git a/teraserver/CMakeLists.txt b/teraserver/CMakeLists.txt
@@ -9,8 +9,8 @@ endif(NOT CMAKE_BUILD_TYPE)
 
 # Software version
 SET(OPENTERA_VERSION_MAJOR "1")
-SET(OPENTERA_VERSION_MINOR "2")
-SET(OPENTERA_VERSION_PATCH "6")
+SET(OPENTERA_VERSION_MINOR "3")
+SET(OPENTERA_VERSION_PATCH "0")
 
 SET(OPENTERA_SERVER_VERSION OpenTera_v${OPENTERA_VERSION_MAJOR}.${OPENTERA_VERSION_MINOR}.${OPENTERA_VERSION_PATCH})
 

diff --git a/teraserver/easyrtc/CMakeLists.txt b/teraserver/easyrtc/CMakeLists.txt
@@ -5,7 +5,7 @@ message(STATUS "Building easyrtc")
 if(WIN32)
     set(NPM_EXECUTABLE npm.exe)
 else(WIN32)
-    set(NPM_EXECUTABLE /usr/local/bin/npm)
+    set(NPM_EXECUTABLE /usr/bin/npm)
 endif(WIN32)
 
 # Will always be considered out of date...

diff --git a/teraserver/easyrtc/package.json b/teraserver/easyrtc/package.json
@@ -10,13 +10,13 @@
   },
   "dependencies": {
     "ejs": "^3.1.6",
-    "express": "^4.17.3",
     "html": "^1.0.0",
     "minimist": "^1.2.5",
     "open-easyrtc": "git+https://github.com/open-easyrtc/open-easyrtc.git",
     "redis": "^3.1.2",
-    "serve-static": "^1.14.2",
-    "socket.io": "^2.4.1"
+    "express": "^4.21.2",
+    "serve-static": "^1.16.2",
+    "socket.io": "^4.8.1"
   },
   "license": "BSD3",
   "engines": {

diff --git a/teraserver/easyrtc/protected/index_participants.html b/teraserver/easyrtc/protected/index_participants.html
@@ -140,15 +140,15 @@ <h5 class="modal-title" id="errorDialogLongTitle" data-i18n="errorDialog.title">
                     <span class="badge badge-info d-lg-inline d-none" id="localViewTitle1">Vue locale #1</span>
                     <!-- Video controls -->
                     <div id="localVideoControls1" class="overlay-top-right" style="">
-                        <input id="localBtnSwapVideo1" type="image" alt="image" src="images/swap.png" class="image-icon" onclick="enlargeView(true,1);event.stopPropagation();" style="display: none;"/>
+                        <input id="localBtnSwapVideo1" data-i18n-attr="title" data-i18n="ui.swap" type="image" alt="image" src="images/swap.png" class="image-icon" onclick="enlargeView(true,1);event.stopPropagation();" style="display: none;"/>
                     </div>
 
                     <!-- Micro, video, sensors, ... controls -->
                     <div id="localViewControls1" class="overlay-bottom-center">
-                        <input id="localConfig1" type="image" alt="image" src="images/config.png" class="image-icon" onclick="btnConfigClicked(true, 1);event.stopPropagation();" data-toggle="modal" data-target="#configDialog" style="display: none;"/>
-                        <input id="localMicStatus1" type="image" alt="image" src="images/mic.png" class="image-icon" onclick="muteMicro(true,1);event.stopPropagation();" style="display: none;"/>
-                        <input id="localVideoStatus1" type="image" alt="image" src="images/video.png" class="image-icon" onclick="muteVideo(true,1);event.stopPropagation();" style="display: none;"/>
-                        <input id="localSpeakerStatus1" type="image" alt="image" src="images/speaker.png" class="image-icon" style="display: none;"/>
+                        <input id="localConfig1" data-i18n-attr="title" data-i18n="ui.config" type="image" alt="image" src="images/config.png" class="image-icon" onclick="btnConfigClicked(true, 1);event.stopPropagation();" data-toggle="modal" data-target="#configDialog" style="display: none;"/>
+                        <input id="localMicStatus1" data-i18n-attr="title" data-i18n="ui.micro" type="image" alt="image" src="images/mic.png" class="image-icon" onclick="muteMicro(true,1);event.stopPropagation();" style="display: none;"/>
+                        <input id="localVideoStatus1" data-i18n-attr="title" data-i18n="ui.camera" type="image" alt="image" src="images/video.png" class="image-icon" onclick="muteVideo(true,1);event.stopPropagation();" style="display: none;"/>
+                        <input id="localSpeakerStatus1" data-i18n-attr="title" data-i18n="ui.speaker" type="image" alt="image" src="images/speaker.png" class="image-icon" style="display: none;"/>
                     </div>
                     <!-- PTZ controls -->
                     <div id="localPtzControls1" class="overlay-top-center" oncontextmenu="" onclick="" onwheel="" style="display: none;">
@@ -188,14 +188,14 @@ <h5 class="modal-title" id="errorDialogLongTitle" data-i18n="errorDialog.title">
                             </div>
                         </div>
                         <div class="dropdown">
-                            <input class="btn bg-secondary text-light image-icon" id="localSettingsButton1" type="image" alt="image" src="images/settings.png" onclick="camSettings(true, 1);event.stopPropagation();" style="display: none;"/>
+                            <input class="btn bg-secondary text-light image-icon" id="localSettingsButton1" data-i18n-attr="title" data-i18n="ui.cam-settings" type="image" alt="image" src="images/settings.png" onclick="camSettings(true, 1);event.stopPropagation();" style="display: none;"/>
                         </div>
                     </div>
                     <!-- Sources controls -->
                     <div id="localSourcesControls1" class="mb-5 mb-md-0 overlay-bottom-right">
                         <div style="background-color:rgba(0,0,0,0);">
-                            <input id="localBtnShow2ndVideo1" type="image" alt="image" src="images/show2ndvideo.png" class="image-icon" onclick="btnShow2ndLocalVideoClicked();event.stopPropagation();" style="display: none;"/>
-                            <input id="localBtnShareScreen1" type="image" alt="image" data-sound-only="false" src="images/sharescreen.png" class="image-icon" onclick="btnShareScreenClicked($('#localBtnShareScreen1').data().soundOnly);event.stopPropagation();" style="display: none;"/>
+                            <input id="localBtnShow2ndVideo1" type="image" alt="image" data-i18n-attr="title" data-i18n="ui.cam-second" src="images/show2ndvideo.png" class="image-icon" onclick="btnShow2ndLocalVideoClicked();event.stopPropagation();" style="display: none;"/>
+                            <input id="localBtnShareScreen1" type="image" alt="image" data-i18n-attr="title" data-i18n="ui.share-screen" data-sound-only="false" src="images/sharescreen.png" class="image-icon" onclick="btnShareScreenClicked($('#localBtnShareScreen1').data().soundOnly);event.stopPropagation();" style="display: none;"/>
                         </div>
                     </div>
                     <!-- Video ! -->
@@ -215,12 +215,12 @@ <h5 class="modal-title" id="errorDialogLongTitle" data-i18n="errorDialog.title">
 
                     <!-- Video controls -->
                     <div id="localVideoControls2" class="overlay-top-right" style="">
-                        <input id="localBtnSwapVideo2" type="image" alt="image" src="images/swap.png" class="image-icon" onclick="enlargeView(true,2);event.stopPropagation();" style="display: none;"/>
+                        <input id="localBtnSwapVideo2" data-i18n-attr="title" data-i18n="ui.swap" type="image" alt="image" src="images/swap.png" class="image-icon" onclick="enlargeView(true,2);event.stopPropagation();" style="display: none;"/>
                     </div>
 
                     <!-- Micro, video, sensors, ... controls -->
                     <div id="localViewControls2" class="overlay-bottom-center" >
-                        <input id="localMicStatus2" type="image" alt="image" src="images/mic.png" class="image-icon" onclick="muteMicro(true,2);event.stopPropagation();" style="display: none;"/>
+                        <input id="localMicStatus2" data-i18n-attr="title" data-i18n="ui.micro" type="image" alt="image" src="images/mic.png" class="image-icon" onclick="muteMicro(true,2);event.stopPropagation();" style="display: none;"/>
                         <!--<input id="localVideoStatus2" type="image" alt="image" src="images/video.png" class="image-icon" onclick="muteVideo(true,2);event.stopPropagation();" style="display: none;"/>
                         <input id="localSpeakerStatus2" type="image" alt="image" src="images/speaker.png" class="image-icon" onclick="muteSpeaker(true,2);event.stopPropagation();" style="display: none;"/>-->
                     </div>