tastytea
/
mastodon-cpp
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Releases 26 Wiki Activity

Changed return tyoe for register_app[12].

This commit is contained in:
tastytea 2019-02-25 12:32:19 +01:00
parent cbb1e18b0c
commit ada8f45415
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
2 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/mastodon-cpp.cpp
View File

@ -188,13 +188,13 @@ const std::string API::urldecode(const std::string &str)
return curlpp::unescape(str); return curlpp::unescape(str);
} }
uint16_t API::register_app1(const string &client_name, return_call API::register_app1(const string &client_name,
const string &redirect_uri, const string &redirect_uri,
const string &scopes, const string &scopes,
const string &website, const string &website,
string &client_id, string &client_id,
string &client_secret, string &client_secret,
string &url) string &url)
{ {
API::parametermap parameters = API::parametermap parameters =
{ {
@ -204,18 +204,17 @@ uint16_t API::register_app1(const string &client_name,
{ "website", { website } } { "website", { website } }
}; };
string answer; return_call ret = post(API::v1::apps, parameters);
uint16_t ret = post(API::v1::apps, parameters, answer);
if (ret == 0) if (ret.error_code == 0)
{ {
std::smatch match; std::smatch match;
std::regex reid("client_id\":\"([^\"]+)\""); std::regex reid("client_id\":\"([^\"]+)\"");
std::regex resecret("client_secret\":\"([^\"]+)\""); std::regex resecret("client_secret\":\"([^\"]+)\"");
std::regex_search(answer, match, reid); std::regex_search(ret.answer, match, reid);
client_id = match[1].str(); client_id = match[1].str();
std::regex_search(answer, match, resecret); std::regex_search(ret.answer, match, resecret);
client_secret = match[1].str(); client_secret = match[1].str();
url = "https://" + _instance + "/oauth/authorize" + url = "https://" + _instance + "/oauth/authorize" +
@ -226,27 +225,24 @@ uint16_t API::register_app1(const string &client_name,
{ {
url += "&website=" + urlencode(website); url += "&website=" + urlencode(website);
} }
return 0;
} }
else if (ret == 13) else if (ret.error_code == 78)
{ {
url = answer; url = ret.answer;
return ret;
} }
else else
{ {
std::cerr << "Error code: " << ret << '\n'; std::cerr << "Error code: " << std::to_string(ret.error_code) << '\n';
return ret;
} }
return ret;
} }
uint16_t API::register_app2(const string &client_id, return_call API::register_app2(const string &client_id,
const string &client_secret, const string &client_secret,
const string &redirect_uri, const string &redirect_uri,
const string &code, const string &code,
string &access_token) string &access_token)
{ {
API::parametermap parameters = API::parametermap parameters =
{ {
@ -257,24 +253,22 @@ uint16_t API::register_app2(const string &client_id,
{ "code", { code } }, { "code", { code } },
}; };
std::string answer; return_call ret = post("/oauth/token", parameters);
uint16_t ret = post("/oauth/token", parameters, answer); if (ret.error_code == 0)
if (ret == 0)
{ {
std::smatch match; std::smatch match;
std::regex retoken("access_token\":\"([^\"]+)\""); std::regex retoken("access_token\":\"([^\"]+)\"");
std::regex_search(answer, match, retoken); std::regex_search(ret.answer, match, retoken);
access_token = match[1].str(); access_token = match[1].str();
_access_token = access_token; _access_token = access_token;
return 0;
} }
else else
{ {
std::cerr << "Error code: " << ret << '\n'; std::cerr << "Error code: " << std::to_string(ret.error_code) << '\n';
return ret;
} }
return ret;
} }
const string API::get_header(const std::string &header) const const string API::get_header(const std::string &header) const

24
src/mastodon-cpp.hpp
View File

@ -380,13 +380,13 @@ public:
* *
* @since before 0.11.0 * @since before 0.11.0
*/ */
uint16_t register_app1(const string &client_name, return_call register_app1(const string &client_name,
const string &redirect_uri, const string &redirect_uri,
const string &scopes, const string &scopes,
const string &website, const string &website,
string &client_id, string &client_id,
string &client_secret, string &client_secret,
string &url); string &url);
/*! /*!
@ -404,11 +404,11 @@ public:
* *
* @since before 0.11.0 * @since before 0.11.0
*/ */
uint16_t register_app2(const string &client_id, return_call register_app2(const string &client_id,
const string &client_secret, const string &client_secret,
const string &redirect_uri, const string &redirect_uri,
const string &code, const string &code,
string &access_token); string &access_token);
/*! /*!
* @brief Gets the header from the last answer. * @brief Gets the header from the last answer.