chore: bump MTG version & consume oauth updates (#5365)

jorgerangel-msft · web-flow · commit be4f04ee9174 · 2025-07-16T15:25:29.000Z
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/AutoRest.CSharp/Common/Input/InputTypes/InputOAuth2Flow.cs b/src/AutoRest.CSharp/Common/Input/InputTypes/InputOAuth2Flow.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System.Collections.Generic;
+
+namespace AutoRest.CSharp.Common.Input
+{
+    internal record InputOAuth2Flow(IReadOnlyCollection<string> Scopes, string? AuthorizationUrl, string? TokenUrl, string? RefreshUrl);
+}
diff --git a/src/AutoRest.CSharp/Common/Input/InputTypes/Serialization/TypeSpecInputOAuth2AuthConverter.cs b/src/AutoRest.CSharp/Common/Input/InputTypes/Serialization/TypeSpecInputOAuth2AuthConverter.cs
@@ -22,17 +22,42 @@ private static InputOAuth2Auth CreateInputOAuth2Auth(ref Utf8JsonReader reader,
             {
                 reader.Read();
             }
-            IReadOnlyList<string>? scopes = null;
+            IReadOnlyList<InputOAuth2Flow>? flows = null;
+
             while (reader.TokenType != JsonTokenType.EndObject)
             {
-                var isKnownProperty = reader.TryReadComplexType("scopes", options, ref scopes);
+                var isKnownProperty = reader.TryReadComplexType("flows", options, ref flows);
+
                 if (!isKnownProperty)
                 {
                     reader.SkipProperty();
                 }
             }
-            var result = new InputOAuth2Auth(scopes ?? []);
+
+            var result = new InputOAuth2Auth(AggregateScopesFromFlows(flows));
             return result;
         }
+
+        private static IReadOnlyList<string> AggregateScopesFromFlows(IReadOnlyList<InputOAuth2Flow>? flows)
+        {
+            if (flows == null)
+            {
+                return [];
+            }
+
+            var scopes = new HashSet<string>();
+            foreach (var flow in flows)
+            {
+                if (flow.Scopes != null)
+                {
+                    foreach (var scope in flow.Scopes)
+                    {
+                        scopes.Add(scope);
+                    }
+                }
+            }
+
+            return [.. scopes];
+        }
     }
 }
diff --git a/src/AutoRest.CSharp/Common/Input/InputTypes/Serialization/TypeSpecInputOAuth2FlowConverter.cs b/src/AutoRest.CSharp/Common/Input/InputTypes/Serialization/TypeSpecInputOAuth2FlowConverter.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace AutoRest.CSharp.Common.Input
+{
+    internal class TypeSpecInputOAuth2FlowConverter : JsonConverter<InputOAuth2Flow>
+    {
+        public override InputOAuth2Flow? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            => CreateInputOAuth2Auth(ref reader, options);
+
+        public override void Write(Utf8JsonWriter writer, InputOAuth2Flow value, JsonSerializerOptions options)
+            => throw new NotSupportedException("Writing not supported");
+
+        private static InputOAuth2Flow CreateInputOAuth2Auth(ref Utf8JsonReader reader, JsonSerializerOptions options)
+        {
+            if (reader.TokenType == JsonTokenType.StartObject)
+            {
+                reader.Read();
+            }
+            IReadOnlyList<string>? scopes = null;
+            string? authorizationUrl = null;
+            string? tokenUrl = null;
+            string? refreshUrl = null;
+
+            while (reader.TokenType != JsonTokenType.EndObject)
+            {
+                var isKnownProperty = reader.TryReadComplexType("scopes", options, ref scopes)
+                    || reader.TryReadString("authorizationUrl", ref authorizationUrl)
+                    || reader.TryReadString("tokenUrl", ref tokenUrl)
+                    || reader.TryReadString("refreshUrl", ref refreshUrl);
+
+                if (!isKnownProperty)
+                {
+                    reader.SkipProperty();
+                }
+            }
+            var result = new InputOAuth2Flow(scopes ?? [], authorizationUrl, tokenUrl, refreshUrl);
+
+            return result;
+        }
+    }
+}
diff --git a/src/AutoRest.CSharp/Common/Input/InputTypes/Serialization/TypeSpecSerialization.cs b/src/AutoRest.CSharp/Common/Input/InputTypes/Serialization/TypeSpecSerialization.cs
@@ -60,6 +60,7 @@ internal static class TypeSpecSerialization
                     new TypeSpecInputLongRunningServiceMethodConverter(referenceHandler),
                     new TypeSpecInputLongRunningServiceMetadataConverter(),
                     new TypeSpecInputLongRunningPagingServiceMethodConverter(referenceHandler),
+                    new TypeSpecInputOAuth2FlowConverter(),
                 }
             };
 
diff --git a/src/TypeSpec.Extension/Emitter.Csharp/package.json b/src/TypeSpec.Extension/Emitter.Csharp/package.json
@@ -35,7 +35,7 @@
     ],
     "dependencies": {
         "@autorest/csharp": "3.0.0-beta.20240625.4",
-        "@typespec/http-client-csharp": "1.0.0-alpha.20250703.3"
+        "@typespec/http-client-csharp": "1.0.0-alpha.20250715.1"
     },
     "peerDependencies": {
         "@azure-tools/typespec-azure-core": ">=0.57.0 <0.58.0 || ~0.58.0-0",
diff --git a/test/CadlRanchProjects/authentication/oauth2/tspCodeModel.json b/test/CadlRanchProjects/authentication/oauth2/tspCodeModel.json
@@ -219,8 +219,13 @@
   ],
   "auth": {
     "oAuth2": {
-      "scopes": [
-        "https://security.microsoft.com/.default"
+      "flows": [
+        {
+          "scopes": [
+            "https://security.microsoft.com/.default"
+          ],
+          "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize"
+        }
       ]
     }
   }
diff --git a/test/CadlRanchProjects/authentication/union/tspCodeModel.json b/test/CadlRanchProjects/authentication/union/tspCodeModel.json
@@ -134,8 +134,13 @@
       "in": "header"
     },
     "oAuth2": {
-      "scopes": [
-        "https://security.microsoft.com/.default"
+      "flows": [
+        {
+          "scopes": [
+            "https://security.microsoft.com/.default"
+          ],
+          "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize"
+        }
       ]
     }
   }
diff --git a/test/CadlRanchProjects/azure/resource-manager/common-properties/tspCodeModel.json b/test/CadlRanchProjects/azure/resource-manager/common-properties/tspCodeModel.json
@@ -3241,8 +3241,13 @@
   ],
   "auth": {
     "oAuth2": {
-      "scopes": [
-        "user_impersonation"
+      "flows": [
+        {
+          "scopes": [
+            "user_impersonation"
+          ],
+          "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize"
+        }
       ]
     }
   }
diff --git a/test/CadlRanchProjects/azure/resource-manager/non-resource/tspCodeModel.json b/test/CadlRanchProjects/azure/resource-manager/non-resource/tspCodeModel.json
@@ -1064,8 +1064,13 @@
   ],
   "auth": {
     "oAuth2": {
-      "scopes": [
-        "user_impersonation"
+      "flows": [
+        {
+          "scopes": [
+            "user_impersonation"
+          ],
+          "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize"
+        }
       ]
     }
   }
diff --git a/test/CadlRanchProjects/azure/resource-manager/resources/tspCodeModel.json b/test/CadlRanchProjects/azure/resource-manager/resources/tspCodeModel.json
@@ -10332,8 +10332,13 @@
   ],
   "auth": {
     "oAuth2": {
-      "scopes": [
-        "user_impersonation"
+      "flows": [
+        {
+          "scopes": [
+            "user_impersonation"
+          ],
+          "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize"
+        }
       ]
     }
   }
diff --git a/test/TestProjects/FirstTest-TypeSpec/tspCodeModel.json b/test/TestProjects/FirstTest-TypeSpec/tspCodeModel.json
@@ -10209,8 +10209,14 @@
   ],
   "auth": {
     "oAuth2": {
-      "scopes": [
-        "https://api.example.com/.default"
+      "flows": [
+        {
+          "scopes": [
+            "https://api.example.com/.default"
+          ],
+          "refreshUrl": "https://api.example.com/oauth2/refresh",
+          "tokenUrl": "https://api.example.com/oauth2/token"
+        }
       ]
     },
     "apiKey": {
diff --git a/test/TestProjects/MgmtTypeSpec/tspCodeModel.json b/test/TestProjects/MgmtTypeSpec/tspCodeModel.json
@@ -5217,8 +5217,13 @@
   ],
   "auth": {
     "oAuth2": {
-      "scopes": [
-        "user_impersonation"
+      "flows": [
+        {
+          "scopes": [
+            "user_impersonation"
+          ],
+          "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize"
+        }
       ]
     }
   }
diff --git a/test/TestProjects/NoDocs-TypeSpec/tspCodeModel.json b/test/TestProjects/NoDocs-TypeSpec/tspCodeModel.json
@@ -8195,8 +8195,14 @@
   ],
   "auth": {
     "oAuth2": {
-      "scopes": [
-        "https://api.example.com/.default"
+      "flows": [
+        {
+          "scopes": [
+            "https://api.example.com/.default"
+          ],
+          "refreshUrl": "https://api.example.com/oauth2/refresh",
+          "tokenUrl": "https://api.example.com/oauth2/token"
+        }
       ]
     },
     "apiKey": {
diff --git a/test/TestProjects/sdk/newprojecttypespec/Azure.NewProject.TypeSpec/tspCodeModel.json b/test/TestProjects/sdk/newprojecttypespec/Azure.NewProject.TypeSpec/tspCodeModel.json
@@ -4724,8 +4724,14 @@
   ],
   "auth": {
     "oAuth2": {
-      "scopes": [
-        "https://api.example.com/.default"
+      "flows": [
+        {
+          "scopes": [
+            "https://api.example.com/.default"
+          ],
+          "refreshUrl": "https://api.example.com/oauth2/refresh",
+          "tokenUrl": "https://api.example.com/oauth2/token"
+        }
       ]
     },
     "apiKey": {

Original file line number	Diff line number	Diff line change
`@@ -22,17 +22,42 @@ private static InputOAuth2Auth CreateInputOAuth2Auth(ref Utf8JsonReader reader,`
`22`	`22`	`{`
`23`	`23`	`reader.Read();`
`24`	`24`	`}`
`25`		`- IReadOnlyList<string>? scopes = null;`
	`25`	`+ IReadOnlyList<InputOAuth2Flow>? flows = null;`
	`26`	`+`
`26`	`27`	`while (reader.TokenType != JsonTokenType.EndObject)`
`27`	`28`	`{`
`28`		`- var isKnownProperty = reader.TryReadComplexType("scopes", options, ref scopes);`
	`29`	`+ var isKnownProperty = reader.TryReadComplexType("flows", options, ref flows);`
	`30`	`+`
`29`	`31`	`if (!isKnownProperty)`
`30`	`32`	`{`
`31`	`33`	`reader.SkipProperty();`
`32`	`34`	`}`
`33`	`35`	`}`
`34`		`- var result = new InputOAuth2Auth(scopes ?? []);`
	`36`	`+`
	`37`	`+ var result = new InputOAuth2Auth(AggregateScopesFromFlows(flows));`
`35`	`38`	`return result;`
`36`	`39`	`}`
	`40`	`+`
	`41`	`+ private static IReadOnlyList<string> AggregateScopesFromFlows(IReadOnlyList<InputOAuth2Flow>? flows)`
	`42`	`+ {`
	`43`	`+ if (flows == null)`
	`44`	`+ {`
	`45`	`+ return [];`
	`46`	`+ }`
	`47`	`+`
	`48`	`+ var scopes = new HashSet<string>();`
	`49`	`+ foreach (var flow in flows)`
	`50`	`+ {`
	`51`	`+ if (flow.Scopes != null)`
	`52`	`+ {`
	`53`	`+ foreach (var scope in flow.Scopes)`
	`54`	`+ {`
	`55`	`+ scopes.Add(scope);`
	`56`	`+ }`
	`57`	`+ }`
	`58`	`+ }`
	`59`	`+`
	`60`	`+ return [.. scopes];`
	`61`	`+ }`
`37`	`62`	`}`
`38`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ internal static class TypeSpecSerialization`
`60`	`60`	`new TypeSpecInputLongRunningServiceMethodConverter(referenceHandler),`
`61`	`61`	`new TypeSpecInputLongRunningServiceMetadataConverter(),`
`62`	`62`	`new TypeSpecInputLongRunningPagingServiceMethodConverter(referenceHandler),`
	`63`	`+ new TypeSpecInputOAuth2FlowConverter(),`
`63`	`64`	`}`
`64`	`65`	`};`
`65`	`66`
Original file line number	Diff line number	Diff line change
`@@ -219,8 +219,13 @@`
`219`	`219`	`],`
`220`	`220`	`"auth": {`
`221`	`221`	`"oAuth2": {`
`222`		`- "scopes": [`
`223`		`- "https://security.microsoft.com/.default"`
	`222`	`+ "flows": [`
	`223`	`+ {`
	`224`	`+ "scopes": [`
	`225`	`+ "https://security.microsoft.com/.default"`
	`226`	`+ ],`
	`227`	`+ "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize"`
	`228`	`+ }`
`224`	`229`	`]`
`225`	`230`	`}`
`226`	`231`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,13 @@`
`134`	`134`	`"in": "header"`
`135`	`135`	`},`
`136`	`136`	`"oAuth2": {`
`137`		`- "scopes": [`
`138`		`- "https://security.microsoft.com/.default"`
	`137`	`+ "flows": [`
	`138`	`+ {`
	`139`	`+ "scopes": [`
	`140`	`+ "https://security.microsoft.com/.default"`
	`141`	`+ ],`
	`142`	`+ "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize"`
	`143`	`+ }`
`139`	`144`	`]`
`140`	`145`	`}`
`141`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3241,8 +3241,13 @@`
`3241`	`3241`	`],`
`3242`	`3242`	`"auth": {`
`3243`	`3243`	`"oAuth2": {`
`3244`		`- "scopes": [`
`3245`		`- "user_impersonation"`
	`3244`	`+ "flows": [`
	`3245`	`+ {`
	`3246`	`+ "scopes": [`
	`3247`	`+ "user_impersonation"`
	`3248`	`+ ],`
	`3249`	`+ "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize"`
	`3250`	`+ }`
`3246`	`3251`	`]`
`3247`	`3252`	`}`
`3248`	`3253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1064,8 +1064,13 @@`
`1064`	`1064`	`],`
`1065`	`1065`	`"auth": {`
`1066`	`1066`	`"oAuth2": {`
`1067`		`- "scopes": [`
`1068`		`- "user_impersonation"`
	`1067`	`+ "flows": [`
	`1068`	`+ {`
	`1069`	`+ "scopes": [`
	`1070`	`+ "user_impersonation"`
	`1071`	`+ ],`
	`1072`	`+ "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize"`
	`1073`	`+ }`
`1069`	`1074`	`]`
`1070`	`1075`	`}`
`1071`	`1076`	`}`