Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0450cc6

Browse files
committed
Minor clean up: parameter order consistancy
1 parentc93fbdd commit0450cc6

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

‎client/src/main/java/org/asynchttpclient/oauth/OAuthSignatureCalculatorInstance.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,25 @@ public OAuthSignatureCalculatorInstance() throws NoSuchAlgorithmException {
6666
}
6767

6868
publicvoidsign(ConsumerKeyconsumerAuth,RequestTokenuserAuth,Requestrequest,RequestBuilderBase<?>requestBuilder)throwsInvalidKeyException {
69-
StringpercentEncodedNonce =generatePercentEncodedNonce();
69+
Stringnonce =generateNonce();
7070
longtimestamp =generateTimestamp();
71-
sign(consumerAuth,userAuth,request,requestBuilder,percentEncodedNonce,timestamp);
71+
sign(consumerAuth,userAuth,request,requestBuilder,timestamp,nonce);
7272
}
7373

74-
privateStringgeneratePercentEncodedNonce() {
74+
privateStringgenerateNonce() {
7575
ThreadLocalRandom.current().nextBytes(nonceBuffer);
7676
// let's use base64 encoding over hex, slightly more compact than hex or decimals
77-
returnUtf8UrlEncoder.percentEncodeQueryElement(Base64.encode(nonceBuffer));
77+
returnBase64.encode(nonceBuffer);
7878
}
7979

8080
privatestaticlonggenerateTimestamp() {
8181
returnSystem.currentTimeMillis() /1000L;
8282
}
8383

84-
voidsign(ConsumerKeyconsumerAuth,RequestTokenuserAuth,Requestrequest,RequestBuilderBase<?>requestBuilder,StringpercentEncodedNonce,longtimestamp)throwsInvalidKeyException {
84+
voidsign(ConsumerKeyconsumerAuth,RequestTokenuserAuth,Requestrequest,RequestBuilderBase<?>requestBuilder,longtimestamp,Stringnonce)throwsInvalidKeyException {
85+
StringpercentEncodedNonce =Utf8UrlEncoder.percentEncodeQueryElement(nonce);
8586
Stringsignature =calculateSignature(consumerAuth,userAuth,request,timestamp,percentEncodedNonce);
86-
StringheaderValue =constructAuthHeader(consumerAuth,userAuth,signature,percentEncodedNonce,timestamp);
87+
StringheaderValue =constructAuthHeader(consumerAuth,userAuth,signature,timestamp,percentEncodedNonce);
8788
requestBuilder.setHeader(HttpHeaderNames.AUTHORIZATION,headerValue);
8889
}
8990

@@ -170,7 +171,7 @@ private byte[] digest(ConsumerKey consumerAuth, RequestToken userAuth, ByteBuffe
170171
returnmac.doFinal();
171172
}
172173

173-
StringconstructAuthHeader(ConsumerKeyconsumerAuth,RequestTokenuserAuth,Stringsignature,StringpercentEncodedNonce,longoauthTimestamp) {
174+
StringconstructAuthHeader(ConsumerKeyconsumerAuth,RequestTokenuserAuth,Stringsignature,longoauthTimestamp,StringpercentEncodedNonce) {
174175
StringBuildersb =StringBuilderPool.DEFAULT.stringBuilder();
175176
sb.append("OAuth ");
176177
sb.append(KEY_OAUTH_CONSUMER_KEY).append("=\"").append(consumerAuth.getPercentEncodedKey()).append("\", ");

‎client/src/test/java/org/asynchttpclient/oauth/OAuthSignatureCalculatorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ public void testSignatureGenerationWithAsteriskInPath() throws InvalidKeyExcepti
311311
StringactualSignature =newOAuthSignatureCalculatorInstance().calculateSignature(consumerKey,requestToken,request,timestamp,nonce);
312312
assertEquals(actualSignature,expectedSignature);
313313

314-
StringgeneratedAuthHeader =newOAuthSignatureCalculatorInstance().constructAuthHeader(consumerKey,requestToken,actualSignature,nonce,timestamp);
314+
StringgeneratedAuthHeader =newOAuthSignatureCalculatorInstance().constructAuthHeader(consumerKey,requestToken,actualSignature,timestamp,nonce);
315315
assertTrue(generatedAuthHeader.contains("oauth_signature=\"cswi%2Fv3ZqhVkTyy5MGqW841BxDA%3D\""));
316316
}
317317

‎client/src/test/java/org/asynchttpclient/oauth/StaticOAuthSignatureCalculator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public StaticOAuthSignatureCalculator(ConsumerKey consumerKey, RequestToken requ
3737
@Override
3838
publicvoidcalculateAndAddSignature(Requestrequest,RequestBuilderBase<?>requestBuilder) {
3939
try {
40-
newOAuthSignatureCalculatorInstance().sign(consumerKey,requestToken,request,requestBuilder,nonce,timestamp);
40+
newOAuthSignatureCalculatorInstance().sign(consumerKey,requestToken,request,requestBuilder,timestamp,nonce);
4141
}catch (InvalidKeyException |NoSuchAlgorithmExceptione) {
4242
thrownewIllegalArgumentException(e);
4343
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp