Merge pull request #2317 from microsoftgraph/2306-find-mggraphcommand-uri-not-working-for-me-endpoints

Translates /me to /users/{user-id}

Author: timayabi2020

src/Authentication/Authentication/custom/Find-MgGraphCommand.ps1

@@ -166,19 +166,33 @@ Function Find-MgGraphCommand {
 
             $Result = @()
             Write-Debug "Received URI: $Uri."
+            
             $Uri = GraphUri_RemoveNamespaceFromActionFunction $Uri
             $GraphUri = GraphUri_ConvertStringToUri $Uri
 
             # Use API version in URI if -ApiVersion is not provided.
             if ([System.String]::IsNullOrWhiteSpace($ApiVersion) -and ($GraphUri.OriginalString -match "(v1.0|beta)\/")) {
                 $ApiVersion = $Matches[1]
             }
+            
+            
 
             if (!$GraphUri.IsAbsoluteUri) {
                 $GraphUri = GraphUri_ConvertRelativeUriToAbsoluteUri -Uri $GraphUri -ApiVersion $ApiVersion
             }
+            
+            $ContainsMeSegment = $False
+            $Segment = $GraphUri.Segments
+            foreach ($s in $Segment) {
+                if ($s.StartsWith("me")) {
+                    $ContainsMeSegment = $True
+                    break
+                }
+            }
+            if ($ContainsMeSegment) {
+                $GraphUri = $GraphUri.AbsoluteUri.Replace("/me/", "/users/{id}/")
+            }
             Write-Debug "Resolved URI: $GraphUri."
-
             return $GraphUri
         }
 
@@ -187,7 +201,6 @@ Function Find-MgGraphCommand {
                 [Parameter(Mandatory = $true, Position = 0)]
                 [System.Uri]$Uri
             )
-
             $Result = @()
             $TokenizedUri = GraphUri_TokenizeIds $Uri
             Write-Debug "Tokenized URI: $TokenizedUri."

src/Authentication/Authentication/test/Find-MgGraphCommand.Tests.ps1

@@ -138,6 +138,30 @@ Describe "Find-MgGraphCommand Command" {
                 $MgCommand.Command | Should -Be @("Get-MgReportSharePointActivityUserCount", "Get-MgBetaReportSharePointActivityUserCount")
             } | Should -Not -Throw    
         }
+        It 'Should find commands for uri woth /me segments' {
+            {
+                $MgCommand = Find-MgGraphCommand -Uri "/me/events/"
+                $MgCommand | Should -HaveCount 4
+                $MgCommand.Command | Select-Object -Unique | should -HaveCount 4
+                $MgCommand.Method | Select-Object -Unique | should -HaveCount 2
+                $MgCommand.APIVersion | Select-Object -Unique | should -HaveCount 2
+                $MgCommand.Variants | Select-Object -Unique | should -HaveCount 5
+                $MgCommand.URI | Select-Object -Unique | Should -Be "/users/{user-id}/events"
+                $MgCommand.Command | Select-Object -Unique | Should -BeIn @("New-MgUserEvent", "Get-MgUserEvent", "New-MgBetaUserEvent", "Get-MgBetaUserEvent")
+            } | Should -Not -Throw
+        }
+        It 'Should find commands for uri woth /me segments' {
+            {
+                $MgCommand = Find-MgGraphCommand -Uri "https://graph.microsoft.com/v1.0/me/events/"
+                $MgCommand | Should -HaveCount 4
+                $MgCommand.Command | Select-Object -Unique | should -HaveCount 4
+                $MgCommand.Method | Select-Object -Unique | should -HaveCount 2
+                $MgCommand.APIVersion | Select-Object -Unique | should -HaveCount 2
+                $MgCommand.Variants | Select-Object -Unique | should -HaveCount 5
+                $MgCommand.URI | Select-Object -Unique | Should -Be "/users/{user-id}/events"
+                $MgCommand.Command | Select-Object -Unique | Should -BeIn @("New-MgUserEvent", "Get-MgUserEvent", "New-MgBetaUserEvent", "Get-MgBetaUserEvent")
+            } | Should -Not -Throw
+        }
     }
 
     Context "FindByCommand" {