Merge pull request #486 from microsoft/trboehre/signinlink

Fixed BotSignIn.getSignInUrl

Author: tracyboehrer

libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotFrameworkAdapter.java

@@ -7,7 +7,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.io.BaseEncoding;
 import com.microsoft.bot.builder.integration.AdapterIntegration;
 import com.microsoft.bot.connector.Channels;
 import com.microsoft.bot.connector.ConnectorClient;
@@ -38,6 +37,7 @@
 import com.microsoft.bot.schema.ConversationReference;
 import com.microsoft.bot.schema.ConversationsResult;
 import com.microsoft.bot.schema.ResourceResponse;
+import com.microsoft.bot.schema.Serialization;
 import com.microsoft.bot.schema.TokenExchangeState;
 import com.microsoft.bot.schema.TokenResponse;
 import com.microsoft.bot.schema.TokenStatus;
@@ -52,6 +52,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.Base64;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ConcurrentHashMap;
@@ -947,10 +948,9 @@ public CompletableFuture<String> getOauthSignInLink(
                     }
                 };
 
-                ObjectMapper mapper = new ObjectMapper();
-                String serializedState = mapper.writeValueAsString(tokenExchangeState);
-                byte[] encodedState = serializedState.getBytes(StandardCharsets.UTF_8);
-                String state = BaseEncoding.base64().encode(encodedState);
+                String serializedState = Serialization.toString(tokenExchangeState);
+                String state = Base64.getEncoder()
+                    .encodeToString(serializedState.getBytes(StandardCharsets.UTF_8));
 
                 return oAuthClient.getBotSignIn().getSignInUrl(state);
             } catch (Throwable t) {
@@ -1008,10 +1008,9 @@ public CompletableFuture<String> getOauthSignInLink(
                     }
                 };
 
-                ObjectMapper mapper = new ObjectMapper();
-                String serializedState = mapper.writeValueAsString(tokenExchangeState);
-                byte[] encodedState = serializedState.getBytes(StandardCharsets.UTF_8);
-                String state = BaseEncoding.base64().encode(encodedState);
+                String serializedState = Serialization.toString(tokenExchangeState);
+                String state = Base64.getEncoder()
+                    .encodeToString(serializedState.getBytes(StandardCharsets.UTF_8));
 
                 return oAuthClient.getBotSignIn().getSignInUrl(state);
             } catch (Throwable t) {

libraries/bot-connector/src/main/java/com/microsoft/bot/connector/rest/RestBotSignIn.java

@@ -6,13 +6,9 @@
 
 package com.microsoft.bot.connector.rest;
 
-import com.microsoft.bot.azure.CloudException;
 import retrofit2.Retrofit;
 import com.microsoft.bot.connector.BotSignIn;
-import com.google.common.reflect.TypeToken;
 import com.microsoft.bot.rest.ServiceResponse;
-import java.io.IOException;
-import java.net.HttpURLConnection;
 import java.util.concurrent.CompletableFuture;
 
 import okhttp3.ResponseBody;
@@ -25,6 +21,7 @@
  * An instance of this class provides access to all the operations defined in
  * BotSignIns.
  */
+@SuppressWarnings("PMD")
 public class RestBotSignIn implements BotSignIn {
     /** The Retrofit service to perform REST calls. */
     private BotSignInsService service;
@@ -47,10 +44,10 @@ public RestBotSignIn(Retrofit withRetrofit, RestOAuthClient withClient) {
      * The interface defining all the services for BotSignIns to be used by Retrofit
      * to perform actually REST calls.
      */
-    @SuppressWarnings({ "checkstyle:linelength", "checkstyle:JavadocMethod" })
+    @SuppressWarnings({"checkstyle:linelength", "checkstyle:JavadocMethod"})
     interface BotSignInsService {
-        @Headers({ "Content-Type: application/json; charset=utf-8",
-            "x-ms-logging-context: com.microsoft.bot.schema.BotSignIns getSignInUrl" })
+        @Headers({"Content-Type: application/json; charset=utf-8",
+            "x-ms-logging-context: com.microsoft.bot.schema.BotSignIns getSignInUrl"})
         @GET("api/botsignin/GetSignInUrl")
         CompletableFuture<Response<ResponseBody>> getSignInUrl(
             @Query("state") String state,
@@ -117,14 +114,11 @@ public CompletableFuture<String> getSignInUrl(
 
     private ServiceResponse<String> getSignInUrlDelegate(
         Response<ResponseBody> response
-    ) throws CloudException, IOException, IllegalArgumentException {
+    ) throws ErrorResponseException, IllegalArgumentException {
+        if (!response.isSuccessful()) {
+            throw new ErrorResponseException("getSignInUrl", response);
+        }
 
-        return client.restClient()
-            .responseBuilderFactory()
-            .<String, CloudException>newInstance(client.serializerAdapter())
-            .register(HttpURLConnection.HTTP_OK, new TypeToken<String>() {
-            }.getType())
-            .registerError(CloudException.class)
-            .build(response);
+        return new ServiceResponse<>(response.body().source().buffer().readUtf8(), response);
     }
 }

libraries/bot-schema/src/main/java/com/microsoft/bot/schema/Serialization.java

@@ -29,7 +29,7 @@ private Serialization() {
 
     /**
      * Deserialize a value.
-     * 
+     *
      * @param obj       The object to deserialize.
      * @param classType The class type to convert to.
      * @param <T>       The type of the return value.
@@ -45,7 +45,7 @@ public static <T> T getAs(Object obj, Class<T> classType) {
 
     /**
      * Deserialize a value.
-     * 
+     *
      * @param obj       The object to deserialize.
      * @param classType The class type to convert to.
      * @param <T>       The type of the return value.
@@ -64,7 +64,7 @@ public static <T> T safeGetAs(Object obj, Class<T> classType) throws JsonProcess
     /**
      * Deserializes an object to a type as a future to ease CompletableFuture
      * chaining.
-     * 
+     *
      * @param obj       The object to deserialize.
      * @param classType Class information to convert to.
      * @param <R>       The return Type.
@@ -85,7 +85,7 @@ public static <R> CompletableFuture<R> futureGetAs(Object obj, Class<R> classTyp
 
     /**
      * Converts an input object to another type.
-     * 
+     *
      * @param source  The object to convert.
      * @param toClass The class to convert to.
      * @param <T>     Type of return value.
@@ -94,4 +94,15 @@ public static <R> CompletableFuture<R> futureGetAs(Object obj, Class<R> classTyp
     public static <T> T convert(Object source, Class<T> toClass) {
         return getAs(source, toClass);
     }
+
+    /**
+     * Convert an object to a JSON string.
+     *
+     * @param source The object to convert.
+     * @return The JSON string value.
+     * @throws JsonProcessingException Error converting to JSON
+     */
+    public static String toString(Object source) throws JsonProcessingException {
+        return objectMapper.writeValueAsString(source);
+    }
 }