Cleanup

Tratcher · Tratcher · commit 2ca16da1b378 · 2019-01-14T15:46:57.000-08:00
diff --git a/src/Hosting/TestHost/src/AsyncStreamWrapper.cs b/src/Hosting/TestHost/src/AsyncStreamWrapper.cs
@@ -31,7 +31,7 @@ internal AsyncStreamWrapper(Stream inner, Func<bool> allowSynchronousIO)
 
         public override void Flush()
         {
-            // Not bocking Flush because things like StreamWriter.Dispose() always call it.
+            // Not blocking Flush because things like StreamWriter.Dispose() always call it.
             _inner.Flush();
         }
 
diff --git a/src/Security/Authentication/test/CookieTests.cs b/src/Security/Authentication/test/CookieTests.cs
@@ -1302,7 +1302,7 @@ public async Task CanSpecifyAndShareDataProtector()
                     app.Use(async (context, next) =>
                     {
                         var result = await context.AuthenticateAsync("Cookies");
-                        await Describe(context.Response, result);
+                        await DescribeAsync(context.Response, result);
                     });
                 })
                 .ConfigureServices(services => services.AddAuthentication().AddCookie("Cookies", o =>
@@ -1478,12 +1478,12 @@ private static TestServer CreateServerWithServices(Action<IServiceCollection> co
                         }
                         else if (req.Path == new PathString("/me"))
                         {
-                            await Describe(res, AuthenticateResult.Success(new AuthenticationTicket(context.User, new AuthenticationProperties(), CookieAuthenticationDefaults.AuthenticationScheme)));
+                            await DescribeAsync(res, AuthenticateResult.Success(new AuthenticationTicket(context.User, new AuthenticationProperties(), CookieAuthenticationDefaults.AuthenticationScheme)));
                         }
                         else if (req.Path.StartsWithSegments(new PathString("/me"), out remainder))
                         {
                             var ticket = await context.AuthenticateAsync(remainder.Value.Substring(1));
-                            await Describe(res, ticket);
+                            await DescribeAsync(res, ticket);
                         }
                         else if (req.Path == new PathString("/testpath") && testpath != null)
                         {
@@ -1510,7 +1510,7 @@ private static TestServer CreateServerWithServices(Action<IServiceCollection> co
             return server;
         }
 
-        private static Task Describe(HttpResponse res, AuthenticateResult result)
+        private static Task DescribeAsync(HttpResponse res, AuthenticateResult result)
         {
             res.StatusCode = 200;
             res.ContentType = "text/xml";
diff --git a/src/Security/Authentication/test/DynamicSchemeTests.cs b/src/Security/Authentication/test/DynamicSchemeTests.cs
@@ -145,7 +145,7 @@ private static TestServer CreateServer(Action<IServiceCollection> configureServi
                         {
                             var name = (remainder.Value.Length > 0) ? remainder.Value.Substring(1) : null;
                             var result = await context.AuthenticateAsync(name);
-                            await res.Describe(result?.Ticket?.Principal);
+                            await res.DescribeAsync(result?.Ticket?.Principal);
                         }
                         else if (req.Path.StartsWithSegments(new PathString("/remove"), out remainder))
                         {
diff --git a/src/Security/Authentication/test/GoogleTests.cs b/src/Security/Authentication/test/GoogleTests.cs
@@ -1177,26 +1177,26 @@ private static TestServer CreateServer(Action<GoogleOptions> configureOptions, F
                         {
                             var result = await context.AuthenticateAsync(TestExtensions.CookieAuthenticationScheme);
                             var tokens = result.Properties.GetTokens();
-                            await res.Describe(tokens);
+                            await res.DescribeAsync(tokens);
                         }
                         else if (req.Path == new PathString("/me"))
                         {
-                            await res.Describe(context.User);
+                            await res.DescribeAsync(context.User);
                         }
                         else if (req.Path == new PathString("/authenticate"))
                         {
                             var result = await context.AuthenticateAsync(TestExtensions.CookieAuthenticationScheme);
-                            await res.Describe(result.Principal);
+                            await res.DescribeAsync(result.Principal);
                         }
                         else if (req.Path == new PathString("/authenticateGoogle"))
                         {
                             var result = await context.AuthenticateAsync("Google");
-                            await res.Describe(result?.Principal);
+                            await res.DescribeAsync(result?.Principal);
                         }
                         else if (req.Path == new PathString("/authenticateFacebook"))
                         {
                             var result = await context.AuthenticateAsync("Facebook");
-                            await res.Describe(result?.Principal);
+                            await res.DescribeAsync(result?.Principal);
                         }
                         else if (req.Path == new PathString("/unauthorized"))
                         {
diff --git a/src/Security/Authentication/test/MicrosoftAccountTests.cs b/src/Security/Authentication/test/MicrosoftAccountTests.cs
@@ -270,7 +270,7 @@ private static TestServer CreateServer(Action<MicrosoftAccountOptions> configure
                         }
                         else if (req.Path == new PathString("/me"))
                         {
-                            await res.Describe(context.User);
+                            await res.DescribeAsync(context.User);
                         }
                         else if (req.Path == new PathString("/signIn"))
                         {
diff --git a/src/Security/Authentication/test/PolicyTests.cs b/src/Security/Authentication/test/PolicyTests.cs
@@ -469,7 +469,7 @@ private static TestServer CreateServer(Action<IServiceCollection> configure = nu
                         {
                             var name = (remainder.Value.Length > 0) ? remainder.Value.Substring(1) : null;
                             var result = await context.AuthenticateAsync(name);
-                            await res.Describe(result?.Ticket?.Principal);
+                            await res.DescribeAsync(result?.Ticket?.Principal);
                         }
                         else
                         {
diff --git a/src/Security/Authentication/test/TestExtensions.cs b/src/Security/Authentication/test/TestExtensions.cs
@@ -46,7 +46,7 @@ public static async Task<Transaction> SendAsync(this TestServer server, string u
             return transaction;
         }
 
-        public static Task Describe(this HttpResponse res, ClaimsPrincipal principal)
+        public static Task DescribeAsync(this HttpResponse res, ClaimsPrincipal principal)
         {
             res.StatusCode = 200;
             res.ContentType = "text/xml";
@@ -65,7 +65,7 @@ public static Task Describe(this HttpResponse res, ClaimsPrincipal principal)
             return res.Body.WriteAsync(xmlBytes, 0, xmlBytes.Length);
         }
 
-        public static Task Describe(this HttpResponse res, IEnumerable<AuthenticationToken> tokens)
+        public static Task DescribeAsync(this HttpResponse res, IEnumerable<AuthenticationToken> tokens)
         {
             res.StatusCode = 200;
             res.ContentType = "text/xml";
diff --git a/src/Security/CookiePolicy/test/TestExtensions.cs b/src/Security/CookiePolicy/test/TestExtensions.cs
@@ -45,24 +45,5 @@ public static async Task<Transaction> SendAsync(this TestServer server, string u
             }
             return transaction;
         }
-
-        public static void Describe(this HttpResponse res, ClaimsPrincipal principal)
-        {
-            res.StatusCode = 200;
-            res.ContentType = "text/xml";
-            var xml = new XElement("xml");
-            if (principal != null)
-            {
-                foreach (var identity in principal.Identities)
-                {
-                    xml.Add(identity.Claims.Select(claim => 
-                        new XElement("claim", new XAttribute("type", claim.Type), 
-                        new XAttribute("value", claim.Value), 
-                        new XAttribute("issuer", claim.Issuer))));
-                }
-            }
-            var xmlBytes = Encoding.UTF8.GetBytes(xml.ToString());
-            res.Body.Write(xmlBytes, 0, xmlBytes.Length);
-        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ internal AsyncStreamWrapper(Stream inner, Func<bool> allowSynchronousIO)`
`31`	`31`
`32`	`32`	`public override void Flush()`
`33`	`33`	`{`
`34`		`- // Not bocking Flush because things like StreamWriter.Dispose() always call it.`
	`34`	`+ // Not blocking Flush because things like StreamWriter.Dispose() always call it.`
`35`	`35`	`_inner.Flush();`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -1302,7 +1302,7 @@ public async Task CanSpecifyAndShareDataProtector()`
`1302`	`1302`	`app.Use(async (context, next) =>`
`1303`	`1303`	`{`
`1304`	`1304`	`var result = await context.AuthenticateAsync("Cookies");`
`1305`		`- await Describe(context.Response, result);`
	`1305`	`+ await DescribeAsync(context.Response, result);`
`1306`	`1306`	`});`
`1307`	`1307`	`})`
`1308`	`1308`	`.ConfigureServices(services => services.AddAuthentication().AddCookie("Cookies", o =>`
`@@ -1478,12 +1478,12 @@ private static TestServer CreateServerWithServices(Action<IServiceCollection> co`
`1478`	`1478`	`}`
`1479`	`1479`	`else if (req.Path == new PathString("/me"))`
`1480`	`1480`	`{`
`1481`		`- await Describe(res, AuthenticateResult.Success(new AuthenticationTicket(context.User, new AuthenticationProperties(), CookieAuthenticationDefaults.AuthenticationScheme)));`
	`1481`	`+ await DescribeAsync(res, AuthenticateResult.Success(new AuthenticationTicket(context.User, new AuthenticationProperties(), CookieAuthenticationDefaults.AuthenticationScheme)));`
`1482`	`1482`	`}`
`1483`	`1483`	`else if (req.Path.StartsWithSegments(new PathString("/me"), out remainder))`
`1484`	`1484`	`{`
`1485`	`1485`	`var ticket = await context.AuthenticateAsync(remainder.Value.Substring(1));`
`1486`		`- await Describe(res, ticket);`
	`1486`	`+ await DescribeAsync(res, ticket);`
`1487`	`1487`	`}`
`1488`	`1488`	`else if (req.Path == new PathString("/testpath") && testpath != null)`
`1489`	`1489`	`{`
`@@ -1510,7 +1510,7 @@ private static TestServer CreateServerWithServices(Action<IServiceCollection> co`
`1510`	`1510`	`return server;`
`1511`	`1511`	`}`
`1512`	`1512`
`1513`		`- private static Task Describe(HttpResponse res, AuthenticateResult result)`
	`1513`	`+ private static Task DescribeAsync(HttpResponse res, AuthenticateResult result)`
`1514`	`1514`	`{`
`1515`	`1515`	`res.StatusCode = 200;`
`1516`	`1516`	`res.ContentType = "text/xml";`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ private static TestServer CreateServer(Action<IServiceCollection> configureServi`
`145`	`145`	`{`
`146`	`146`	`var name = (remainder.Value.Length > 0) ? remainder.Value.Substring(1) : null;`
`147`	`147`	`var result = await context.AuthenticateAsync(name);`
`148`		`- await res.Describe(result?.Ticket?.Principal);`
	`148`	`+ await res.DescribeAsync(result?.Ticket?.Principal);`
`149`	`149`	`}`
`150`	`150`	`else if (req.Path.StartsWithSegments(new PathString("/remove"), out remainder))`
`151`	`151`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1177,26 +1177,26 @@ private static TestServer CreateServer(Action<GoogleOptions> configureOptions, F`
`1177`	`1177`	`{`
`1178`	`1178`	`var result = await context.AuthenticateAsync(TestExtensions.CookieAuthenticationScheme);`
`1179`	`1179`	`var tokens = result.Properties.GetTokens();`
`1180`		`- await res.Describe(tokens);`
	`1180`	`+ await res.DescribeAsync(tokens);`
`1181`	`1181`	`}`
`1182`	`1182`	`else if (req.Path == new PathString("/me"))`
`1183`	`1183`	`{`
`1184`		`- await res.Describe(context.User);`
	`1184`	`+ await res.DescribeAsync(context.User);`
`1185`	`1185`	`}`
`1186`	`1186`	`else if (req.Path == new PathString("/authenticate"))`
`1187`	`1187`	`{`
`1188`	`1188`	`var result = await context.AuthenticateAsync(TestExtensions.CookieAuthenticationScheme);`
`1189`		`- await res.Describe(result.Principal);`
	`1189`	`+ await res.DescribeAsync(result.Principal);`
`1190`	`1190`	`}`
`1191`	`1191`	`else if (req.Path == new PathString("/authenticateGoogle"))`
`1192`	`1192`	`{`
`1193`	`1193`	`var result = await context.AuthenticateAsync("Google");`
`1194`		`- await res.Describe(result?.Principal);`
	`1194`	`+ await res.DescribeAsync(result?.Principal);`
`1195`	`1195`	`}`
`1196`	`1196`	`else if (req.Path == new PathString("/authenticateFacebook"))`
`1197`	`1197`	`{`
`1198`	`1198`	`var result = await context.AuthenticateAsync("Facebook");`
`1199`		`- await res.Describe(result?.Principal);`
	`1199`	`+ await res.DescribeAsync(result?.Principal);`
`1200`	`1200`	`}`
`1201`	`1201`	`else if (req.Path == new PathString("/unauthorized"))`
`1202`	`1202`	`{`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ private static TestServer CreateServer(Action<MicrosoftAccountOptions> configure`
`270`	`270`	`}`
`271`	`271`	`else if (req.Path == new PathString("/me"))`
`272`	`272`	`{`
`273`		`- await res.Describe(context.User);`
	`273`	`+ await res.DescribeAsync(context.User);`
`274`	`274`	`}`
`275`	`275`	`else if (req.Path == new PathString("/signIn"))`
`276`	`276`	`{`
Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ private static TestServer CreateServer(Action<IServiceCollection> configure = nu`
`469`	`469`	`{`
`470`	`470`	`var name = (remainder.Value.Length > 0) ? remainder.Value.Substring(1) : null;`
`471`	`471`	`var result = await context.AuthenticateAsync(name);`
`472`		`- await res.Describe(result?.Ticket?.Principal);`
	`472`	`+ await res.DescribeAsync(result?.Ticket?.Principal);`
`473`	`473`	`}`
`474`	`474`	`else`
`475`	`475`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public static async Task<Transaction> SendAsync(this TestServer server, string u`
`46`	`46`	`return transaction;`
`47`	`47`	`}`
`48`	`48`
`49`		`- public static Task Describe(this HttpResponse res, ClaimsPrincipal principal)`
	`49`	`+ public static Task DescribeAsync(this HttpResponse res, ClaimsPrincipal principal)`
`50`	`50`	`{`
`51`	`51`	`res.StatusCode = 200;`
`52`	`52`	`res.ContentType = "text/xml";`
`@@ -65,7 +65,7 @@ public static Task Describe(this HttpResponse res, ClaimsPrincipal principal)`
`65`	`65`	`return res.Body.WriteAsync(xmlBytes, 0, xmlBytes.Length);`
`66`	`66`	`}`
`67`	`67`
`68`		`- public static Task Describe(this HttpResponse res, IEnumerable<AuthenticationToken> tokens)`
	`68`	`+ public static Task DescribeAsync(this HttpResponse res, IEnumerable<AuthenticationToken> tokens)`
`69`	`69`	`{`
`70`	`70`	`res.StatusCode = 200;`
`71`	`71`	`res.ContentType = "text/xml";`