Merge pull request #10492 from VeryEarly/nullreferenceexception-in-NewAZADServicePrincipal#9478

Fix bug in New-AZADServicePrincipal#9478

Author: isra-fel

src/Resources/Resources/ActiveDirectory/Cmdlets/NewAzureADServicePrincipalCommand.cs

@@ -173,6 +173,9 @@ public override void ExecuteCmdlet()
         {
             ExecutionBlock(() =>
             {
+                //safe gauard for login status, check if DefaultContext not existed, PSInvalidOperationException will be thrown
+                var CheckDefaultContext = DefaultContext;
+
                 if (this.ParameterSetName == SimpleParameterSet)
                 {
                     CreateSimpleServicePrincipal();
@@ -248,21 +251,7 @@ public override void ExecuteCmdlet()
 
         private void CreateSimpleServicePrincipal()
         {
-            var subscriptionId = DefaultProfile.DefaultContext.Subscription.Id;
-            if (!this.IsParameterBound(c => c.Scope))
-            {
-                Scope = string.Format("/subscriptions/{0}", subscriptionId);
-                WriteVerbose(string.Format("No scope provided - using the default scope '{0}'", Scope));
-            }
-
-            AuthorizationClient.ValidateScope(Scope, true);
-
-            if (!this.IsParameterBound(c => c.Role))
-            {
-                Role = "Contributor";
-                WriteVerbose(string.Format("No role provided - using the default role '{0}'", Role));
-            }
-
+            var subscriptionId = DefaultContext.Subscription?.Id;
             if (!this.IsParameterBound(c => c.StartDate))
             {
                 DateTime currentTime = DateTime.UtcNow;
@@ -327,11 +316,29 @@ private void CreateSimpleServicePrincipal()
                 }
             };
 
-            var shouldProcessMessage = SkipRoleAssignment() ?
-                                        string.Format("Adding a new service principal to be associated with an application " +
-                                                      "having AppId '{0}' with no permissions.", createParameters.ApplicationId) :
-                                        string.Format("Adding a new service principal to be associated with an application " +
+            var shouldProcessMessage = string.Format("Adding a new service principal to be associated with an application " +
+                                                      "having AppId '{0}' with no permissions.", createParameters.ApplicationId);
+
+            if (!SkipRoleAssignment())
+            {
+                if (!this.IsParameterBound(c => c.Scope))
+                {
+                    Scope = string.Format("/subscriptions/{0}", subscriptionId);
+                    WriteVerbose(string.Format("No scope provided - using the default scope '{0}'", Scope));
+                }
+
+                AuthorizationClient.ValidateScope(Scope, true);
+
+                if (!this.IsParameterBound(c => c.Role))
+                {
+                    Role = "Contributor";
+                    WriteVerbose(string.Format("No role provided - using the default role '{0}'", Role));
+                }
+
+                shouldProcessMessage = string.Format("Adding a new service principal to be associated with an application " +
                                                       "having AppId '{0}' with '{1}' role over scope '{2}'.", createParameters.ApplicationId, this.Role, this.Scope);
+            }
+
             if (ShouldProcess(target: createParameters.ApplicationId.ToString(), action: shouldProcessMessage))
             {
                 PSADServicePrincipalWrapper servicePrincipal = new PSADServicePrincipalWrapper(ActiveDirectoryClient.CreateServicePrincipal(createParameters));
@@ -383,7 +390,12 @@ private void CreateSimpleServicePrincipal()
 
         private bool SkipRoleAssignment()
         {
-            return this.IsParameterBound(c => c.SkipAssignment) || (!this.IsParameterBound(c => c.Role) && !this.IsParameterBound(c => c.Scope));
+            return this.IsParameterBound(c => c.SkipAssignment) || (!this.IsParameterBound(c => c.Role) && !this.IsParameterBound(c => c.Scope) && !HasSubscription());
+        }
+
+        private bool HasSubscription()
+        {
+            return DefaultContext.Subscription?.Id != null;
         }
     }
 }

src/Resources/Resources/ChangeLog.md

@@ -20,7 +20,8 @@
 ## Upcoming Release
 - Updated policy cmdlets to use new api version 2019-06-01 that has new EnforcementMode property in policy assignment.
 - Updated create policy definition help example
-- Fix bug Remove-AZADServicePrincipal -ServicePrincipalName, throw null reference when service principal name not found.
+* Fix bug Remove-AZADServicePrincipal -ServicePrincipalName, throw null reference when service principal name not found.
+* Fix bug New-AZADServicePrincipal，throw null reference when tenant doesn't have any subscription.
 
 ## Version 1.7.1
 * Update dependency assembly Microsoft.Extensions.Caching.Memory from 1.1.1 to 2.2