Rectified metadata script to generate correct paths with nested segments containing microsoft.graph prefix

Author: timayabi2020

src/Authentication/Authentication/custom/common/MgCommandMetadata.json

@@ -95132,7 +95132,7 @@
   },
   {
     "Module": "Beta.Identity.SignIns",
-    "Uri": "/identity/authenticationEventsFlows/{authenticationEventsFlow-id}/onAuthenticationMethodLoadStartExternalUsersSelfServiceSignUp/identityProviders",
+    "Uri": "/identity/authenticationEventsFlows/{authenticationEventsFlow-id}/externalUsersSelfServiceSignUpEventsFlow/onAuthenticationMethodLoadStartonAuthenticationMethodLoadStartExternalUsersSelfServiceSignUp/identityProviders",
     "OutputType": "IMicrosoftGraphIdentityProviderBase",
     "Method": "GET",
     "ApiVersion": "beta",
@@ -95208,7 +95208,7 @@
   },
   {
     "Module": "Beta.Identity.SignIns",
-    "Uri": "/identity/authenticationEventsFlows/{authenticationEventsFlow-id}/onAuthenticationMethodLoadStartExternalUsersSelfServiceSignUp/identityProviders/$ref",
+    "Uri": "/identity/authenticationEventsFlows/{authenticationEventsFlow-id}/externalUsersSelfServiceSignUpEventsFlow/onAuthenticationMethodLoadStartonAuthenticationMethodLoadStartExternalUsersSelfServiceSignUp/identityProviders/$ref",
     "OutputType": null,
     "Method": "GET",
     "ApiVersion": "beta",
@@ -95220,7 +95220,7 @@
   },
   {
     "Module": "Beta.Identity.SignIns",
-    "Uri": "/identity/authenticationEventsFlows/{authenticationEventsFlow-id}/onAuthenticationMethodLoadStartExternalUsersSelfServiceSignUp/identityProviders/$count",
+    "Uri": "/identity/authenticationEventsFlows/{authenticationEventsFlow-id}/externalUsersSelfServiceSignUpEventsFlow/onAuthenticationMethodLoadStartonAuthenticationMethodLoadStartExternalUsersSelfServiceSignUp/identityProviders/$count",
     "OutputType": null,
     "Method": "GET",
     "ApiVersion": "beta",
@@ -305344,7 +305344,7 @@
   },
   {
     "Module": "Beta.Identity.SignIns",
-    "Uri": "/identity/authenticationEventsFlows/{authenticationEventsFlow-id}/onAuthenticationMethodLoadStartExternalUsersSelfServiceSignUp/identityProviders/$ref",
+    "Uri": "/identity/authenticationEventsFlows/{authenticationEventsFlow-id}/externalUsersSelfServiceSignUpEventsFlow/onAuthenticationMethodLoadStartonAuthenticationMethodLoadStartExternalUsersSelfServiceSignUp/identityProviders/$ref",
     "OutputType": null,
     "Method": "POST",
     "ApiVersion": "beta",

tools/PostGeneration/NewCommandMetadata.ps1

@@ -61,13 +61,16 @@ $ApiVersion | ForEach-Object {
             # Remove FQN in action/function names.
             if ($Uri -match $ActionFunctionFQNPattern) {
                 $MatchedUriSegment = $Matches.0
+                $SegmentBuilder = ""
                 # Trim nested namespace segments.
-                $NestedNamespaceSegments = $Matches.1 -split "\."
-                # Remove trailing '()' from functions.
-                $LastSegment = $NestedNamespaceSegments[-1] -replace "\(\)", ""
-                $Uri = $Uri -replace [Regex]::Escape($MatchedUriSegment), "/$LastSegment"
+                $NestedNamespaceSegments = $Matches.1 -split "/"
+                # Remove microsoft.graph prefix and remove trailing '()' from functions.
+                foreach($segment in $NestedNamespaceSegments){
+                    $segment = $segment.Replace("microsoft.graph.","").Replace("()", "")
+                    $SegmentBuilder += "/$segment"
+                }
+                $Uri = $Uri -replace [Regex]::Escape($MatchedUriSegment), $SegmentBuilder
             }
-
             $MappingValue = @{
                 Command     = $CommandName
                 Variants    = [System.Collections.ArrayList]@($VariantName)