sdk/java: replace refresh token with /hello call

Closes #3148

Author: Chris Garvin <chris.garvin@me.com>
Date: Mon Apr 2 13:48:02 2018 -0700
upstream:567c92d9e9f26121eadcfbc28d98f5b9ff2bae6c

Author: chrisgarvin

src/main/java/com/seq/http/Client.java

@@ -23,8 +23,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.seq.http.session.ProdRefresher;
-import com.seq.http.session.Refresher;
+import com.google.gson.annotations.SerializedName;
 import com.google.gson.Gson;
 
 import com.squareup.okhttp.CertificatePinner;
@@ -47,9 +46,10 @@
  */
 public class Client {
   private OkHttpClient httpClient;
-  private String macaroon;
+  private String credential;
   private String ledgerName;
-  public Refresher refresher;
+  private String teamName;
+  private Boolean teamNameRequested;
 
   // Used to create empty, in-memory key stores.
   private static final char[] DEFAULT_KEYSTORE_PASSWORD = "password".toCharArray();
@@ -60,6 +60,15 @@ private static class BuildProperties {
     public String version;
   }
 
+  private static class TeamResponse {
+    @SerializedName("team_name")
+    public String teamName;
+
+    public TeamResponse() {
+      this.teamName = null;
+    }
+  }
+
   static {
     InputStream in = Client.class.getClassLoader().getResourceAsStream("properties.json");
     if (in != null) {
@@ -76,9 +85,17 @@ public Client(Builder builder) throws ConfigurationException {
       throw new ConfigurationException("No credential provided");
     }
     this.ledgerName = builder.ledger;
-    this.macaroon = builder.credential;
+    this.credential = builder.credential;
     this.httpClient = buildHttpClient(builder);
-    this.refresher = new ProdRefresher();
+    this.teamName = null;
+    this.teamNameRequested = false;
+  }
+
+  public void getTeamName(String credential) throws ChainException {
+    this.teamNameRequested = true;
+    TeamResponse teamResp = new TeamResponse();
+    teamResp = request("hello", new Object(), TeamResponse.class);
+    this.teamName = teamResp.teamName;
   }
 
   /**
@@ -98,18 +115,18 @@ public T create(Response response, Gson deserializer) throws IOException {
           }
         };
 
-    if (this.refresher.needsRefresh()) {
-      this.refresher.refresh(this.macaroon);
+    if(this.teamNameRequested == false && this.teamName == null) {
+      getTeamName(this.credential);
     }
     return post(action, body, rc);
   }
 
   /**
-   * Returns the macaroon (possibly null).
-   * @return the macaroon
+   * Returns the credential (possibly null).
+   * @return the credential
    */
-  public String macaroon() {
-    return macaroon;
+  public String credential() {
+    return credential;
   }
 
   /**
@@ -188,8 +205,10 @@ private <T> T post(String path, Object body, ResponseCreator<T> respCreator)
         if (urlParts.endsWith("/")) {
           urlParts = urlParts.substring(0, urlParts.length() - 1);
         }
-        urlParts += "/" + this.refresher.teamName();
-        urlParts += "/" + this.ledgerName;
+        if (this.teamName != null) {
+          urlParts += "/" + this.teamName;
+          urlParts += "/" + this.ledgerName;
+        }
         urlParts += "/" + path;
         endpointURL = new URL(urlParts);
       } catch (MalformedURLException ex) {
@@ -199,8 +218,7 @@ private <T> T post(String path, Object body, ResponseCreator<T> respCreator)
       Request req =
           new Request.Builder()
               .header("User-Agent", "sequence-sdk-java/" + version)
-              .header("Macaroon", this.macaroon)
-              .header("Discharge-Macaroon", this.refresher.dischargeMacaroon())
+              .header("Credential", this.credential)
               .header("Idempotency-Key", idempotencyKey)
               .header("Name-Set", "camel|snake")
               .url(endpointURL)
@@ -353,8 +371,8 @@ private Response checkError(Response response) throws ChainException {
   @Override
   public int hashCode() {
     int code = 0;
-    if (this.macaroon != null) {
-      code = code * 31 + this.macaroon.hashCode();
+    if (this.credential != null) {
+      code = code * 31 + this.credential.hashCode();
     }
     return code;
   }
@@ -370,7 +388,7 @@ public boolean equals(Object o) {
     if (!(o instanceof Client)) return false;
 
     Client other = (Client) o;
-    return Objects.equals(this.macaroon, other.macaroon);
+    return Objects.equals(this.credential, other.credential);
   }
 
   /**

src/main/java/com/seq/http/session/ProdRefresher.java

@@ -1,7 +1,6 @@
 package com.seq;
 
 import com.seq.http.Client;
-import com.seq.http.session.TestRefresher;
 
 import java.io.IOException;
 import java.io.ByteArrayInputStream;
@@ -14,23 +13,17 @@ public class TestUtils {
 
   public static Client generateClient() throws Exception {
     String ledgerName = System.getenv("LEDGER_NAME");
-    String teamName = System.getenv("TEAM_NAME");
     String credential = System.getenv("SEQCRED");
 
     if (ledgerName == null || ledgerName.isEmpty()) {
       ledgerName = "test";
     }
 
-    if (teamName == null || teamName.isEmpty()) {
-      teamName = "team";
-    }
-
     Client client =
         new Client.Builder()
             .setLedgerName(ledgerName)
             .setCredential(credential)
             .build();
-    client.refresher = new TestRefresher(teamName, "");
     return client;
   }
 }