Change OAuth 2.0 flow to use access_type=offline&approval_prompt=force

Yaniv Inbar · Yaniv Inbar · commit 39776ad289ca · 2011-11-03T13:08:22.000-04:00
http://codereview.appspot.com/5318076/
diff --git a/google-api-client-extensions/.classpath b/google-api-client-extensions/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
   <classpathentry kind="src" path="src/main/java" />
+  <classpathentry kind="src" path="src/test/java" />
   <classpathentry kind="con"
     path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5" />
   <classpathentry kind="output" path="target/classes" />
diff --git a/google-api-client-extensions/src/main/java/com/google/api/client/googleapis/extensions/auth/helpers/oauth2/draft10/GoogleOAuth2ThreeLeggedFlow.java b/google-api-client-extensions/src/main/java/com/google/api/client/googleapis/extensions/auth/helpers/oauth2/draft10/GoogleOAuth2ThreeLeggedFlow.java
@@ -34,6 +34,18 @@
 @Inheritance(customStrategy = "complete-table")
 public class GoogleOAuth2ThreeLeggedFlow extends OAuth2ThreeLeggedFlow {
 
+  /**
+   * Authorization endpoint to use.
+   *
+   * <p>
+   * This forces the approval prompt to show, and requests offline access in order to guarantee a
+   * refresh token to be returned.
+   * </p>
+   */
+  private static final String AUTHORIZATION_ENDPOINT =
+      new GoogleAuthorizationRequestUrl()
+          .setAccessType("offline").setApprovalPrompt("force").build();
+
   /**
    * Create the flow object with the information provided and generate the authorization url.
    *
@@ -50,7 +62,7 @@ public GoogleOAuth2ThreeLeggedFlow(
         clientSecret,
         scope,
         callbackUrl,
-        GoogleAuthorizationRequestUrl.AUTHORIZATION_SERVER_URL,
+        AUTHORIZATION_ENDPOINT,
         GoogleAccessTokenRequest.AUTHORIZATION_SERVER_URL);
   }
 
diff --git a/google-api-client-extensions/src/test/java/com/google/api/client/googleapis/extensions/auth/helpers/oauth2/draft10/GoogleOAuth2ThreeLeggedFlowTest.java b/google-api-client-extensions/src/test/java/com/google/api/client/googleapis/extensions/auth/helpers/oauth2/draft10/GoogleOAuth2ThreeLeggedFlowTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.api.client.googleapis.extensions.auth.helpers.oauth2.draft10;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests {@link GoogleOAuth2ThreeLeggedFlow}.
+ *
+ * @author Yaniv Inbar
+ */
+public class GoogleOAuth2ThreeLeggedFlowTest extends TestCase {
+
+  public void testConstructor() {
+    GoogleOAuth2ThreeLeggedFlow flow = new GoogleOAuth2ThreeLeggedFlow(
+        "userIdValue", "clientIdValue", "clientSecretValue", "scopeValue", "callbackUrlValue");
+    assertEquals("https://accounts.google.com/o/oauth2/auth?client_id=clientIdValue&"
+        + "redirect_uri=callbackUrlValue&response_type=code&scope=scopeValue&"
+        + "access_type=offline&approval_prompt=force", flow.getAuthorizationUrl());
+  }
+}
