gergely/matrix-glib-sdk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Automatically send token if present

Browse Source
This commit is contained in:
Gergely Polonkai 2016-01-12 14:09:25 +01:00
parent a959141b52
commit 1059fe4392
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/matrix-http-api.c
View File

@ -599,19 +599,26 @@ matrix_http_api_get_base_url(MatrixHTTPAPI *api)
return soup_uri_to_string(priv->uri, FALSE); return soup_uri_to_string(priv->uri, FALSE);
} }
#define create_query_params() (g_hash_table_new_full(g_str_hash, \
(GEqualFunc)g_strcmp0, \
NULL, \
g_free))
static void static void
_send(MatrixHTTPAPI *api, _send(MatrixHTTPAPI *api,
MatrixAPICallback callback, MatrixAPICallback callback,
gpointer user_data, gpointer user_data,
const gchar *method, const gchar *method,
const gchar *path, const gchar *path,
GHashTable *params,
const JsonNode *content, const JsonNode *content,
GError **error) GError **error)
{ {
MatrixHTTPAPIPrivate *priv = matrix_http_api_get_instance_private(api); MatrixHTTPAPIPrivate *priv = matrix_http_api_get_instance_private(api);
SoupURI *request_path; SoupURI *request_path;
SoupMessage *message; SoupMessage *message;
gchar *data; gchar *data, *url;
gsize datalen; gsize datalen;
MatrixHTTPAPIRequest *request; MatrixHTTPAPIRequest *request;
@ -631,7 +638,23 @@ _send(MatrixHTTPAPI *api,
} }
request_path = soup_uri_new_with_base(priv->uri, path); request_path = soup_uri_new_with_base(priv->uri, path);
if (!params) {
params = create_query_params();
}
if (priv->token) {
g_debug("Adding access token '%s'", priv->token);
g_hash_table_replace(params, "access_token", g_strdup(priv->token));
}
soup_uri_set_query_from_form(request_path, params);
g_hash_table_unref(params);
message = soup_message_new_from_uri(method, request_path); message = soup_message_new_from_uri(method, request_path);
url = soup_uri_to_string(request_path, FALSE);
soup_uri_free(request_path); soup_uri_free(request_path);
if (content) { if (content) {
@ -681,7 +704,7 @@ i_login(MatrixAPI *api,
_send(MATRIX_HTTP_API(api), _send(MATRIX_HTTP_API(api),
callback, user_data, callback, user_data,
"POST", "login", body, "POST", "login", NULL, body,
error); error);
} }
@ -814,7 +837,7 @@ i_create_room(MatrixAPI *api,
_send(MATRIX_HTTP_API(api), _send(MATRIX_HTTP_API(api),
callback, user_data, callback, user_data,
"POST", "createRoom", body, "POST", "createRoom", NULL, body,
error); error);
} }