Fix query parameters (#58)

* Fix query parameters

* Update pipeline

* Set graph target version

* Update src/Program.cs

Co-authored-by: Eastman <[email protected]>

Co-authored-by: Eastman <[email protected]>

Author: calebkiage

.github/workflows/build-cli.yml

@@ -4,7 +4,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      NUGET_URL: https://nuget.pkg.github.com/microsoft/index.json
+      MS_NUGET_URL: https://nuget.pkg.github.com/microsoft/index.json
+      MSGRAPH_NUGET_URL: https://nuget.pkg.github.com/microsoftgraph/index.json
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -17,7 +18,8 @@ jobs:
       - name: Add NuGet kiota source
         # NOTE: Password encryption is not supported for the linux platform (Encryption is only supported on Windows platforms.)
         run: |
-          dotnet nuget add source ${{env.NUGET_URL}} -n github -u ${{secrets.NUGET_USER}} -p ${{secrets.NUGET_PASSWORD}} --store-password-in-clear-text
+          dotnet nuget add source ${{env.MS_NUGET_URL}} -n ms-gh -u ${{secrets.NUGET_USER}} -p ${{secrets.NUGET_PASSWORD}} --store-password-in-clear-text
+          dotnet nuget add source ${{env.MSGRAPH_NUGET_URL}} -n msgraph-gh -u ${{secrets.NUGET_USER}} -p ${{secrets.NUGET_PASSWORD}} --store-password-in-clear-text
       - uses: actions/cache@v2
         with:
           path: ~/.nuget/packages

CHANGELOG.md

@@ -18,3 +18,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed stream output being passed to output formatter when no file path is provided #38
 - Format JSON output by default. The formatting can be disabled per command through the CLI argument `--json-no-indent` #55
 - Use async OutputFormatter & OutputFilter APIs #55
+- Fix failing requests when adding options like `--select`, `--expand`, `--top` etc

msgraph-cli-core

@@ -48,27 +48,14 @@ static async Task<int> Main(string[] args)
 
             var credential = await authServiceFactory.GetTokenCredentialAsync(authStrategy, authSettings?.TenantId, authSettings?.ClientId);
             var authProvider = new AzureIdentityAuthenticationProvider(credential, new string[] {"graph.microsoft.com"});
-            var defaultHandlers = KiotaClientFactory.CreateDefaultHandlers();
 
             var assemblyVersion = Assembly.GetExecutingAssembly().GetName().Version;
-            var sdkVersionHeaderValue = string.Format(
-                SdkVersionHeaderValueFormatString,
-                "graph",
-                assemblyVersion.Major,
-                assemblyVersion.Minor,
-                assemblyVersion.Build);
-
-            var telemetryHandlerOption = new TelemetryHandlerOption {
-                TelemetryConfigurator = (request) => {
-                    request.Headers.Add("SdkVersion", sdkVersionHeaderValue);
-                    return request;
-                }
+            var options = new GraphClientOptions {
+                GraphProductPrefix = "graph-cli",
+                GraphServiceLibraryClientVersion = $"{assemblyVersion.Major}.{assemblyVersion.Minor}.{assemblyVersion.Build}",
+                GraphServiceTargetVersion = "1.0"
             };
-            var telemetryHandler = new TelemetryHandler(telemetryHandlerOption);
-            defaultHandlers.Add(telemetryHandler);
-            var finalHandler = KiotaClientFactory.ChainHandlersCollectionAndGetFirstLink(KiotaClientFactory.GetDefaultHttpMessageHandler(), defaultHandlers.ToArray());
-
-            using var httpClient = KiotaClientFactory.Create(finalHandler);
+            using var httpClient = GraphCliClientFactory.GetDefaultClient(options);
             var core = new HttpClientRequestAdapter(authProvider, httpClient: httpClient);
             var client = new GraphClient(core);