Merge "Remove unused OAuthToken in authorisation URL" into stable-2.10
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthServiceProvider.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthServiceProvider.java
index 8375e31..9be2630 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthServiceProvider.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthServiceProvider.java
@@ -23,29 +23,20 @@
public interface OAuthServiceProvider {
/**
- * Retrieve the request token.
- *
- * @return request token
- */
- OAuthToken getRequestToken();
-
- /**
* Returns the URL where you should redirect your users to authenticate
* your application.
*
- * @param requestToken the request token you need to authorize
- * @return the URL where you should redirect your users
+ * @return the OAuth service URL to redirect your users for authentication
*/
- String getAuthorizationUrl(OAuthToken requestToken);
+ String getAuthorizationUrl();
/**
* Retrieve the access token
*
- * @param requestToken request token (obtained previously)
* @param verifier verifier code
* @return access token
*/
- OAuthToken getAccessToken(OAuthToken requestToken, OAuthVerifier verifier);
+ OAuthToken getAccessToken(OAuthVerifier verifier);
/**
* After establishing of secure communication channel, this method supossed to
diff --git a/gerrit-oauth/src/main/java/com/google/gerrit/httpd/auth/oauth/OAuthSession.java b/gerrit-oauth/src/main/java/com/google/gerrit/httpd/auth/oauth/OAuthSession.java
index 6e3ea7a..8ffbbe6 100644
--- a/gerrit-oauth/src/main/java/com/google/gerrit/httpd/auth/oauth/OAuthSession.java
+++ b/gerrit-oauth/src/main/java/com/google/gerrit/httpd/auth/oauth/OAuthSession.java
@@ -89,8 +89,7 @@
}
log.debug("Login-Retrieve-User " + this);
- token = oauth.getAccessToken(null,
- new OAuthVerifier(request.getParameter("code")));
+ token = oauth.getAccessToken(new OAuthVerifier(request.getParameter("code")));
user = oauth.getUserInfo(token);
@@ -105,7 +104,7 @@
} else {
log.debug("Login-PHASE1 " + this);
redirectUrl = request.getRequestURI();
- response.sendRedirect(oauth.getAuthorizationUrl(null) +
+ response.sendRedirect(oauth.getAuthorizationUrl() +
"&state=" + state);
return false;
}
