Refactor code

MaggieKimani1 · MaggieKimani1 · commit fc6f4617b20b · 2022-02-16T22:38:19.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 = "basic";
+                                o.Scheme = AuthenticationScheme.Basic;
                                 break;
 
                             case "apiKey":
diff --git a/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs b/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System;
@@ -163,7 +163,7 @@ public void SerializeAsV2(IOpenApiWriter writer)
         /// </summary>
         public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
         {
-            if (Type == SecuritySchemeType.Http && Scheme != OpenApiConstants.Basic)
+            if (Type == SecuritySchemeType.Http && Scheme != AuthenticationScheme.Basic)
             {
                 // Bail because V2 does not support non-basic HTTP scheme
                 writer.WriteStartObject();
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 = "basic"
+                        Scheme = AuthenticationScheme.Basic
                     });
             }
         }
@@ -95,8 +95,8 @@ public void ParseBearerSecuritySchemeShouldSucceed()
                     new OpenApiSecurityScheme
                     {
                         Type = SecuritySchemeType.Http,
-                        Scheme = "bearer",
-                        BearerFormat = "JWT"
+                        Scheme = AuthenticationScheme.Bearer,
+                        BearerFormat = BearerFormat.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 = "openIdConnectUrl",
+                    Scheme = AuthenticationScheme.OpenIdConnectUrl,
                     OpenIdConnectUrl = new Uri("https://example.com/openIdConnect")
                 }
             }
@@ -129,7 +129,7 @@ public class OpenApiComponentsTests
                 {
                     Description = "description1",
                     Type = SecuritySchemeType.OpenIdConnect,
-                    Scheme = "openIdConnectUrl",
+                    Scheme = AuthenticationScheme.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,15 @@ public class OpenApiSecuritySchemeTests
         {
             Description = "description1",
             Type = SecuritySchemeType.Http,
-            Scheme = "basic",
+            Scheme = AuthenticationScheme.Basic,
         };
 
         public static OpenApiSecurityScheme HttpBearerSecurityScheme = new OpenApiSecurityScheme
         {
             Description = "description1",
             Type = SecuritySchemeType.Http,
-            Scheme = "bearer",
-            BearerFormat = "JWT",
+            Scheme = AuthenticationScheme.Bearer,
+            BearerFormat = BearerFormat.JWT,
         };
 
         public static OpenApiSecurityScheme OAuth2SingleFlowSecurityScheme = new OpenApiSecurityScheme
@@ -103,15 +103,15 @@ public class OpenApiSecuritySchemeTests
         {
             Description = "description1",
             Type = SecuritySchemeType.OpenIdConnect,
-            Scheme = "openIdConnectUrl",
+            Scheme = AuthenticationScheme.OpenIdConnectUrl,
             OpenIdConnectUrl = new Uri("https://example.com/openIdConnect")
         };
 
         public static OpenApiSecurityScheme ReferencedSecurityScheme = new OpenApiSecurityScheme
         {
             Description = "description1",
             Type = SecuritySchemeType.OpenIdConnect,
-            Scheme = "openIdConnectUrl",
+            Scheme = AuthenticationScheme.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 = "basic";`
	`33`	`+ o.Scheme = AuthenticationScheme.Basic;`
`34`	`34`	`break;`
`35`	`35`
`36`	`36`	`case "apiKey":`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) Microsoft Corporation. All rights reserved.`
	`1`	`+// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT license.`
`3`	`3`
`4`	`4`	`using System;`
`@@ -163,7 +163,7 @@ public void SerializeAsV2(IOpenApiWriter writer)`
`163`	`163`	`/// </summary>`
`164`	`164`	`public void SerializeAsV2WithoutReference(IOpenApiWriter writer)`
`165`	`165`	`{`
`166`		`- if (Type == SecuritySchemeType.Http && Scheme != OpenApiConstants.Basic)`
	`166`	`+ if (Type == SecuritySchemeType.Http && Scheme != AuthenticationScheme.Basic)`
`167`	`167`	`{`
`168`	`168`	`// Bail because V2 does not support non-basic HTTP scheme`
`169`	`169`	`writer.WriteStartObject();`
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 = "basic"`
	`43`	`+ Scheme = AuthenticationScheme.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 = "bearer",`
`99`		`- BearerFormat = "JWT"`
	`98`	`+ Scheme = AuthenticationScheme.Bearer,`
	`99`	`+ BearerFormat = BearerFormat.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 = "openIdConnectUrl",`
	`60`	`+ Scheme = AuthenticationScheme.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 = "openIdConnectUrl",`
	`132`	`+ Scheme = AuthenticationScheme.OpenIdConnectUrl,`
`133`	`133`	`OpenIdConnectUrl = new Uri("https://example.com/openIdConnect"),`
`134`	`134`	`Reference = new OpenApiReference`
`135`	`135`	`{`