Add Susi Policy Id parameter for Code Update (#2035)

* Add default project description if none is found * Add susi policy ID parameter to code update
dotnet · Oct 5, 2022 · 08199aa · 08199aa
1 parent 63216b1
commit 08199aa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/...ityScaffolding/Microsoft.DotNet.MSIdentity/ProjectDescription/ProjectDescriptionReader.cs b/...ityScaffolding/Microsoft.DotNet.MSIdentity/ProjectDescription/ProjectDescriptionReader.cs
@@ -40,7 +40,8 @@ public ProjectDescriptionReader(IEnumerable<string> files)
                 }
             }
 
-            return null;
+            // If projectDescription cannot be inferred, default to Web App
+            return ProjectDescriptions.FirstOrDefault(p => string.Equals(ProjectTypes.WebApp, p.Identifier));
         }
 
         static readonly JsonSerializerOptions serializerOptionsWithComments = new JsonSerializerOptions
@@ -52,17 +53,11 @@ public List<ProjectDescription> ProjectDescriptions
         {
             get
             {
-                if (_projectDescriptions == null)
-                {
-                    _projectDescriptions = AppProvisioningTool.Properties
+                _projectDescriptions ??= AppProvisioningTool.Properties
                         .Where(p => p.Name.StartsWith("dotnet") && p.PropertyType == typeof(byte[]))
                         .Select(p => GetProjectDescription(p))
                         .ToList();
 
-                    //  TODO: provide an extension mechanism to add such files outside the tool.
-                    //  In that case the validation would not be an exception? but would need to provide error messages
-                }
-
                 return _projectDescriptions;
             }
         }

diff --git a/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/Tool/AppProvisioningTool.cs b/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/Tool/AppProvisioningTool.cs
@@ -216,6 +216,10 @@ private ProjectAuthenticationSettings InferApplicationParameters(
             {
                 projectSettings.ApplicationParameters.AppIdUri = provisioningToolOptions.HostedAppIdUri;
             }
+            if (!string.IsNullOrEmpty(provisioningToolOptions.SusiPolicyId))
+            {
+                projectSettings.ApplicationParameters.SusiPolicy = provisioningToolOptions.SusiPolicyId;
+            }
 
             return projectSettings;
         }

diff --git a/tools/dotnet-msidentity/Program.cs b/tools/dotnet-msidentity/Program.cs
@@ -223,7 +223,7 @@ internal static Command UpdateProjectCommand() =>
                              "\n\t- Updates the Startup.cs file." +
                              "\n\t- Updates the user secrets.\n")
             {
-                TenantOption(), UsernameOption(), ClientIdOption(), JsonOption(), ProjectFilePathOption(), ConfigUpdateOption(), CodeUpdateOption(), PackagesUpdateOption(), CallsGraphOption(), CallsDownstreamApiOption(), UpdateUserSecretsOption(), RedirectUriOption()
+                TenantOption(), UsernameOption(), ClientIdOption(), JsonOption(), ProjectFilePathOption(), ConfigUpdateOption(), CodeUpdateOption(), PackagesUpdateOption(), CallsGraphOption(), CallsDownstreamApiOption(), UpdateUserSecretsOption(), RedirectUriOption(), SusiPolicyIdOption()
             };
 
         internal static Command UpdateAppRegistrationCommand() =>