From a0f1a8b0bcafbb8a88b6e1288003a6f3e3c3f48c Mon Sep 17 00:00:00 2001
From: mcilwain <mcilwain@google.com>
Date: Wed, 31 Aug 2016 14:05:36 -0700
Subject: [PATCH] Copy two more fields when building delegated admin
 GoogleCredential

The absence of the service account scopes was causing a NullPointerException
when the Google groups syncing action was running.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=131870610
---
 java/google/registry/request/Modules.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/java/google/registry/request/Modules.java b/java/google/registry/request/Modules.java
index 5ee2a7aad..2710ea136 100644
--- a/java/google/registry/request/Modules.java
+++ b/java/google/registry/request/Modules.java
@@ -224,6 +224,8 @@ public final class Modules {
           .setJsonFactory(googleCredential.getJsonFactory())
           .setServiceAccountId(googleCredential.getServiceAccountId())
           .setServiceAccountPrivateKey(googleCredential.getServiceAccountPrivateKey())
+          .setServiceAccountProjectId(googleCredential.getServiceAccountProjectId())
+          .setServiceAccountScopes(googleCredential.getServiceAccountScopes())
           .setServiceAccountUser(googleAppsAdminEmailAddress)
           .build();
     }