Merge pull request #270 from microsoftgraph/feat/add_environment_login

Add environment login.

Author: calebkiage

.azure-pipelines/config/PoliCheckExclusions.xml

@@ -8,5 +8,5 @@
     <!--<Exclusion Type="FileType">.ABC|.XYZ</Exclusion>-->
     <!--The specified file names will be skipped during the scan regardless which folder they are in -->
     <!--<Exclusion Type="FileName">ABC.TXT|XYZ.CS</Exclusion>-->
-    <Exclusion Type="FileName">COUNTRYNAMEDLOCATION.CS|LOCALEINFO.CS|ORGANIZATION.CS|PARENTALCONTROLSETTINGS.CS|PARTICIPANTINFO.CS|USER.CS|FUNCTIONSREQUESTBUILDER.CS</Exclusion>
-  </PoliCheckExclusions>
+    <Exclusion Type="FolderPathFull">SRC\GENERATED</Exclusion>
+  </PoliCheckExclusions>

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- Add Environment login. Client secret login and certificate file login are now possible with this new strategy.
+
+### Changed
+- Update login command help text.
+- Fix a bug where the CLI didn't send the Content-Type header when sending requests with bodies.
+
 ## [0.2.0-preview.1] - 2023-02-27
 
 ### Added

src/Program.cs

@@ -41,12 +41,7 @@ class Program
     {
         static async Task<int> Main(string[] args)
         {
-            var customCommands = new List<Command>();
-            customCommands.Add(new LoginCommand().Build());
-            customCommands.Add(new LogoutCommand().Build());
-
-
-            var builder = BuildCommandLine(customCommands)
+            var builder = BuildCommandLine()
                 .UseDefaults()
                 .UseHost(a =>
                 {
@@ -75,7 +70,7 @@ static async Task<int> Main(string[] args)
             {
                 var host = ic.GetHost();
 
-                ic.BindingContext.AddService(_ => host.Services.GetRequiredService<IAuthenticationCacheUtility>());
+                ic.BindingContext.AddService(_ => host.Services.GetRequiredService<IAuthenticationCacheManager>());
                 ic.BindingContext.AddService(_ => host.Services.GetRequiredService<AuthenticationServiceFactory>());
                 // Needed by LogoutCommand
                 ic.BindingContext.AddService(_ => host.Services.GetRequiredService<LogoutService>());
@@ -115,7 +110,7 @@ static async Task<int> Main(string[] args)
             return await parser.InvokeAsync(args);
         }
 
-        static CommandLineBuilder BuildCommandLine(IEnumerable<Command> commands)
+        static CommandLineBuilder BuildCommandLine()
         {
             var rootCommand = new GraphClient().BuildRootCommand();
             rootCommand.Description = "Microsoft Graph CLI";
@@ -125,12 +120,11 @@ static CommandLineBuilder BuildCommandLine(IEnumerable<Command> commands)
             // --debug for configs.
             rootCommand.TreatUnmatchedTokensAsErrors = false;
 
-            foreach (var command in commands)
-            {
-                rootCommand.AddCommand(command);
-            }
+            var builder = new CommandLineBuilder(rootCommand);
+            rootCommand.AddCommand(new LoginCommand(builder));
+            rootCommand.AddCommand(new LogoutCommand());
 
-            return new CommandLineBuilder(rootCommand);
+            return builder;
         }
 
         static IHostBuilder CreateHostBuilder(string[] args) =>
@@ -188,13 +182,13 @@ static IHostBuilder CreateHostBuilder(string[] args) =>
                     return new HttpClientRequestAdapter(authProvider, httpClient: client);
                 });
                 services.AddSingleton<IPathUtility, PathUtility>();
-                services.AddSingleton<IAuthenticationCacheUtility, AuthenticationCacheUtility>();
+                services.AddSingleton<IAuthenticationCacheManager, AuthenticationCacheManager>();
                 services.AddSingleton<LogoutService>();
                 services.AddSingleton<AuthenticationServiceFactory>(p =>
                 {
                     var authSettings = p.GetRequiredService<IOptions<AuthenticationOptions>>()?.Value;
                     var pathUtil = p.GetRequiredService<IPathUtility>();
-                    var cacheUtil = p.GetRequiredService<IAuthenticationCacheUtility>();
+                    var cacheUtil = p.GetRequiredService<IAuthenticationCacheManager>();
                     return new AuthenticationServiceFactory(pathUtil, cacheUtil, authSettings);
                 });
             }).ConfigureLogging((ctx, logBuilder) =>
@@ -214,7 +208,7 @@ static void ConfigureAppConfiguration(IConfigurationBuilder builder, string[] ar
             builder.Sources.Clear();
             builder.AddJsonFile(Path.Combine(System.AppContext.BaseDirectory, "app-settings.json"), optional: true);
             var pathUtil = new PathUtility();
-            var authCache = new AuthenticationCacheUtility(pathUtil);
+            var authCache = new AuthenticationCacheManager(pathUtil);
             var dataDir = pathUtil.GetApplicationDataDirectory();
             var userConfigPath = Path.Combine(dataDir, "settings.json");
             builder.AddJsonFile(userConfigPath, optional: true);

src/generated/Admin/AdminRequestBuilder.cs

@@ -119,6 +119,7 @@ public Command BuildPatchCommand() {
                 if (model is null) return; // Cannot create a POST request from a null model.
                 var requestInfo = ToPatchRequestInformation(model, q => {
                 });
+                requestInfo.SetContentFromParsable(reqAdapter, "application/json", model);
                 var errorMapping = new Dictionary<string, ParsableFactory<IParsable>> {
                     {"4XX", ODataError.CreateFromDiscriminatorValue},
                     {"5XX", ODataError.CreateFromDiscriminatorValue},

src/generated/Admin/ServiceAnnouncement/HealthOverviews/HealthOverviewsRequestBuilder.cs

@@ -86,6 +86,7 @@ public Command BuildCreateCommand() {
                 if (model is null) return; // Cannot create a POST request from a null model.
                 var requestInfo = ToPostRequestInformation(model, q => {
                 });
+                requestInfo.SetContentFromParsable(reqAdapter, "application/json", model);
                 var errorMapping = new Dictionary<string, ParsableFactory<IParsable>> {
                     {"4XX", ODataError.CreateFromDiscriminatorValue},
                     {"5XX", ODataError.CreateFromDiscriminatorValue},

src/generated/Admin/ServiceAnnouncement/HealthOverviews/Item/Issues/Count/CountRequestBuilder.cs

@@ -29,7 +29,7 @@ public Command BuildGetCommand() {
             var command = new Command("get");
             command.Description = "Get the number of the resource";
             // Create options for all the parameters
-            var serviceHealthIdOption = new Option<string>("--service-health-id", description: "key: id of serviceHealth") {
+            var serviceHealthIdOption = new Option<string>("--service-health-id", description: "The unique identifier of serviceHealth") {
             };
             serviceHealthIdOption.IsRequired = true;
             command.AddOption(serviceHealthIdOption);

src/generated/Admin/ServiceAnnouncement/HealthOverviews/Item/Issues/IssuesRequestBuilder.cs

@@ -33,7 +33,7 @@ public Command BuildCommand() {
             var builder = new ServiceHealthIssueItemRequestBuilder(PathParameters);
             command.AddCommand(builder.BuildDeleteCommand());
             command.AddCommand(builder.BuildGetCommand());
-            command.AddCommand(builder.BuildMicrosoftGraphIncidentReportCommand());
+            command.AddCommand(builder.BuildIncidentReportCommand());
             command.AddCommand(builder.BuildPatchCommand());
             return command;
         }
@@ -54,7 +54,7 @@ public Command BuildCreateCommand() {
             var command = new Command("create");
             command.Description = "Create new navigation property to issues for admin";
             // Create options for all the parameters
-            var serviceHealthIdOption = new Option<string>("--service-health-id", description: "key: id of serviceHealth") {
+            var serviceHealthIdOption = new Option<string>("--service-health-id", description: "The unique identifier of serviceHealth") {
             };
             serviceHealthIdOption.IsRequired = true;
             command.AddOption(serviceHealthIdOption);
@@ -92,6 +92,7 @@ public Command BuildCreateCommand() {
                 var requestInfo = ToPostRequestInformation(model, q => {
                 });
                 if (serviceHealthId is not null) requestInfo.PathParameters.Add("serviceHealth%2Did", serviceHealthId);
+                requestInfo.SetContentFromParsable(reqAdapter, "application/json", model);
                 var errorMapping = new Dictionary<string, ParsableFactory<IParsable>> {
                     {"4XX", ODataError.CreateFromDiscriminatorValue},
                     {"5XX", ODataError.CreateFromDiscriminatorValue},
@@ -111,7 +112,7 @@ public Command BuildListCommand() {
             var command = new Command("list");
             command.Description = "A collection of issues that happened on the service, with detailed information for each issue.";
             // Create options for all the parameters
-            var serviceHealthIdOption = new Option<string>("--service-health-id", description: "key: id of serviceHealth") {
+            var serviceHealthIdOption = new Option<string>("--service-health-id", description: "The unique identifier of serviceHealth") {
             };
             serviceHealthIdOption.IsRequired = true;
             command.AddOption(serviceHealthIdOption);

src/generated/Admin/ServiceAnnouncement/HealthOverviews/Item/Issues/Item/IncidentReport/IncidentReportRequestBuilder.cs

@@ -0,0 +1,121 @@
+using ApiSdk.Models.ODataErrors;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Kiota.Abstractions;
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Cli.Commons.Extensions;
+using Microsoft.Kiota.Cli.Commons.IO;
+using System;
+using System.Collections.Generic;
+using System.CommandLine;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+namespace ApiSdk.Admin.ServiceAnnouncement.HealthOverviews.Item.Issues.Item.IncidentReport {
+    /// <summary>
+    /// Provides operations to call the incidentReport method.
+    /// </summary>
+    public class IncidentReportRequestBuilder {
+        /// <summary>Path parameters for the request</summary>
+        private Dictionary<string, object> PathParameters { get; set; }
+        /// <summary>Url template to use to build the URL for the current request builder</summary>
+        private string UrlTemplate { get; set; }
+        /// <summary>
+        /// Invoke function incidentReport
+        /// </summary>
+        public Command BuildGetCommand() {
+            var command = new Command("get");
+            command.Description = "Invoke function incidentReport";
+            // Create options for all the parameters
+            var serviceHealthIdOption = new Option<string>("--service-health-id", description: "The unique identifier of serviceHealth") {
+            };
+            serviceHealthIdOption.IsRequired = true;
+            command.AddOption(serviceHealthIdOption);
+            var serviceHealthIssueIdOption = new Option<string>("--service-health-issue-id", description: "The unique identifier of serviceHealthIssue") {
+            };
+            serviceHealthIssueIdOption.IsRequired = true;
+            command.AddOption(serviceHealthIssueIdOption);
+            var fileOption = new Option<FileInfo>("--file");
+            command.AddOption(fileOption);
+            command.SetHandler(async (invocationContext) => {
+                var serviceHealthId = invocationContext.ParseResult.GetValueForOption(serviceHealthIdOption);
+                var serviceHealthIssueId = invocationContext.ParseResult.GetValueForOption(serviceHealthIssueIdOption);
+                var file = invocationContext.ParseResult.GetValueForOption(fileOption);
+                var cancellationToken = invocationContext.GetCancellationToken();
+                var reqAdapter = invocationContext.GetRequestAdapter();
+                var requestInfo = ToGetRequestInformation(q => {
+                });
+                if (serviceHealthId is not null) requestInfo.PathParameters.Add("serviceHealth%2Did", serviceHealthId);
+                if (serviceHealthIssueId is not null) requestInfo.PathParameters.Add("serviceHealthIssue%2Did", serviceHealthIssueId);
+                var errorMapping = new Dictionary<string, ParsableFactory<IParsable>> {
+                    {"4XX", ODataError.CreateFromDiscriminatorValue},
+                    {"5XX", ODataError.CreateFromDiscriminatorValue},
+                };
+                var response = await reqAdapter.SendPrimitiveAsync<Stream>(requestInfo, errorMapping: errorMapping, cancellationToken: cancellationToken) ?? Stream.Null;
+                if (file == null) {
+                    using var reader = new StreamReader(response);
+                    var strContent = reader.ReadToEnd();
+                    Console.Write(strContent);
+                }
+                else {
+                    using var writeStream = file.OpenWrite();
+                    await response.CopyToAsync(writeStream);
+                    Console.WriteLine($"Content written to {file.FullName}.");
+                }
+            });
+            return command;
+        }
+        /// <summary>
+        /// Instantiates a new IncidentReportRequestBuilder and sets the default values.
+        /// </summary>
+        /// <param name="pathParameters">Path parameters for the request</param>
+        public IncidentReportRequestBuilder(Dictionary<string, object> pathParameters) {
+            _ = pathParameters ?? throw new ArgumentNullException(nameof(pathParameters));
+            UrlTemplate = "{+baseurl}/admin/serviceAnnouncement/healthOverviews/{serviceHealth%2Did}/issues/{serviceHealthIssue%2Did}/incidentReport()";
+            var urlTplParams = new Dictionary<string, object>(pathParameters);
+            PathParameters = urlTplParams;
+        }
+        /// <summary>
+        /// Invoke function incidentReport
+        /// </summary>
+        /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public RequestInformation ToGetRequestInformation(Action<IncidentReportRequestBuilderGetRequestConfiguration>? requestConfiguration = default) {
+#nullable restore
+#else
+        public RequestInformation ToGetRequestInformation(Action<IncidentReportRequestBuilderGetRequestConfiguration> requestConfiguration = default) {
+#endif
+            var requestInfo = new RequestInformation {
+                HttpMethod = Method.GET,
+                UrlTemplate = UrlTemplate,
+                PathParameters = PathParameters,
+            };
+            if (requestConfiguration != null) {
+                var requestConfig = new IncidentReportRequestBuilderGetRequestConfiguration();
+                requestConfiguration.Invoke(requestConfig);
+                requestInfo.AddRequestOptions(requestConfig.Options);
+                requestInfo.AddHeaders(requestConfig.Headers);
+            }
+            return requestInfo;
+        }
+        /// <summary>
+        /// Configuration for the request such as headers, query parameters, and middleware options.
+        /// </summary>
+        public class IncidentReportRequestBuilderGetRequestConfiguration {
+            /// <summary>Request headers</summary>
+            public RequestHeaders Headers { get; set; }
+            /// <summary>Request options</summary>
+            public IList<IRequestOption> Options { get; set; }
+            /// <summary>
+            /// Instantiates a new incidentReportRequestBuilderGetRequestConfiguration and sets the default values.
+            /// </summary>
+            public IncidentReportRequestBuilderGetRequestConfiguration() {
+                Options = new List<IRequestOption>();
+                Headers = new RequestHeaders();
+            }
+        }
+    }
+}