Skip to content

Commit 7b4fb21

Browse files
UriagatUriagat
authored
Fix/stream room policy (#434)
* fix: streamRoom policy ContainerPolicy -> ContainerPolicyWithoutItem * test: streamRoom policy * fix: VarInterface
1 parent ac1d117 commit 7b4fb21

12 files changed

Lines changed: 75 additions & 23 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class StreamApiLowImpl : public privmx::utils::ManualManagedClass<StreamApiLowIm
5555
const std::vector<core::UserWithPubKey>& managers,
5656
const core::Buffer& publicMeta,
5757
const core::Buffer& privateMeta,
58-
const std::optional<core::ContainerPolicy>& policies,
58+
const std::optional<core::ContainerPolicyWithoutItem>& policies,
5959
const std::string& type = STREAM_TYPE_FILTER_FLAG
6060
);
6161

@@ -68,7 +68,7 @@ class StreamApiLowImpl : public privmx::utils::ManualManagedClass<StreamApiLowIm
6868
const int64_t version,
6969
const bool force,
7070
const bool forceGenerateNewKey,
71-
const std::optional<core::ContainerPolicy>& policies
71+
const std::optional<core::ContainerPolicyWithoutItem>& policies
7272
);
7373
core::PagingList<StreamRoom> listStreamRooms(
7474
const std::string& contextId,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class StreamApiLow : public privmx::endpoint::core::ExtendedPointer<StreamApiLow
4545
const std::vector<core::UserWithPubKey>& managers,
4646
const core::Buffer& publicMeta,
4747
const core::Buffer& privateMeta,
48-
const std::optional<core::ContainerPolicy>& policies
48+
const std::optional<core::ContainerPolicyWithoutItem>& policies
4949
);
5050

5151
void updateStreamRoom(
@@ -57,7 +57,7 @@ class StreamApiLow : public privmx::endpoint::core::ExtendedPointer<StreamApiLow
5757
const int64_t version,
5858
const bool force,
5959
const bool forceGenerateNewKey,
60-
const std::optional<core::ContainerPolicy>& policies
60+
const std::optional<core::ContainerPolicyWithoutItem>& policies
6161
);
6262

6363
core::PagingList<StreamRoom> listStreamRooms(const std::string& contextId, const core::PagingQuery& query);

‎endpoint/stream/stream/include_pub/privmx/endpoint/stream/Types.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ struct StreamRoom {
4848
int64_t version;
4949
core::Buffer publicMeta;
5050
core::Buffer privateMeta;
51-
core::ContainerPolicy policy;
51+
core::ContainerPolicyWithoutItem policy;
5252
int64_t statusCode;
5353
int64_t schemaVersion;
5454
bool closed;

‎endpoint/stream/stream/src/StreamApiLow.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ std::string StreamApiLow::createStreamRoom(
6767
const std::vector<core::UserWithPubKey>& managers,
6868
const core::Buffer& publicMeta,
6969
const core::Buffer& privateMeta,
70-
const std::optional<core::ContainerPolicy>& policies
70+
const std::optional<core::ContainerPolicyWithoutItem>& policies
7171
) {
7272
auto impl = getImpl();
7373
core::Validator::validateId(contextId, "field:contextId ");
@@ -90,7 +90,7 @@ void StreamApiLow::updateStreamRoom(
9090
const int64_t version,
9191
const bool force,
9292
const bool forceGenerateNewKey,
93-
const std::optional<core::ContainerPolicy>& policies
93+
const std::optional<core::ContainerPolicyWithoutItem>& policies
9494
) {
9595
auto impl = getImpl();
9696
core::Validator::validateId(streamRoomId, "field:streamRoomId ");

‎endpoint/stream/stream/src/StreamApiLowImpl.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ std::string StreamApiLowImpl::createStreamRoom(
562562
const std::vector<core::UserWithPubKey>& managers,
563563
const core::Buffer& publicMeta,
564564
const core::Buffer& privateMeta,
565-
const std::optional<core::ContainerPolicy>& policies,
565+
const std::optional<core::ContainerPolicyWithoutItem>& policies,
566566
const std::string& type
567567
) {
568568
auto streamRoomKey = _keyProvider->generateKey();
@@ -608,7 +608,7 @@ void StreamApiLowImpl::updateStreamRoom(
608608
const int64_t version,
609609
const bool force,
610610
const bool forceGenerateNewKey,
611-
const std::optional<core::ContainerPolicy>& policies
611+
const std::optional<core::ContainerPolicyWithoutItem>& policies
612612
) {
613613

614614
// get current streamRoom

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Poco::Dynamic::Var StreamApiLowVarInterface::createStreamRoom(const Poco::Dynami
9393
auto managers = _deserializer.deserializeVector<core::UserWithPubKey>(argsArr->get(2), "managers");
9494
auto publicMeta = _deserializer.deserialize<core::Buffer>(argsArr->get(3), "publicMeta");
9595
auto privateMeta = _deserializer.deserialize<core::Buffer>(argsArr->get(4), "privateMeta");
96-
auto policies = _deserializer.deserializeOptional<core::ContainerPolicy>(argsArr->get(5), "policies");
96+
auto policies = _deserializer.deserializeOptional<core::ContainerPolicyWithoutItem>(argsArr->get(5), "policies");
9797
auto result = _streamApi.createStreamRoom(contextId, users, managers, publicMeta, privateMeta, policies);
9898
return _serializer.serialize(result);
9999
}
@@ -108,7 +108,7 @@ Poco::Dynamic::Var StreamApiLowVarInterface::updateStreamRoom(const Poco::Dynami
108108
auto version = _deserializer.deserialize<int64_t>(argsArr->get(5), "version");
109109
auto force = _deserializer.deserialize<bool>(argsArr->get(6), "force");
110110
auto forceGenerateNewKey = _deserializer.deserialize<bool>(argsArr->get(7), "forceGenerateNewKey");
111-
auto policies = _deserializer.deserializeOptional<core::ContainerPolicy>(argsArr->get(8), "policies");
111+
auto policies = _deserializer.deserializeOptional<core::ContainerPolicyWithoutItem>(argsArr->get(8), "policies");
112112
_streamApi.updateStreamRoom(
113113
inboxId, users, managers, publicMeta, privateMeta, version, force, forceGenerateNewKey, policies
114114
);

‎endpoint/stream/webrtc/include/privmx/endpoint/stream/StreamApiImpl.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class StreamApiImpl {
5353
const std::vector<core::UserWithPubKey>& managers,
5454
const core::Buffer& publicMeta,
5555
const core::Buffer& privateMeta,
56-
const std::optional<core::ContainerPolicy>& policies
56+
const std::optional<core::ContainerPolicyWithoutItem>& policies
5757
);
5858

5959
void updateStreamRoom(
@@ -65,7 +65,7 @@ class StreamApiImpl {
6565
const int64_t version,
6666
const bool force,
6767
const bool forceGenerateNewKey,
68-
const std::optional<core::ContainerPolicy>& policies
68+
const std::optional<core::ContainerPolicyWithoutItem>& policies
6969
);
7070

7171
core::PagingList<StreamRoom> listStreamRooms(const std::string& contextId, const core::PagingQuery& query);

‎endpoint/stream/webrtc/include_pub/privmx/endpoint/stream/StreamApi.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class StreamApi {
6767
const std::vector<core::UserWithPubKey>& managers,
6868
const core::Buffer& publicMeta,
6969
const core::Buffer& privateMeta,
70-
const std::optional<core::ContainerPolicy>& policies
70+
const std::optional<core::ContainerPolicyWithoutItem>& policies
7171
);
7272

7373
/**
@@ -93,7 +93,7 @@ class StreamApi {
9393
const int64_t version,
9494
const bool force,
9595
const bool forceGenerateNewKey,
96-
const std::optional<core::ContainerPolicy>& policies
96+
const std::optional<core::ContainerPolicyWithoutItem>& policies
9797
);
9898

9999
/**

‎endpoint/stream/webrtc/src/StreamApi.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ std::string StreamApi::createStreamRoom(
4141
const std::vector<core::UserWithPubKey>& managers,
4242
const core::Buffer& publicMeta,
4343
const core::Buffer& privateMeta,
44-
const std::optional<core::ContainerPolicy>& policies
44+
const std::optional<core::ContainerPolicyWithoutItem>& policies
4545
) {
4646
validateEndpoint();
4747
core::Validator::validateId(contextId, "field:contextId ");
@@ -64,7 +64,7 @@ void StreamApi::updateStreamRoom(
6464
const int64_t version,
6565
const bool force,
6666
const bool forceGenerateNewKey,
67-
const std::optional<core::ContainerPolicy>& policies
67+
const std::optional<core::ContainerPolicyWithoutItem>& policies
6868
) {
6969
validateEndpoint();
7070
core::Validator::validateId(streamRoomId, "field:streamRoomId ");

‎endpoint/stream/webrtc/src/StreamApiImpl.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ std::string StreamApiImpl::createStreamRoom(
560560
const std::vector<core::UserWithPubKey>& managers,
561561
const core::Buffer& publicMeta,
562562
const core::Buffer& privateMeta,
563-
const std::optional<core::ContainerPolicy>& policies
563+
const std::optional<core::ContainerPolicyWithoutItem>& policies
564564
) {
565565
return _api->createStreamRoom(contextId, users, managers, publicMeta, privateMeta, policies);
566566
}
@@ -574,7 +574,7 @@ void StreamApiImpl::updateStreamRoom(
574574
const int64_t version,
575575
const bool force,
576576
const bool forceGenerateNewKey,
577-
const std::optional<core::ContainerPolicy>& policies
577+
const std::optional<core::ContainerPolicyWithoutItem>& policies
578578
) {
579579
_api->updateStreamRoom(
580580
streamRoomId, users, managers, publicMeta, privateMeta, version, force, forceGenerateNewKey, policies

0 commit comments

Comments
 (0)