Skip to content

Commit 185e53f

Browse files
s-gromovs-gromov
committed
getAuthorizationUrl for OAuth1 should force to take OAuth1RequestToken
1 parent b2816d8 commit 185e53f

36 files changed

+73
-74
lines changed

‎scribejava-apis/src/main/java/com/github/scribejava/apis/AWeberApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.scribejava.apis;
22

33
import com.github.scribejava.core.builder.api.DefaultApi10a;
4-
import com.github.scribejava.core.model.Token;
4+
import com.github.scribejava.core.model.OAuth1RequestToken;
55

66
public class AWeberApi extends DefaultApi10a {
77

@@ -31,7 +31,7 @@ public String getRequestTokenEndpoint() {
3131
}
3232

3333
@Override
34-
public String getAuthorizationUrl(Token requestToken) {
34+
public String getAuthorizationUrl(OAuth1RequestToken requestToken) {
3535
return String.format(AUTHORIZE_URL, requestToken.getToken());
3636
}
3737
}

‎scribejava-apis/src/main/java/com/github/scribejava/apis/ConstantContactApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.scribejava.apis;
22

33
import com.github.scribejava.core.builder.api.DefaultApi10a;
4-
import com.github.scribejava.core.model.Token;
4+
import com.github.scribejava.core.model.OAuth1RequestToken;
55

66
public class ConstantContactApi extends DefaultApi10a {
77

@@ -25,7 +25,7 @@ public String getAccessTokenEndpoint() {
2525
}
2626

2727
@Override
28-
public String getAuthorizationUrl(Token requestToken) {
28+
public String getAuthorizationUrl(OAuth1RequestToken requestToken) {
2929
return String.format(AUTHORIZE_URL, requestToken.getToken());
3030
}
3131

‎scribejava-apis/src/main/java/com/github/scribejava/apis/DiggApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.scribejava.apis;
22

33
import com.github.scribejava.core.builder.api.DefaultApi10a;
4-
import com.github.scribejava.core.model.Token;
4+
import com.github.scribejava.core.model.OAuth1RequestToken;
55

66
public class DiggApi extends DefaultApi10a {
77

@@ -30,7 +30,7 @@ public String getAccessTokenEndpoint() {
3030
}
3131

3232
@Override
33-
public String getAuthorizationUrl(Token requestToken) {
33+
public String getAuthorizationUrl(OAuth1RequestToken requestToken) {
3434
return String.format(AUTHORIZATION_URL, requestToken.getToken());
3535
}
3636

‎scribejava-apis/src/main/java/com/github/scribejava/apis/DropBoxApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.scribejava.apis;
22

33
import com.github.scribejava.core.builder.api.DefaultApi10a;
4-
import com.github.scribejava.core.model.Token;
4+
import com.github.scribejava.core.model.OAuth1RequestToken;
55

66
public class DropBoxApi extends DefaultApi10a {
77

@@ -22,7 +22,7 @@ public String getAccessTokenEndpoint() {
2222
}
2323

2424
@Override
25-
public String getAuthorizationUrl(Token requestToken) {
25+
public String getAuthorizationUrl(OAuth1RequestToken requestToken) {
2626
return "https://www.dropbox.com/1/oauth/authorize?oauth_token=" + requestToken.getToken();
2727
}
2828

‎scribejava-apis/src/main/java/com/github/scribejava/apis/EvernoteApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.scribejava.apis;
22

33
import com.github.scribejava.core.builder.api.DefaultApi10a;
4-
import com.github.scribejava.core.model.Token;
4+
import com.github.scribejava.core.model.OAuth1RequestToken;
55

66
public class EvernoteApi extends DefaultApi10a {
77

@@ -31,7 +31,7 @@ public String getAccessTokenEndpoint() {
3131
}
3232

3333
@Override
34-
public String getAuthorizationUrl(Token requestToken) {
34+
public String getAuthorizationUrl(OAuth1RequestToken requestToken) {
3535
return String.format(serviceUrl() + "/OAuth.action?oauth_token=%s", requestToken.getToken());
3636
}
3737

‎scribejava-apis/src/main/java/com/github/scribejava/apis/FlickrApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.scribejava.apis;
22

33
import com.github.scribejava.core.builder.api.DefaultApi10a;
4-
import com.github.scribejava.core.model.Token;
4+
import com.github.scribejava.core.model.OAuth1RequestToken;
55

66
/**
77
* OAuth API for Flickr.
@@ -34,7 +34,7 @@ public String getAccessTokenEndpoint() {
3434
* {@inheritDoc}
3535
*/
3636
@Override
37-
public String getAuthorizationUrl(Token requestToken) {
37+
public String getAuthorizationUrl(OAuth1RequestToken requestToken) {
3838
return "https://www.flickr.com/services/oauth/authorize?oauth_token=" + requestToken.getToken();
3939
}
4040

‎scribejava-apis/src/main/java/com/github/scribejava/apis/FoursquareApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.scribejava.apis;
22

33
import com.github.scribejava.core.builder.api.DefaultApi10a;
4-
import com.github.scribejava.core.model.Token;
4+
import com.github.scribejava.core.model.OAuth1RequestToken;
55

66
public class FoursquareApi extends DefaultApi10a {
77

@@ -29,7 +29,7 @@ public String getRequestTokenEndpoint() {
2929
}
3030

3131
@Override
32-
public String getAuthorizationUrl(Token requestToken) {
32+
public String getAuthorizationUrl(OAuth1RequestToken requestToken) {
3333
return String.format(AUTHORIZATION_URL, requestToken.getToken());
3434
}
3535
}

‎scribejava-apis/src/main/java/com/github/scribejava/apis/FreelancerApi.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.scribejava.apis;
22

33
import com.github.scribejava.core.builder.api.DefaultApi10a;
4-
import com.github.scribejava.core.model.Token;
4+
import com.github.scribejava.core.model.OAuth1RequestToken;
55
import com.github.scribejava.core.model.Verb;
66

77
public class FreelancerApi extends DefaultApi10a {
@@ -40,7 +40,7 @@ public Verb getRequestTokenVerb() {
4040
}
4141

4242
@Override
43-
public String getAuthorizationUrl(Token requestToken) {
43+
public String getAuthorizationUrl(OAuth1RequestToken requestToken) {
4444
return String.format(AUTHORIZATION_URL, requestToken.getToken());
4545
}
4646

@@ -71,7 +71,7 @@ public String getAccessTokenEndpoint() {
7171
}
7272

7373
@Override
74-
public String getAuthorizationUrl(Token requestToken) {
74+
public String getAuthorizationUrl(OAuth1RequestToken requestToken) {
7575
return String.format(SANDBOX_AUTHORIZATION_URL + "?oauth_token=%s", requestToken.getToken());
7676
}
7777
}

‎scribejava-apis/src/main/java/com/github/scribejava/apis/GetGlueApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.scribejava.apis;
22

33
import com.github.scribejava.core.builder.api.DefaultApi10a;
4-
import com.github.scribejava.core.model.Token;
4+
import com.github.scribejava.core.model.OAuth1RequestToken;
55

66
public class GetGlueApi extends DefaultApi10a {
77

@@ -31,7 +31,7 @@ public String getRequestTokenEndpoint() {
3131
}
3232

3333
@Override
34-
public String getAuthorizationUrl(Token requestToken) {
34+
public String getAuthorizationUrl(OAuth1RequestToken requestToken) {
3535
return String.format(AUTHORIZE_URL, requestToken.getToken());
3636
}
3737

‎scribejava-apis/src/main/java/com/github/scribejava/apis/GoogleApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.scribejava.apis;
22

33
import com.github.scribejava.core.builder.api.DefaultApi10a;
4-
import com.github.scribejava.core.model.Token;
4+
import com.github.scribejava.core.model.OAuth1RequestToken;
55
import com.github.scribejava.core.model.Verb;
66

77
public class GoogleApi extends DefaultApi10a {
@@ -41,7 +41,7 @@ public Verb getRequestTokenVerb() {
4141
}
4242

4343
@Override
44-
public String getAuthorizationUrl(Token requestToken) {
44+
public String getAuthorizationUrl(OAuth1RequestToken requestToken) {
4545
return String.format(AUTHORIZATION_URL, requestToken.getToken());
4646
}
4747
}

0 commit comments

Comments
 (0)