Skip to content

Enable additional body types for POST authorization #165

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

Closed
wants to merge 5 commits into from
Closed

Enable additional body types for POST authorization #165

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb55de8
Enable additional body types for POST authorization
dmorrow Dec 21, 2017
8eaaf3d
Missing ;
dmorrow Dec 21, 2017
7039a06
remove typo
dmorrow Dec 21, 2017
5e630ad
switch bodyFactory to protected and remove @override
dmorrow Dec 21, 2017
c979359
bodyFactory throws Exception
dmorrow Dec 21, 2017
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
45 changes: 29 additions & 16 deletions src/main/java/com/pusher/client/util/HttpAuthorizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,11 @@ public void setQueryStringParameters(final HashMap<String, String> queryStringPa
public String authorize(final String channelName, final String socketId) throws AuthorizationFailureException {

try {
final StringBuffer urlParameters = new StringBuffer();
urlParameters.append("channel_name=").append(URLEncoder.encode(channelName, ENCODING_CHARACTER_SET));
urlParameters.append("&socket_id=").append(URLEncoder.encode(socketId, ENCODING_CHARACTER_SET));
final String body = bodyFactory(channelName, socketId);

// Adding extra parameters supplied to be added to query string.
for (final String parameterName : mQueryStringParameters.keySet()) {
urlParameters.append("&").append(parameterName).append("=");
urlParameters.append(URLEncoder.encode(mQueryStringParameters.get(parameterName),
ENCODING_CHARACTER_SET));
}
final HashMap<String, String> defaultHeaders = new HashMap<String, String>();
defaultHeaders.put("Content-Type", "application/x-www-form-urlencoded");
defaultHeaders.put("charset", ENCODING_CHARACTER_SET);

HttpURLConnection connection;
if (isSSL()) {
Expand All @@ -108,22 +103,22 @@ public String authorize(final String channelName, final String socketId) throws
connection.setDoInput(true);
connection.setInstanceFollowRedirects(false);
connection.setRequestMethod("POST");
connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
connection.setRequestProperty("charset", "utf-8");
connection.setRequestProperty("Content-Length",
"" + Integer.toString(urlParameters.toString().getBytes().length));

// Add in the user defined headers
for (final String headerName : mHeaders.keySet()) {
final String headerValue = mHeaders.get(headerName);
defaultHeaders.putAll(mHeaders);
// Add in the Content-Length, so it can't be overwritten by mHeaders
defaultHeaders.put("Content-Length","" + Integer.toString(body.getBytes().length));

for (final String headerName : defaultHeaders.keySet()) {
final String headerValue = defaultHeaders.get(headerName);
connection.setRequestProperty(headerName, headerValue);
}

connection.setUseCaches(false);

// Send request
final DataOutputStream wr = new DataOutputStream(connection.getOutputStream());
wr.writeBytes(urlParameters.toString());
wr.writeBytes(body);
wr.flush();
wr.close();

Expand All @@ -149,4 +144,22 @@ public String authorize(final String channelName, final String socketId) throws
throw new AuthorizationFailureException(e);
}
}

protected String bodyFactory(final String channelName, final String socketId) throws Exception {
try {
final StringBuffer urlParameters = new StringBuffer();
urlParameters.append("channel_name=").append(URLEncoder.encode(channelName, ENCODING_CHARACTER_SET));
urlParameters.append("&socket_id=").append(URLEncoder.encode(socketId, ENCODING_CHARACTER_SET));

// Adding extra parameters supplied to be added to query string.
for (final String parameterName : mQueryStringParameters.keySet()) {
urlParameters.append("&").append(parameterName).append("=");
urlParameters.append(URLEncoder.encode(mQueryStringParameters.get(parameterName),
ENCODING_CHARACTER_SET));
}
return urlParameters.toString();
} catch (final Exception e) {
throw e;
}
}
}