modified google analytics connector to use oauth2 (untested)

.gitignore

@@ -7,10 +7,12 @@
 *.log
 *.properties
 *.xml
+*.iml
 
 build
 scratch
 target
 .classpath
 .project
 .settings
+.idea

analytics.ini.example

@@ -138,6 +138,8 @@ metrics = ga:visits,ga:visitors,ga:pageViews,ga:bounces,ga:timeOnSite,ga:newVisi
 [service:analytics]
 user=
 pass=
+service_account_id=
+key_file=
 account_url=https://www.google.com/analytics/feeds/accounts/default
 data_url=https://www.google.com/analytics/feeds/data
 app_name= analytics

pom.xml

@@ -131,7 +131,12 @@
 			<artifactId>core</artifactId>
 			<version>1.47.1</version>
 		</dependency>
-		<dependency>
+        <dependency>
+            <groupId>com.google.api-client</groupId>
+            <artifactId>google-api-client</artifactId>
+            <version>1.20.0</version>
+        </dependency>
+        <dependency>
 			<groupId>net.sf.opencsv</groupId>
 			<artifactId>opencsv</artifactId>
 			<version>2.3</version>

src/main/java/gov/nysenate/analytics/Main.java

@@ -104,10 +104,10 @@ public static void run(Ini config, String startDate, String endDate) throws Exce
   {
     Section analyticsConfig = config.get("service:analytics");
     GoogleAnalyticsConnect googleConnector = new GoogleAnalyticsConnect(
-        analyticsConfig.get("user"),
-        analyticsConfig.get("pass"),
-        analyticsConfig.get("app_name")
-        );
+            analyticsConfig.get("service_account_id"),
+            new File(analyticsConfig.get("key_file")),
+            analyticsConfig.get("app_name")
+    );
 
     List<NYSenate> senatorData = Utils.getSenateData();
 

src/main/java/gov/nysenate/analytics/connectors/GoogleAnalyticsConnect.java

@@ -1,10 +1,17 @@
 package gov.nysenate.analytics.connectors;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Map;
+import java.security.GeneralSecurityException;
+import java.util.Collections;
+import java.util.List;
 
+import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
+import com.google.api.client.http.HttpTransport;
+import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.json.jackson2.JacksonFactory;
 import org.ini4j.Profile.Section;
 
 import com.google.gdata.client.analytics.AnalyticsService;
@@ -18,25 +25,21 @@ public class GoogleAnalyticsConnect
     private final URL dataURL;
     private final AnalyticsService as;
 
-    /**
-     * 
-     * @param config
-     *            Required Keys: user, pass, app_name
-     * 
-     * @throws AuthenticationException
-     */
-    public GoogleAnalyticsConnect(Map<String, String> config) throws AuthenticationException
-    {
-        this(config.get("user"), config.get("pass"), config.get("app_name"));
-    }
+    private static final String analyticsUrl = "https://www.google.com/analytics/feeds/data";
 
-    public GoogleAnalyticsConnect(String user, String pass, String appName) throws AuthenticationException
-    {
+    public GoogleAnalyticsConnect(String serviceAccountId, File keyFile, String appName) throws AuthenticationException {
         this.as = new AnalyticsService(appName);
-        this.as.setUserCredentials(user, pass);
 
+        final List<String> scopes = Collections.singletonList(analyticsUrl);
         try {
-            this.dataURL = new URL("https://www.google.com/analytics/feeds/data");
+            this.as.setOAuth2Credentials(getOAuthCredential(serviceAccountId, scopes, keyFile));
+        } catch (IOException | GeneralSecurityException e) {
+            e.printStackTrace(System.err);
+            throw new RuntimeException("Key File error:", e);
+        }
+
+        try {
+            this.dataURL = new URL(analyticsUrl);
         }
         catch (MalformedURLException e) {
             System.err.println("Malformed data url. This is hardcoded and shouldn't be possible.");
@@ -80,4 +83,20 @@ public DataFeed getDataFeed(Section params)
         }
         return null;
     }
+
+    /**
+     * Get oath credentials for the specified scopes using a serviceAccountId and a file containing a key
+     */
+    private static GoogleCredential getOAuthCredential(String serviceAccountId, List<String> scopes, File keyFile)
+            throws IOException, GeneralSecurityException {
+        HttpTransport httpTransport = new NetHttpTransport();
+        JacksonFactory jsonFactory = new JacksonFactory();
+        return new GoogleCredential.Builder()
+                .setTransport(httpTransport)
+                .setJsonFactory(jsonFactory)
+                .setServiceAccountId(serviceAccountId)
+                .setServiceAccountScopes(scopes)
+                .setServiceAccountPrivateKeyFromP12File(keyFile)
+                .build();
+    }
 }