add auth-datafile support

Author: jaeopt

core-httpclient-impl/src/main/java/com/optimizely/ab/OptimizelyFactory.java

@@ -189,6 +189,25 @@ public static Optimizely newDefaultInstance(String sdkKey, String fallback) {
         return newDefaultInstance(builder.build(), notificationCenter);
     }
 
+    /**
+     * Returns a new Optimizely instance with authenticated datafile support.
+     *
+     * @param sdkKey   SDK key used to build the ProjectConfigManager.
+     * @param authDatafileToken  Token for authenticated datafile access.
+     * @param fallback Fallback datafile string used by the ProjectConfigManager to be immediately available.
+     */
+    public static Optimizely newDefaultInstance(String sdkKey, String authDatafileToken, String fallback) {
+        NotificationCenter notificationCenter = new NotificationCenter();
+
+        HttpProjectConfigManager.Builder builder = HttpProjectConfigManager.builder()
+            .withDatafile(fallback)
+            .withNotificationCenter(notificationCenter)
+            .withSdkKey(sdkKey)
+            .withAuthDatafileToken(authDatafileToken);
+
+        return newDefaultInstance(builder.build(), notificationCenter);
+    }
+
     /**
      * Returns a new Optimizely instance based on preset configuration.
      * EventHandler - {@link AsyncEventHandler}

core-httpclient-impl/src/main/java/com/optimizely/ab/config/HttpProjectConfigManager.java

@@ -54,12 +54,21 @@ public class HttpProjectConfigManager extends PollingProjectConfigManager {
 
     private final OptimizelyHttpClient httpClient;
     private final URI uri;
+    private final String authDatafileToken;
     private String datafileLastModified;
 
-    private HttpProjectConfigManager(long period, TimeUnit timeUnit, OptimizelyHttpClient httpClient, String url, long blockingTimeoutPeriod, TimeUnit blockingTimeoutUnit, NotificationCenter notificationCenter) {
+    private HttpProjectConfigManager(long period,
+                                     TimeUnit timeUnit,
+                                     OptimizelyHttpClient httpClient,
+                                     String url,
+                                     String authDatafileToken,
+                                     long blockingTimeoutPeriod,
+                                     TimeUnit blockingTimeoutUnit,
+                                     NotificationCenter notificationCenter) {
         super(period, timeUnit, blockingTimeoutPeriod, blockingTimeoutUnit, notificationCenter);
         this.httpClient = httpClient;
         this.uri = URI.create(url);
+        this.authDatafileToken = authDatafileToken;
     }
 
     public URI getUri() {
@@ -106,6 +115,10 @@ static ProjectConfig parseProjectConfig(String datafile) throws ConfigParseExcep
     protected ProjectConfig poll() {
         HttpGet httpGet = new HttpGet(uri);
 
+        if (authDatafileToken != null) {
+            httpGet.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + authDatafileToken);
+        }
+
         if (datafileLastModified != null) {
             httpGet.setHeader(HttpHeaders.IF_MODIFIED_SINCE, datafileLastModified);
         }
@@ -132,7 +145,9 @@ public static Builder builder() {
     public static class Builder {
         private String datafile;
         private String url;
+        private String authDatafileToken = null;
         private String format = "https://cdn.optimizely.com/datafiles/%s.json";
+        private String authFormat = "https://www.optimizely-cdn.com/datafiles/auth/%s.json";
         private OptimizelyHttpClient httpClient;
         private NotificationCenter notificationCenter;
 
@@ -153,6 +168,11 @@ public Builder withSdkKey(String sdkKey) {
             return this;
         }
 
+        public Builder withAuthDatafileToken(String token) {
+            this.authDatafileToken = token;
+            return this;
+        }
+
         public Builder withUrl(String url) {
             this.url = url;
             return this;
@@ -261,14 +281,26 @@ public HttpProjectConfigManager build(boolean defer) {
                     throw new NullPointerException("sdkKey cannot be null");
                 }
 
-                url = String.format(format, sdkKey);
+                if (authDatafileToken == null) {
+                    url = String.format(format, sdkKey);
+                } else {
+                    url = String.format(authFormat, sdkKey);
+                }
             }
 
             if (notificationCenter == null) {
                 notificationCenter = new NotificationCenter();
             }
 
-            HttpProjectConfigManager httpProjectManager = new HttpProjectConfigManager(period, timeUnit, httpClient, url, blockingTimeoutPeriod, blockingTimeoutUnit, notificationCenter);
+            HttpProjectConfigManager httpProjectManager = new HttpProjectConfigManager(
+                period,
+                timeUnit,
+                httpClient,
+                url,
+                authDatafileToken,
+                blockingTimeoutPeriod,
+                blockingTimeoutUnit,
+                notificationCenter);
 
             if (datafile != null) {
                 try {