Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

few tweaks for objects api #190

Merged
merged 8 commits into from
Jul 30, 2024
Merged

few tweaks for objects api #190

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb1543d
add object definitions and docs
Xavrax Jul 25, 2024
dd87160
I had to remove commits and commit them back because of the keyset
Xavrax Jul 29, 2024
11acdfe
fixed whole example
Xavrax Jul 29, 2024
edae032
some fixes
Xavrax Jul 29, 2024
3605798
xddd
Xavrax Jul 29, 2024
57294a1
fix PAM api in CMAKE
Xavrax Jul 29, 2024
21d14cb
refactor: replace `strcat` vs `snprintf`
parfeon Jul 29, 2024
e1c77ca
PubNub SDK v4.12.0 release.
pubnub-release-bot Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ log_set(CUSTOM_OPENSSL_INCLUDE_DIR "include" "OpenSSL include directory relative
log_set(EXAMPLE "all" "Build example with provided name (use 'all' for all examples) [EXAMPLES=ON needed]")
log_set(CGREEN_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/cgreen" "CGreen root directory [UNIT_TEST=ON needed]")
log_set(LOG_LEVEL "WARNING" "Log level [TRACE/DEBUG/INFO/WARNING/ERROR]")
log_set(CUSTOM_BOOL_TYPE "" "Type of bool for platform differences. Select whatever works for you that accepts 0/1 values")

if (${OPENSSL} AND ${MBEDTLS})
message(FATAL_ERROR "You can't use both OpenSSL and mbedTLS at the same time!")
Expand Down Expand Up @@ -143,6 +144,13 @@ if(${WITH_CPP})
endif()
endif()

if(NOT ${CUSTOM_BOOL_TYPE} STREQUAL "")
message(STATUS "Using custom bool type: ${BOOL_TYPE}")
set(FLAGS "\
${FLAGS} \
-D PUBNUB_BOOL_TYPE=${BOOL_TYPE}")
endif()

set(CORE_SOURCEFILES
${CMAKE_CURRENT_LIST_DIR}/core/pbcc_set_state.c
${CMAKE_CURRENT_LIST_DIR}/core/pubnub_pubsubapi.c
Expand Down Expand Up @@ -372,6 +380,9 @@ endif()
if(${USE_GRANT_TOKEN_API})
set(FEATURE_SOURCEFILES
${FEATURE_SOURCEFILES}
${CMAKE_CURRENT_LIST_DIR}/lib/cbor/cborparser.c
${CMAKE_CURRENT_LIST_DIR}/lib/cbor/cborerrorstrings.c
${CMAKE_CURRENT_LIST_DIR}/lib/cbor/cborparser_dup_string.c
${CMAKE_CURRENT_LIST_DIR}/core/pbcc_grant_token_api.c
${CMAKE_CURRENT_LIST_DIR}/core/pubnub_grant_token_api.c)
endif()
Expand Down Expand Up @@ -673,6 +684,16 @@ if(${EXAMPLES})
set(EXAMPLE_LIST
pubnub_crypto_module_sample
${EXAMPLE_LIST})
if (${USE_GRANT_TOKEN_API})
set(EXAMPLE_LIST
pubnub_sync_grant_token_sample
${EXAMPLE_LIST})
endif()
endif()
if (${USE_OBJECTS_API})
set(EXAMPLE_LIST
pubnub_objects_api_sample
${EXAMPLE_LIST})
endif()
endif()
else()
Expand Down
6 changes: 5 additions & 1 deletion core/c99/stdbool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
#define false 0
#define true 1

#ifdef PUBNUB_BOOL_TYPE
#define bool PUBNUB_BOOL_TYPE
#else
#define bool int
#endif

#endif /* !defined __cplusplus */
#endif /* !defined __cplusplus */
54 changes: 54 additions & 0 deletions core/pbcc_objects_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ enum pubnub_res pbcc_getall_uuidmetadata_prep(
char const* start,
char const* end,
enum pubnub_tribool count,
char const* filter,
char const* sort,
enum pubnub_trans pt)
{
char const* const uname = pubnub_uname();
Expand All @@ -102,6 +104,9 @@ enum pubnub_res pbcc_getall_uuidmetadata_prep(

if (count != pbccNotSet) { ADD_URL_PARAM(qparam, count, count == pbccTrue ? "true" : "false"); }

if (NULL != filter) { ADD_URL_PARAM(qparam, filter, filter); }
if (NULL != sort) { ADD_URL_PARAM(qparam, sort, sort); }

if (user_id) { ADD_URL_PARAM(qparam, uuid, user_id); }
#if PUBNUB_CRYPTO_API
if (pb->secret_key == NULL) { ADD_URL_AUTH_PARAM(pb, qparam, auth); }
Expand Down Expand Up @@ -292,6 +297,8 @@ enum pubnub_res pbcc_getall_channelmetadata_prep(struct pbcc_context* pb,
char const* start,
char const* end,
enum pubnub_tribool count,
char const* filter,
char const* sort,
enum pubnub_trans pt)
{
char const* const uname = pubnub_uname();
Expand All @@ -316,6 +323,10 @@ enum pubnub_res pbcc_getall_channelmetadata_prep(struct pbcc_context* pb,
if (end != NULL) { ADD_URL_PARAM(qparam, end, end); }

if (count != pbccNotSet) { ADD_URL_PARAM(qparam, count, count == pbccTrue ? "true" : "false"); }

if (NULL != filter) { ADD_URL_PARAM(qparam, filter, filter); }
if (NULL != sort) { ADD_URL_PARAM(qparam, sort, sort); }

if (user_id) { ADD_URL_PARAM(qparam, uuid, user_id); }
#if PUBNUB_CRYPTO_API
if (pb->secret_key == NULL) { ADD_URL_AUTH_PARAM(pb, qparam, auth); }
Expand Down Expand Up @@ -515,6 +526,8 @@ enum pubnub_res pbcc_get_memberships_prep(struct pbcc_context* pb,
char const* start,
char const* end,
enum pubnub_tribool count,
char const* filter,
char const* sort,
enum pubnub_trans pt)
{
char const* const uname = pubnub_uname();
Expand Down Expand Up @@ -542,6 +555,10 @@ enum pubnub_res pbcc_get_memberships_prep(struct pbcc_context* pb,
if (start) { ADD_URL_PARAM(qparam, start, start); }
if (end) { ADD_URL_PARAM(qparam, end, end); }
if (count != pbccNotSet) { ADD_URL_PARAM(qparam, count, count == pbccTrue ? "true" : "false"); }

if (NULL != filter) { ADD_URL_PARAM(qparam, filter, filter); }
if (NULL != sort) { ADD_URL_PARAM(qparam, sort, sort); }

if (user_id) { ADD_URL_PARAM(qparam, uuid, user_id); }
#if PUBNUB_CRYPTO_API
if (pb->secret_key == NULL) { ADD_URL_AUTH_PARAM(pb, qparam, auth); }
Expand Down Expand Up @@ -574,6 +591,12 @@ enum pubnub_res pbcc_set_memberships_prep(struct pbcc_context* pb,
char const* uuid_metadataid,
char const* include,
char const* set_obj,
char const* filter,
char const* sort,
size_t limit,
char const* start,
char const* end,
enum pubnub_tribool count,
enum pubnub_trans pt)
{
char const* const uname = pubnub_uname();
Expand All @@ -598,6 +621,16 @@ enum pubnub_res pbcc_set_memberships_prep(struct pbcc_context* pb,
URL_PARAMS_INIT(qparam, PUBNUB_MAX_URL_PARAMS);
if (uname) { ADD_URL_PARAM(qparam, pnsdk, uname); }
if (user_id) { ADD_URL_PARAM(qparam, uuid, user_id); }

if (limit > 0) { ADD_URL_PARAM_SIZET(qparam, limit, limit); }
if (NULL != start) { ADD_URL_PARAM(qparam, start, start); }
if (NULL != end) { ADD_URL_PARAM(qparam, end, end); }

if (count != pbccNotSet) { ADD_URL_PARAM(qparam, count, count == pbccTrue ? "true" : "false"); }

if (NULL != filter) { ADD_URL_PARAM(qparam, filter, filter); }
if (NULL != sort) { ADD_URL_PARAM(qparam, sort, sort); }

#if PUBNUB_CRYPTO_API
if (pb->secret_key == NULL) { ADD_URL_AUTH_PARAM(pb, qparam, auth); }
ADD_TS_TO_URL_PARAM();
Expand Down Expand Up @@ -633,6 +666,8 @@ enum pubnub_res pbcc_get_members_prep(struct pbcc_context* pb,
size_t limit,
char const* start,
char const* end,
char const* filter,
char const* sort,
enum pubnub_tribool count,
enum pubnub_trans pt)
{
Expand Down Expand Up @@ -663,6 +698,10 @@ enum pubnub_res pbcc_get_members_prep(struct pbcc_context* pb,
if (start) { ADD_URL_PARAM(qparam, start, start); }
if (end) { ADD_URL_PARAM(qparam, end, end); }
if (count != pbccNotSet) { ADD_URL_PARAM(qparam, count, count == pbccTrue ? "true" : "false"); }

if (NULL != filter) { ADD_URL_PARAM(qparam, filter, filter); }
if (NULL != sort) { ADD_URL_PARAM(qparam, sort, sort); }

if (user_id) { ADD_URL_PARAM(qparam, uuid, user_id); }
#if PUBNUB_CRYPTO_API
if (pb->secret_key == NULL) { ADD_URL_AUTH_PARAM(pb, qparam, auth); }
Expand Down Expand Up @@ -695,6 +734,12 @@ enum pubnub_res pbcc_set_members_prep(struct pbcc_context* pb,
char const* channel_metadataid,
char const* include,
char const* set_obj,
char const* filter,
char const* sort,
size_t limit,
char const* start,
char const* end,
enum pubnub_tribool count,
enum pubnub_trans pt)
{
char const* const uname = pubnub_uname();
Expand All @@ -720,6 +765,15 @@ enum pubnub_res pbcc_set_members_prep(struct pbcc_context* pb,
URL_PARAMS_INIT(qparam, PUBNUB_MAX_URL_PARAMS);
if (uname) { ADD_URL_PARAM(qparam, pnsdk, uname); }
if (user_id) { ADD_URL_PARAM(qparam, uuid, user_id); }

if (limit > 0) { ADD_URL_PARAM_SIZET(qparam, limit, limit); }
if (NULL != start) { ADD_URL_PARAM(qparam, start, start); }
if (NULL != end) { ADD_URL_PARAM(qparam, end, end); }

if (count != pbccNotSet) { ADD_URL_PARAM(qparam, count, count == pbccTrue ? "true" : "false"); }

if (NULL != filter) { ADD_URL_PARAM(qparam, filter, filter); }
if (NULL != sort) { ADD_URL_PARAM(qparam, sort, sort); }
#if PUBNUB_CRYPTO_API
if (pb->secret_key == NULL) { ADD_URL_AUTH_PARAM(pb, qparam, auth); }
ADD_TS_TO_URL_PARAM();
Expand Down
22 changes: 22 additions & 0 deletions core/pbcc_objects_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ enum pubnub_res pbcc_find_objects_id(struct pbcc_context* pb,
char const* file,
int line);

// TODO: maybe we should decrease amount of parameters in these functions

/** Prepares the 'get_users' transaction, mostly by
formatting the URI of the HTTP request.
*/
Expand All @@ -35,6 +37,8 @@ enum pubnub_res pbcc_getall_uuidmetadata_prep(struct pbcc_context* pb,
char const* start,
char const* end,
enum pubnub_tribool count,
char const* filter,
char const* sort,
enum pubnub_trans pt);

/** Prepares the 'set_uuidmetadata' transaction, mostly by
Expand Down Expand Up @@ -70,6 +74,8 @@ enum pubnub_res pbcc_getall_channelmetadata_prep(struct pbcc_context* pb,
char const* start,
char const* end,
enum pubnub_tribool count,
char const* filter,
char const* sort,
enum pubnub_trans pt);


Expand Down Expand Up @@ -108,6 +114,8 @@ enum pubnub_res pbcc_get_memberships_prep(struct pbcc_context* pb,
char const* start,
char const* end,
enum pubnub_tribool count,
char const* filter,
char const* sort,
enum pubnub_trans pt);


Expand All @@ -118,6 +126,12 @@ enum pubnub_res pbcc_set_memberships_prep(struct pbcc_context* pb,
char const* uuid_metadataid,
char const* include,
char const* update_obj,
char const* filter,
char const* sort,
size_t limit,
char const* start,
char const* end,
enum pubnub_tribool count,
enum pubnub_trans pt);

/** Prepares the 'get_members' transaction, mostly by
Expand All @@ -129,6 +143,8 @@ enum pubnub_res pbcc_get_members_prep(struct pbcc_context* pb,
size_t limit,
char const* start,
char const* end,
char const* filter,
char const* sort,
enum pubnub_tribool count,
enum pubnub_trans pt);

Expand All @@ -139,6 +155,12 @@ enum pubnub_res pbcc_set_members_prep(struct pbcc_context* pb,
char const* channel_metadataid,
char const* include,
char const* set_obj,
char const* filter,
char const* sort,
size_t limit,
char const* start,
char const* end,
enum pubnub_tribool count,
enum pubnub_trans pt);


Expand Down
Loading
Loading