Skip to content

Changes to make ETrade work #26

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changes to make ETrade work #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions include/liboauthcpp/liboauthcpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,10 @@ class Client {
std::string getHttpHeader(const Http::RequestType eType,
const std::string& rawUrl,
const std::string& rawData = "",
const KeyValuePairs& additional_keys = {},
const bool includeOAuthVerifierPin = false) const;
/** Build an OAuth HTTP header for the given request. This version gives a

/** Build an OAuth HTTP header for the given request. This version gives a
* fully formatted header, i.e. including the header field name.
*
* \param eType the HTTP request type, e.g. GET or POST
Expand Down Expand Up @@ -270,7 +272,8 @@ class Client {
const Http::RequestType eType,
const std::string& rawUrl,
const std::string& rawData,
const bool includeOAuthVerifierPin) const;
const bool includeOAuthVerifierPin,
const KeyValuePairs& additionalKeyPairs = {}) const;

bool getSignature( const Http::RequestType eType, /* in */
const std::string& rawUrl, /* in */
Expand Down
14 changes: 11 additions & 3 deletions src/liboauthcpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,9 +435,10 @@ bool Client::getSignature( const Http::RequestType eType,
std::string Client::getHttpHeader(const Http::RequestType eType,
const std::string& rawUrl,
const std::string& rawData,
const KeyValuePairs& additional_keys,
const bool includeOAuthVerifierPin) const
{
return Defaults::AUTHHEADER_PREFIX + buildOAuthParameterString(AuthorizationHeaderString, eType, rawUrl, rawData, includeOAuthVerifierPin);
return Defaults::AUTHHEADER_PREFIX + buildOAuthParameterString(AuthorizationHeaderString, eType, rawUrl, rawData, includeOAuthVerifierPin, additional_keys);
}

std::string Client::getFormattedHttpHeader(const Http::RequestType eType,
Expand All @@ -461,7 +462,8 @@ std::string Client::buildOAuthParameterString(
const Http::RequestType eType,
const std::string& rawUrl,
const std::string& rawData,
const bool includeOAuthVerifierPin) const
const bool includeOAuthVerifierPin,
const KeyValuePairs& additionalKeyPairs) const
{
KeyValuePairs rawKeyValuePairs;
std::string rawParams;
Expand All @@ -475,7 +477,7 @@ std::string Client::buildOAuthParameterString(
bool do_urlencode;
if (string_type == AuthorizationHeaderString) {
separator = ",";
do_urlencode = false;
do_urlencode = true;
}
else { // QueryStringString
separator = "&";
Expand All @@ -497,6 +499,9 @@ std::string Client::buildOAuthParameterString(
rawKeyValuePairs = ParseKeyValuePairs(dataPart);
}

for(const auto& x : additionalKeyPairs)
rawKeyValuePairs.insert(x);

// NOTE: We always request URL encoding on the first pass so that the
// signature generation works properly. This *relies* on
// buildOAuthTokenKeyValuePairs overwriting values when we do the second
Expand Down Expand Up @@ -533,6 +538,9 @@ std::string Client::buildOAuthParameterString(
oauth_keys.push_back(Defaults::VERIFIER_KEY);
oauth_keys.push_back(Defaults::VERSION_KEY);

for(const auto& x : additionalKeyPairs)
oauth_keys.push_back(x.first);

for(size_t i = 0; i < oauth_keys.size(); i++) {
assert(rawKeyValuePairs.count(oauth_keys[i]) <= 1);
KeyValuePairs::iterator oauth_key_it = rawKeyValuePairs.find(oauth_keys[i]);
Expand Down