Skip to content

Commit fe198be

Browse files
committed
added a null check for oauth1 signature calculating, now this class can be used to acquire request token within the oauth dance logic
1 parent a428b6c commit fe198be

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

api/src/main/java/org/asynchttpclient/oauth/OAuthSignatureCalculator.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@ public String calculateSignature(String method, String baseURL, long oauthTimest
126126
allParameters.add(KEY_OAUTH_NONCE, nonce);
127127
allParameters.add(KEY_OAUTH_SIGNATURE_METHOD, OAUTH_SIGNATURE_METHOD);
128128
allParameters.add(KEY_OAUTH_TIMESTAMP, String.valueOf(oauthTimestamp));
129-
allParameters.add(KEY_OAUTH_TOKEN, userAuth.getKey());
129+
if (userAuth.getKey() != null) {
130+
allParameters.add(KEY_OAUTH_TOKEN, userAuth.getKey());
131+
}
130132
allParameters.add(KEY_OAUTH_VERSION, OAUTH_VERSION_1_0);
131133

132134
if (formParams != null) {
@@ -164,7 +166,9 @@ public String constructAuthHeader(String signature, String nonce, long oauthTime
164166
StringBuilder sb = new StringBuilder(200);
165167
sb.append("OAuth ");
166168
sb.append(KEY_OAUTH_CONSUMER_KEY).append("=\"").append(consumerAuth.getKey()).append("\", ");
167-
sb.append(KEY_OAUTH_TOKEN).append("=\"").append(userAuth.getKey()).append("\", ");
169+
if (userAuth.getKey() != null) {
170+
sb.append(KEY_OAUTH_TOKEN).append("=\"").append(userAuth.getKey()).append("\", ");
171+
}
168172
sb.append(KEY_OAUTH_SIGNATURE_METHOD).append("=\"").append(OAUTH_SIGNATURE_METHOD).append("\", ");
169173

170174
// careful: base64 has chars that need URL encoding:

0 commit comments

Comments
 (0)