diff --git a/.github/workflows/run_tests_on_pull_request.yml b/.github/workflows/run_tests_on_pull_request.yml index 72c0ff455..f1aea9c75 100644 --- 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 index 30aabf214..5b9821de6 100644 --- 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 index 038c1ac13..93f9f00d8 100644 --- 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 index 2f180e7f0..8ec7be6a6 100755 --- 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 index d96dcee50..73f52ae35 100644 --- 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 index 3630abc0b..7303cecf3 100644 --- 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 index 6f5e6948b..c2adb6987 100644 --- a/teraserver/easyrtc/protected/index_participants.html +++ b/teraserver/easyrtc/protected/index_participants.html @@ -140,15 +140,15 @@