From f6e7c5372eb3b91aec8c0cd2cea4fc754eff1788 Mon Sep 17 00:00:00 2001
From: Michael Hansen <mihansen@microsoft.com>
Date: Mon, 13 Apr 2020 17:57:16 -0700
Subject: [PATCH] Removed default population of access policies

---
 src/HealthcareApis/HealthcareApis/ChangeLog.md   |  1 +
 .../NewAzureRmHealthcareApisService.cs           | 16 ++++++----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/HealthcareApis/HealthcareApis/ChangeLog.md b/src/HealthcareApis/HealthcareApis/ChangeLog.md
index 9e27a9eb75bb..a9f26a9341a5 100644
--- a/src/HealthcareApis/HealthcareApis/ChangeLog.md
+++ b/src/HealthcareApis/HealthcareApis/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Access policies are no longer defaulted to the current principal
 
 ## Version 1.0.1
 * Update references in .psd1 to use relative path
diff --git a/src/HealthcareApis/HealthcareApis/HealthcareApis/NewAzureRmHealthcareApisService.cs b/src/HealthcareApis/HealthcareApis/HealthcareApis/NewAzureRmHealthcareApisService.cs
index f37c5f560f19..114287451567 100644
--- a/src/HealthcareApis/HealthcareApis/HealthcareApis/NewAzureRmHealthcareApisService.cs
+++ b/src/HealthcareApis/HealthcareApis/HealthcareApis/NewAzureRmHealthcareApisService.cs
@@ -208,17 +208,13 @@ private List<ServiceAccessPolicyEntry> GetAccessPolicies()
         {
             List<ServiceAccessPolicyEntry> accessPolicies = new List<ServiceAccessPolicyEntry>();
 
-            if (AccessPolicyObjectId == null || AccessPolicyObjectId.Length == 0)
+            if (AccessPolicyObjectId != null && AccessPolicyObjectId.Length > 0)
             {
-                string objectID = base.AccessPolicyID;
-                accessPolicies.Add(new ServiceAccessPolicyEntry(objectID));
-                return accessPolicies;
-            }
-
-            foreach (var objectID in AccessPolicyObjectId)
-            {
-                HealthcareApisArgumentValidator.ValidateObjectId(objectID);
-                accessPolicies.Add(new ServiceAccessPolicyEntry(objectID));
+                foreach (var objectID in AccessPolicyObjectId)
+                {
+                    HealthcareApisArgumentValidator.ValidateObjectId(objectID);
+                    accessPolicies.Add(new ServiceAccessPolicyEntry(objectID));
+                }
             }
 
             return accessPolicies;