sync rc-2.8 with devel

build.sh

@@ -16,6 +16,6 @@ cmake .. -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=$GENERATORS_DIR/conan_toolch
        -DPRIVMX_BUILD_DEBUG_APPS=OFF \
        -DPRIVMX_BUILD_ENDPOINT_INTERFACE=ON \
        -DPRIVMX_ENABLE_TESTS=ON \
-       -DPRIVMX_ENABLE_TESTS_E2E=ON \
+       -DPRIVMX_ENABLE_TESTS_E2E=ON
 cmake --build . -- -j20
 source $GENERATORS_DIR/deactivate_conanbuild.sh

endpoint/stream/stream/include/privmx/endpoint/stream/StreamApiLowImpl.hpp

@@ -113,7 +113,6 @@ class StreamApiLowImpl : public privmx::utils::ManualManagedClass<StreamApiLowIm
     );
 
     void trickle(const int64_t sessionId, const std::string& candidateAsJson);
-    void acceptOfferOnReconfigure(const int64_t sessionId, const SdpWithTypeModel& sdp);
     void setNewOfferOnReconfigure(const int64_t sessionId, const SdpWithTypeModel& sdp);
 
     core::Buffer encryptDataChannelMessage(const std::string& streamRoomId, const DataChannelMessage& plainMessage);
@@ -182,6 +181,7 @@ class StreamApiLowImpl : public privmx::utils::ManualManagedClass<StreamApiLowIm
     virtual std::pair<core::ModuleKeys, int64_t> getModuleKeysAndVersionFromServer(std::string moduleId) override;
     core::ModuleKeys streamRoomToModuleKeys(server::StreamRoomInfo streamRoom);
     void assertTurnServerUri(const std::string& uri);
+    void acceptOfferOnReconfigure(const int64_t sessionId, const SdpWithTypeModel& sdp);
 
     static int32_t nextIdCounter;
     static int32_t nextId() { return nextIdCounter++; }

endpoint/stream/stream/include/privmx/endpoint/stream/varinterface/StreamApiLowVarInterface.hpp

@@ -51,13 +51,12 @@ class StreamApiLowVarInterface {
         UpdateSubscriberStream = 17,
         RemoveSubscriberStream = 18,
         Trickle = 19,
-        AcceptOfferOnReconfigure = 20,
-        KeyManagement = 21,
-        UpdateStream = 22,
-        JoinStreamRoomEx = 23,
-        ListStreamRoomParticipants = 24,
-        EncryptDataChannelMessage = 25,
-        DecryptDataChannelMessage = 26,
+        KeyManagement = 20,
+        UpdateStream = 21,
+        JoinStreamRoomEx = 22,
+        ListStreamRoomParticipants = 23,
+        EncryptDataChannelMessage = 24,
+        DecryptDataChannelMessage = 25,
     };
 
     StreamApiLowVarInterface(core::Connection connection, const core::VarSerializer& serializer)
@@ -91,7 +90,6 @@ class StreamApiLowVarInterface {
     Poco::Dynamic::Var listStreamRoomParticipants(const Poco::Dynamic::Var& args);
 
     Poco::Dynamic::Var trickle(const Poco::Dynamic::Var& args);
-    Poco::Dynamic::Var acceptOfferOnReconfigure(const Poco::Dynamic::Var& args);
     Poco::Dynamic::Var setNewOfferOnReconfigure(const Poco::Dynamic::Var& args);
 
     Poco::Dynamic::Var encryptDataChannelMessage(const Poco::Dynamic::Var& args);

endpoint/stream/stream/include_pub/privmx/endpoint/stream/StreamApiLow.hpp

@@ -78,7 +78,6 @@ class StreamApiLow : public privmx::endpoint::core::ExtendedPointer<StreamApiLow
     );
 
     void trickle(const int64_t sessionId, const std::string& candidateAsJson);
-    void acceptOfferOnReconfigure(const int64_t sessionId, const SdpWithTypeModel& sdp);
     void setNewOfferOnReconfigure(const int64_t sessionId, const SdpWithTypeModel& sdp);
 
     void joinStreamRoom(

endpoint/stream/stream/src/StreamApiLow.cpp

@@ -307,17 +307,6 @@ void StreamApiLow::trickle(const int64_t sessionId, const std::string& candidate
     }
 }
 
-void StreamApiLow::acceptOfferOnReconfigure(const int64_t sessionId, const SdpWithTypeModel& sdp) {
-    auto impl = getImpl();
-    core::Validator::validateNumberPositive(sessionId, "field:sessionId ");
-    try {
-        return impl->acceptOfferOnReconfigure(sessionId, sdp);
-    } catch (const privmx::utils::PrivmxException& e) {
-        core::ExceptionConverter::rethrowAsCoreException(e);
-        throw core::Exception("ExceptionConverter rethrow error");
-    }
-}
-
 void StreamApiLow::setNewOfferOnReconfigure(const int64_t sessionId, const SdpWithTypeModel& sdp) {
     auto impl = getImpl();
     core::Validator::validateNumberPositive(sessionId, "field:sessionId ");

endpoint/stream/stream/src/varinterface/StreamApiLowVarInterface.cpp

@@ -232,14 +232,6 @@ Poco::Dynamic::Var StreamApiLowVarInterface::trickle(const Poco::Dynamic::Var& a
     return {};
 }
 
-Poco::Dynamic::Var StreamApiLowVarInterface::acceptOfferOnReconfigure(const Poco::Dynamic::Var& args) {
-    auto argsArr = core::VarInterfaceUtil::validateAndExtractArray(args, 2);
-    auto sessionId = _deserializer.deserialize<int64_t>(argsArr->get(0), "sessionId");
-    auto jsep = _deserializer.deserialize<stream::SdpWithTypeModel>(argsArr->get(1), "jsep");
-    _streamApi.acceptOfferOnReconfigure(sessionId, jsep);
-    return {};
-}
-
 Poco::Dynamic::Var StreamApiLowVarInterface::setNewOfferOnReconfigure(const Poco::Dynamic::Var& args) {
     auto argsArr = core::VarInterfaceUtil::validateAndExtractArray(args, 2);
     auto sessionId = _deserializer.deserialize<int64_t>(argsArr->get(0), "sessionId");

test/test_env/utils/empty_server_and_mongo.yml

@@ -15,7 +15,7 @@ services:
       start_interval: 1s
 
   teamserver:
-    image: privmx-bridge
+    image: ${DOCKER_BRIDGE_IMAGE}:${DOCKER_BRIDGE_VERSION}
     env_file:
       - path: ./bridge.env
         required: false