Merge pull request #2896 from microsoftgraph/2866-invoke-mggraphreque…

…st-fails-to-return-a-number-of-resources Updates ``Invoke-MgGraphRequest`` cmdlet to handle responses of ``text/plain`` content types.
microsoftgraph · Aug 12, 2024 · d53fd13 · d53fd13
2 parents 88cb77d + e612ca6
commit d53fd13
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/src/Authentication/Authentication/Cmdlets/InvokeMgGraphRequest.cs b/src/Authentication/Authentication/Cmdlets/InvokeMgGraphRequest.cs
@@ -453,6 +453,10 @@ internal async Task ProcessResponseAsync(HttpResponseMessage response)
                                 throw new ArgumentOutOfRangeException(nameof(OutputType));
                         }
                         break;
+                    case RestReturnType.PlainText:
+                        responseString = await response.Content.ReadAsStringAsync();
+                        WriteObject(responseString);
+                        break;
                     case RestReturnType.OctetStream:
                         if (OutputType == OutputType.HttpResponseMessage)
                             WriteObject(response);

diff --git a/src/Authentication/Authentication/Helpers/ContentHelper.cs b/src/Authentication/Authentication/Helpers/ContentHelper.cs
@@ -29,6 +29,8 @@ internal static RestReturnType CheckReturnType(this HttpResponseMessage response
                 rt = RestReturnType.Image;
             else if (IsOctetStream(contentType))
                 rt = RestReturnType.OctetStream;
+            else if (IsPlainText(contentType))
+                rt = RestReturnType.PlainText;
             return rt;
         }
 
@@ -80,6 +82,8 @@ private static bool CheckIsOctetStream(string contentType)
             return isOctetStream;
         }
 
+        private static bool IsPlainText(string contentType) => contentType.Equals("text/plain", StringComparison.OrdinalIgnoreCase);
+
         // used to split contentType arguments
         private static readonly char[] ContentTypeParamSeparator = { ';' };
 

diff --git a/src/Authentication/Authentication/Models/RestReturnType.cs b/src/Authentication/Authentication/Models/RestReturnType.cs
@@ -24,6 +24,10 @@ public enum RestReturnType
         /// <summary>
         ///      image/* (image/jpeg, image/png) return type
         /// </summary>
-        Image = 4
+        Image = 4,
+        /// <summary>
+        ///      text/plain return type
+        /// </summary>
+        PlainText = 5
     }
 }
diff --git a/src/Authentication/Authentication/test/Invoke-MgGraphRequest.Tests.ps1 b/src/Authentication/Authentication/test/Invoke-MgGraphRequest.Tests.ps1
@@ -54,6 +54,9 @@ Describe 'Invoke-MgGraphRequest Command' -skip {
           It 'Should not throw when -InferOutputFilePath is specified' {
                { Invoke-MgGraphRequest -OutputType PSObject -Uri "https://graph.microsoft.com/v1.0/reports/getTeamsUserActivityUserDetail(period='D7')" -InferOutputFileName } | Should -Not -Throw
           }
+          It 'Should return plain text' {
+               { Invoke-MgGraphRequest -Uri "https://graph.microsoft.com/v1.0/applications/`$count" } | Should -BeOfType [System.String]
+          }
      }
 
      Context 'Absolute and relative URIs' {