fix 13687 (Azure#13778)

Author: isra-fel

src/KeyVault/KeyVault/ChangeLog.md

@@ -18,9 +18,10 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Added a new parameter `-AsPlainText` to `Get-AzKeyVaultSecret` to directly return the secret in plain text
+* Added a new parameter `-AsPlainText` to `Get-AzKeyVaultSecret` to directly return the secret in plain text [#13630]
 * Supported selective restore a key from a managed HSM full backup [#13526]
 * Added missing return objects of `Get-Secret` in SecretManagement module
+* Fixed an issue that may cause vault to be created without default access policy [#13687]
 
 ## Version 3.2.0
 * Supported "all" as an option when setting key vault access policies

src/KeyVault/KeyVault/Models/KeyVaultManagementCmdletBase.cs

@@ -20,6 +20,8 @@
 using Microsoft.Azure.Commands.ResourceManager.Common.Paging;
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Graph.RBAC.Version1_6.ActiveDirectory;
+using Graph20190326Ad = Microsoft.Azure.Graph.RBAC.Version1_6_20190326.ActiveDirectory;
+using Microsoft.Azure.Graph.RBAC.Version1_6_20190326;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.Internal.Resources.Models;
 using Microsoft.Azure.Management.Internal.Resources.Utilities;
@@ -234,14 +236,9 @@ protected string GetCurrentUsersObjectId()
             string objectId = null;
             if (DefaultContext.Account.Type == AzureAccount.AccountType.User)
             {
-// TODO: Remove IfDef
-#if NETSTANDARD
-                objectId = ActiveDirectoryClient.GetObjectId(new ADObjectFilterOptions { UPN = DefaultContext.Account.Id }).ToString();
-#else
-                var userFetcher = ActiveDirectoryClient.Me.ToUser();
-                var user = userFetcher.ExecuteAsync().Result;
-                objectId = user.ObjectId;
-#endif
+                var adClient = new Graph20190326Ad.ActiveDirectoryClient(DefaultProfile.DefaultContext);
+                // this operation is only in 20190326 version of API
+                objectId = adClient.GraphClient.SignedInUser.Get()?.ObjectId;
             }
 
             return objectId;