Skip to content
This repository has been archived by the owner on Sep 21, 2022. It is now read-only.

Commit

Permalink
Added the terms_agreed parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkusRannare committed Feb 11, 2021
1 parent b63571e commit 99b4e8b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 12 deletions.
1 change: 1 addition & 0 deletions include/Utility.h
Expand Up @@ -36,6 +36,7 @@ namespace modio
std::string MODIO_DLL toString(i32 number);
std::string MODIO_DLL toString(u32 number);
std::string MODIO_DLL toString(double number);
std::string MODIO_DLL toString(bool boolean);
std::string replaceSubstrings(const std::string &str, const std::string &from, const std::string &to);
std::string addSlashIfNeeded(const std::string &directory_path);
std::string getFilename(std::string file_path);
Expand Down
8 changes: 4 additions & 4 deletions include/c++/ModIOInstance.h
Expand Up @@ -67,10 +67,10 @@ class MODIO_DLL Instance
modio::User getCurrentUser();

//External Authentication Methods
void galaxyAuth(const std::string &appdata, const std::function<void(const modio::Response &)> &callback);
void oculusAuth(const std::string &nonce, const std::string &oculus_user_id, const std::string &access_token, const std::string &email, const std::string &device, u32 date_expires, const std::function<void(const modio::Response &)> &callback);
void steamAuth(const unsigned char* rgubTicket, u32 cubTicket, const std::function<void(const modio::Response &)> &callback);
void steamAuthEncoded(const std::string &base64_token, const std::function<void(const modio::Response &)> &callback);
void galaxyAuth(const std::string &appdata, bool terms_agreed, const std::function<void(const modio::Response &)> &callback);
void oculusAuth(const std::string &nonce, const std::string &oculus_user_id, const std::string &access_token, const std::string &email, const std::string &device, u32 date_expires, bool terms_agreed, const std::function<void(const modio::Response &)> &callback);
void steamAuth(const unsigned char* rgubTicket, u32 cubTicket, bool terms_agreed, const std::function<void(const modio::Response &)> &callback);
void steamAuthEncoded(const std::string &base64_token, bool terms_agreed, const std::function<void(const modio::Response &)> &callback);
void linkExternalAccount(u32 service, const std::string &service_id, const std::string &email, const std::function<void(const modio::Response &)> &callback);
void getTerms(u32 service, const std::function<void(const modio::Response&, const modio::Terms&)>& callback);

Expand Down
5 changes: 5 additions & 0 deletions src/Utility.cpp
Expand Up @@ -118,6 +118,11 @@ std::string toString(double number)
return std::to_string(number);
}

std::string toString(bool boolean)
{
return boolean ? "true" : "false";
}

std::string replaceSubstrings(const std::string &str, const std::string &from, const std::string &to)
{
std::string return_value = str;
Expand Down
16 changes: 8 additions & 8 deletions src/c++/methods/ExternalAuthenticationInstanceMethods.cpp
Expand Up @@ -5,18 +5,18 @@
namespace modio
{

void Instance::galaxyAuth(const std::string &appdata, const std::function<void(const modio::Response &)> &callback)
void Instance::galaxyAuth(const std::string &appdata, bool terms_agreed, const std::function<void(const modio::Response &)> &callback)
{
struct GenericCall *galaxy_auth_call = new GenericCall{callback};
galaxy_auth_calls[current_call_id] = galaxy_auth_call;

// @todonow: Update c++ interface
modioGalaxyAuth((void*)((uintptr_t)current_call_id), appdata.c_str(), false, &onGalaxyAuth);
modioGalaxyAuth((void*)((uintptr_t)current_call_id), appdata.c_str(), terms_agreed, &onGalaxyAuth);

current_call_id++;
}

void Instance::oculusAuth(const std::string &nonce, const std::string &oculus_user_id, const std::string &access_token, const std::string &email, const std::string &device, u32 date_expires, const std::function<void(const modio::Response &)> &callback)
void Instance::oculusAuth(const std::string &nonce, const std::string &oculus_user_id, const std::string &access_token, const std::string &email, const std::string &device, u32 date_expires, bool terms_agreed, const std::function<void(const modio::Response &)> &callback)
{
struct GenericCall *oculus_auth_call = new GenericCall{callback};
oculus_auth_calls[current_call_id] = oculus_auth_call;
Expand All @@ -26,29 +26,29 @@ void Instance::oculusAuth(const std::string &nonce, const std::string &oculus_us
email_c = (char*)email.c_str();

// @todonow: Update c++ interface
modioOculusAuth((void*)((uintptr_t)current_call_id), nonce.c_str(), oculus_user_id.c_str(), access_token.c_str(), email_c, device.c_str(), date_expires, false, &onOculusAuth);
modioOculusAuth((void*)((uintptr_t)current_call_id), nonce.c_str(), oculus_user_id.c_str(), access_token.c_str(), email_c, device.c_str(), date_expires, terms_agreed, &onOculusAuth);

current_call_id++;
}

void Instance::steamAuth(const unsigned char* rgubTicket, u32 cubTicket, const std::function<void(const modio::Response &)> &callback)
void Instance::steamAuth(const unsigned char* rgubTicket, u32 cubTicket, bool terms_agreed, const std::function<void(const modio::Response &)> &callback)
{
struct GenericCall *steam_auth_call = new GenericCall{callback};
steam_auth_calls[current_call_id] = steam_auth_call;

// @todonow: Update c++ interface
modioSteamAuth((void*)((uintptr_t)current_call_id), rgubTicket, cubTicket, true, &onSteamAuth);
modioSteamAuth((void*)((uintptr_t)current_call_id), rgubTicket, cubTicket, terms_agreed, &onSteamAuth);

current_call_id++;
}

void Instance::steamAuthEncoded(const std::string &base64_ticket, const std::function<void(const modio::Response &)> &callback)
void Instance::steamAuthEncoded(const std::string &base64_ticket, bool terms_agreed, const std::function<void(const modio::Response &)> &callback)
{
struct GenericCall *steam_auth_encoded_call = new GenericCall{callback};
steam_auth_encoded_calls[current_call_id] = steam_auth_encoded_call;

// @todonow: Update c++ interface
modioSteamAuthEncoded((void*)((uintptr_t)current_call_id), base64_ticket.c_str(), false, &onSteamAuthEncoded);
modioSteamAuthEncoded((void*)((uintptr_t)current_call_id), base64_ticket.c_str(), terms_agreed, &onSteamAuthEncoded);

current_call_id++;
}
Expand Down

0 comments on commit 99b4e8b

Please sign in to comment.