Add Jwt and Bearer constants and revert previous changes

MaggieKimani1 · MaggieKimani1 · commit 972098762d02 · 2022-02-21T11:24:56.000+03:00
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs
@@ -30,7 +30,7 @@ internal static partial class OpenApiV2Deserializer
                         {
                             case "basic":
                                 o.Type = SecuritySchemeType.Http;
-                                o.Scheme = AuthenticationScheme.Basic;
+                                o.Scheme = OpenApiConstants.Basic;
                                 break;
 
                             case "apiKey":
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiSecuritySchemeDeserializer.cs
@@ -44,13 +44,13 @@ internal static partial class OpenApiV3Deserializer
                 {
                     "scheme", (o, n) =>
                     {
-                        o.Scheme = n.GetScalarValue().GetEnumFromDisplayName<AuthenticationScheme>();
+                        o.Scheme = n.GetScalarValue();
                     }
                 },
                 {
                     "bearerFormat", (o, n) =>
                     {
-                        o.BearerFormat = n.GetScalarValue().GetEnumFromDisplayName<BearerFormat>();
+                        o.BearerFormat = n.GetScalarValue();
                     }
                 },
                 {
diff --git a/src/Microsoft.OpenApi/Models/AuthenticationScheme.cs b/src/Microsoft.OpenApi/Models/AuthenticationScheme.cs
diff --git a/src/Microsoft.OpenApi/Models/BearerFormat.cs b/src/Microsoft.OpenApi/Models/BearerFormat.cs
diff --git a/src/Microsoft.OpenApi/Models/OpenApiConstants.cs b/src/Microsoft.OpenApi/Models/OpenApiConstants.cs
@@ -617,6 +617,16 @@ public static class OpenApiConstants
         /// </summary>
         public const string Basic = "basic";
 
+        /// <summary>
+        /// Field: Bearer
+        /// </summary>
+        public const string Bearer = "bearer";
+
+        /// <summary>
+        /// Field: JWT
+        /// </summary>
+        public const string Jwt = "JWT";
+
         /// <summary>
         /// Field: Consumes
         /// </summary>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs b/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs
@@ -39,14 +39,14 @@ public class OpenApiSecurityScheme : IOpenApiSerializable, IOpenApiReferenceable
         /// REQUIRED. The name of the HTTP Authorization scheme to be used
         /// in the Authorization header as defined in RFC7235.
         /// </summary>
-        public AuthenticationScheme Scheme { get; set; }
+        public string Scheme { get; set; }
 
         /// <summary>
         /// A hint to the client to identify how the bearer token is formatted.
         /// Bearer tokens are usually generated by an authorization server,
         /// so this information is primarily for documentation purposes.
         /// </summary>
-        public BearerFormat BearerFormat { get; set; }
+        public string BearerFormat { get; set; }
 
         /// <summary>
         /// REQUIRED. An object containing configuration information for the flow types supported.
@@ -118,8 +118,8 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
                     // These properties apply to http type only.
                     // scheme
                     // bearerFormat
-                    writer.WriteProperty(OpenApiConstants.Scheme, Scheme.GetDisplayName());
-                    writer.WriteProperty(OpenApiConstants.BearerFormat, BearerFormat.GetDisplayName());
+                    writer.WriteProperty(OpenApiConstants.Scheme, Scheme);
+                    writer.WriteProperty(OpenApiConstants.BearerFormat, BearerFormat);
                     break;
                 case SecuritySchemeType.OAuth2:
                     // This property apply to oauth2 type only.
@@ -163,7 +163,7 @@ public void SerializeAsV2(IOpenApiWriter writer)
         /// </summary>
         public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
         {
-            if (Type == SecuritySchemeType.Http && Scheme != AuthenticationScheme.Basic)
+            if (Type == SecuritySchemeType.Http && Scheme != OpenApiConstants.Basic)
             {
                 // Bail because V2 does not support non-basic HTTP scheme
                 writer.WriteStartObject();
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs
@@ -38,7 +38,7 @@ public void ParseHttpSecuritySchemeShouldSucceed()
                     new OpenApiSecurityScheme
                     {
                         Type = SecuritySchemeType.Http,
-                        Scheme = AuthenticationScheme.Basic
+                        Scheme = OpenApiConstants.Basic
                     });
             }
         }
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs
@@ -40,7 +40,7 @@ public void ParseHttpSecuritySchemeShouldSucceed()
                     new OpenApiSecurityScheme
                     {
                         Type = SecuritySchemeType.Http,
-                        Scheme = AuthenticationScheme.Basic
+                        Scheme = OpenApiConstants.Basic
                     });
             }
         }
@@ -95,8 +95,8 @@ public void ParseBearerSecuritySchemeShouldSucceed()
                     new OpenApiSecurityScheme
                     {
                         Type = SecuritySchemeType.Http,
-                        Scheme = AuthenticationScheme.Bearer,
-                        BearerFormat = BearerFormat.JWT
+                        Scheme = OpenApiConstants.Bearer,
+                        BearerFormat = OpenApiConstants.Jwt
                     });
             }
         }
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs
@@ -57,7 +57,7 @@ public class OpenApiComponentsTests
                 {
                     Description = "description1",
                     Type = SecuritySchemeType.OpenIdConnect,
-                    Scheme = AuthenticationScheme.OpenIdConnectUrl,
+                    Scheme = OpenApiConstants.OpenIdConnectUrl,
                     OpenIdConnectUrl = new Uri("https://example.com/openIdConnect")
                 }
             }
@@ -129,7 +129,7 @@ public class OpenApiComponentsTests
                 {
                     Description = "description1",
                     Type = SecuritySchemeType.OpenIdConnect,
-                    Scheme = AuthenticationScheme.OpenIdConnectUrl,
+                    Scheme = OpenApiConstants.OpenIdConnectUrl,
                     OpenIdConnectUrl = new Uri("https://example.com/openIdConnect"),
                     Reference = new OpenApiReference
                     {
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.cs
@@ -32,15 +32,16 @@ public class OpenApiSecuritySchemeTests
         {
             Description = "description1",
             Type = SecuritySchemeType.Http,
-            Scheme = AuthenticationScheme.Basic,
+            Scheme = OpenApiConstants.Basic           
+
         };
 
         public static OpenApiSecurityScheme HttpBearerSecurityScheme = new OpenApiSecurityScheme
         {
             Description = "description1",
             Type = SecuritySchemeType.Http,
-            Scheme = AuthenticationScheme.Bearer,
-            BearerFormat = BearerFormat.JWT,
+            Scheme = OpenApiConstants.Bearer,
+            BearerFormat = OpenApiConstants.Jwt
         };
 
         public static OpenApiSecurityScheme OAuth2SingleFlowSecurityScheme = new OpenApiSecurityScheme
@@ -103,15 +104,15 @@ public class OpenApiSecuritySchemeTests
         {
             Description = "description1",
             Type = SecuritySchemeType.OpenIdConnect,
-            Scheme = AuthenticationScheme.OpenIdConnectUrl,
+            Scheme = OpenApiConstants.OpenIdConnectUrl,
             OpenIdConnectUrl = new Uri("https://example.com/openIdConnect")
         };
 
         public static OpenApiSecurityScheme ReferencedSecurityScheme = new OpenApiSecurityScheme
         {
             Description = "description1",
             Type = SecuritySchemeType.OpenIdConnect,
-            Scheme = AuthenticationScheme.OpenIdConnectUrl,
+            Scheme = OpenApiConstants.OpenIdConnectUrl,
             OpenIdConnectUrl = new Uri("https://example.com/openIdConnect"),
             Reference = new OpenApiReference
             {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ internal static partial class OpenApiV2Deserializer`
`30`	`30`	`{`
`31`	`31`	`case "basic":`
`32`	`32`	`o.Type = SecuritySchemeType.Http;`
`33`		`- o.Scheme = AuthenticationScheme.Basic;`
	`33`	`+ o.Scheme = OpenApiConstants.Basic;`
`34`	`34`	`break;`
`35`	`35`
`36`	`36`	`case "apiKey":`
Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,13 @@ internal static partial class OpenApiV3Deserializer`
`44`	`44`	`{`
`45`	`45`	`"scheme", (o, n) =>`
`46`	`46`	`{`
`47`		`- o.Scheme = n.GetScalarValue().GetEnumFromDisplayName<AuthenticationScheme>();`
	`47`	`+ o.Scheme = n.GetScalarValue();`
`48`	`48`	`}`
`49`	`49`	`},`
`50`	`50`	`{`
`51`	`51`	`"bearerFormat", (o, n) =>`
`52`	`52`	`{`
`53`		`- o.BearerFormat = n.GetScalarValue().GetEnumFromDisplayName<BearerFormat>();`
	`53`	`+ o.BearerFormat = n.GetScalarValue();`
`54`	`54`	`}`
`55`	`55`	`},`
`56`	`56`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void ParseHttpSecuritySchemeShouldSucceed()`
`38`	`38`	`new OpenApiSecurityScheme`
`39`	`39`	`{`
`40`	`40`	`Type = SecuritySchemeType.Http,`
`41`		`- Scheme = AuthenticationScheme.Basic`
	`41`	`+ Scheme = OpenApiConstants.Basic`
`42`	`42`	`});`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void ParseHttpSecuritySchemeShouldSucceed()`
`40`	`40`	`new OpenApiSecurityScheme`
`41`	`41`	`{`
`42`	`42`	`Type = SecuritySchemeType.Http,`
`43`		`- Scheme = AuthenticationScheme.Basic`
	`43`	`+ Scheme = OpenApiConstants.Basic`
`44`	`44`	`});`
`45`	`45`	`}`
`46`	`46`	`}`
`@@ -95,8 +95,8 @@ public void ParseBearerSecuritySchemeShouldSucceed()`
`95`	`95`	`new OpenApiSecurityScheme`
`96`	`96`	`{`
`97`	`97`	`Type = SecuritySchemeType.Http,`
`98`		`- Scheme = AuthenticationScheme.Bearer,`
`99`		`- BearerFormat = BearerFormat.JWT`
	`98`	`+ Scheme = OpenApiConstants.Bearer,`
	`99`	`+ BearerFormat = OpenApiConstants.Jwt`
`100`	`100`	`});`
`101`	`101`	`}`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public class OpenApiComponentsTests`
`57`	`57`	`{`
`58`	`58`	`Description = "description1",`
`59`	`59`	`Type = SecuritySchemeType.OpenIdConnect,`
`60`		`- Scheme = AuthenticationScheme.OpenIdConnectUrl,`
	`60`	`+ Scheme = OpenApiConstants.OpenIdConnectUrl,`
`61`	`61`	`OpenIdConnectUrl = new Uri("https://example.com/openIdConnect")`
`62`	`62`	`}`
`63`	`63`	`}`
`@@ -129,7 +129,7 @@ public class OpenApiComponentsTests`
`129`	`129`	`{`
`130`	`130`	`Description = "description1",`
`131`	`131`	`Type = SecuritySchemeType.OpenIdConnect,`
`132`		`- Scheme = AuthenticationScheme.OpenIdConnectUrl,`
	`132`	`+ Scheme = OpenApiConstants.OpenIdConnectUrl,`
`133`	`133`	`OpenIdConnectUrl = new Uri("https://example.com/openIdConnect"),`
`134`	`134`	`Reference = new OpenApiReference`
`135`	`135`	`{`