React to AddDataProtection change

HaoK · HaoK · commit 240ed82b3149 · 2014-11-24T16:32:33.000-08:00
diff --git a/samples/CookieSample/Startup.cs b/samples/CookieSample/Startup.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Security.Cookies;
-using Microsoft.AspNet.Security.DataProtection;
+using Microsoft.Framework.DependencyInjection;
 
 namespace CookieSample
 {
@@ -12,7 +12,7 @@ public void Configure(IApplicationBuilder app)
         {
             app.UseServices(services =>
             {
-                services.Add(DataProtectionServices.GetDefaultServices());
+                services.AddDataProtection();
             });
 
             app.UseCookieAuthentication(options =>
diff --git a/samples/CookieSessionSample/Startup.cs b/samples/CookieSessionSample/Startup.cs
@@ -3,7 +3,7 @@
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Security.Cookies;
-using Microsoft.AspNet.Security.DataProtection;
+using Microsoft.Framework.DependencyInjection;
 
 namespace CookieSessionSample
 {
@@ -13,7 +13,7 @@ public void Configure(IApplicationBuilder app)
         {
             app.UseServices(services =>
             {
-                services.Add(DataProtectionServices.GetDefaultServices());
+                services.AddDataProtection();
             });
 
             app.UseCookieAuthentication(options => 
diff --git a/samples/SocialSample/Startup.cs b/samples/SocialSample/Startup.cs
@@ -23,7 +23,7 @@ public void Configure(IApplicationBuilder app)
 
             app.UseServices(services =>
             {
-                services.Add(DataProtectionServices.GetDefaultServices());
+                services.AddDataProtection();
                 services.Configure<ExternalAuthenticationOptions>(options =>
                 {
                     options.SignInAsAuthenticationType = CookieAuthenticationDefaults.AuthenticationType;
diff --git a/test/Microsoft.AspNet.Security.Test/Cookies/CookieMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Cookies/CookieMiddlewareTests.cs
@@ -15,8 +15,8 @@
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Security;
-using Microsoft.AspNet.Security.DataProtection;
 using Microsoft.AspNet.TestHost;
+using Microsoft.Framework.DependencyInjection;
 using Shouldly;
 using Xunit;
 
@@ -368,7 +368,7 @@ private static TestServer CreateServer(Action<CookieAuthenticationOptions> confi
         {
             return TestServer.Create(app =>
             {
-                app.UseServices(services => services.Add(DataProtectionServices.GetDefaultServices()));
+                app.UseServices(services => services.AddDataProtection());
                 app.UseCookieAuthentication(configureOptions);
                 app.Use(async (context, next) =>
                 {
diff --git a/test/Microsoft.AspNet.Security.Test/Facebook/FacebookMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Facebook/FacebookMiddlewareTests.cs
@@ -27,7 +27,7 @@ public async Task ChallengeWillTriggerApplyRedirectEvent()
                 {
                     app.UseServices(services =>
                     {
-                        services.Add(DataProtectionServices.GetDefaultServices());
+                        services.AddDataProtection();
                         services.ConfigureFacebookAuthentication(options =>
                         {
                             options.AppId = "Test App Id";
@@ -71,7 +71,7 @@ public async Task ChallengeWillTriggerRedirection()
                 {
                     app.UseServices(services =>
                     {
-                        services.Add(DataProtectionServices.GetDefaultServices());
+                        services.AddDataProtection();
                         services.ConfigureFacebookAuthentication(options =>
                         {
                             options.AppId = "Test App Id";
diff --git a/test/Microsoft.AspNet.Security.Test/Google/GoogleMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Google/GoogleMiddlewareTests.cs
@@ -467,7 +467,7 @@ private static TestServer CreateServer(Action<GoogleAuthenticationOptions> confi
             {
                 app.UseServices(services =>
                 {
-                    services.Add(DataProtectionServices.GetDefaultServices());
+                    services.AddDataProtection();
                     services.Configure<ExternalAuthenticationOptions>(options =>
                     {
                         options.SignInAsAuthenticationType = CookieAuthenticationType;
diff --git a/test/Microsoft.AspNet.Security.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs
@@ -165,7 +165,7 @@ private static TestServer CreateServer(Action<MicrosoftAccountAuthenticationOpti
             {
                 app.UseServices(services =>
                 {
-                    services.Add(DataProtectionServices.GetDefaultServices());
+                    services.AddDataProtection();
                     services.Configure<ExternalAuthenticationOptions>(options =>
                     {
                         options.SignInAsAuthenticationType = "External";
diff --git a/test/Microsoft.AspNet.Security.Test/Twitter/TwitterMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Twitter/TwitterMiddlewareTests.cs
@@ -112,7 +112,7 @@ private static TestServer CreateServer(Action<IApplicationBuilder> configure, Fu
             {
                 app.UseServices(services =>
                 {
-                    services.Add(DataProtectionServices.GetDefaultServices());
+                    services.AddDataProtection();
                     services.Configure<ExternalAuthenticationOptions>(options =>
                     {
                         options.SignInAsAuthenticationType = "External";

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using Microsoft.AspNet.Builder;`
`3`	`3`	`using Microsoft.AspNet.Http;`
`4`	`4`	`using Microsoft.AspNet.Security.Cookies;`
`5`		`-using Microsoft.AspNet.Security.DataProtection;`
	`5`	`+using Microsoft.Framework.DependencyInjection;`
`6`	`6`
`7`	`7`	`namespace CookieSample`
`8`	`8`	`{`
`@@ -12,7 +12,7 @@ public void Configure(IApplicationBuilder app)`
`12`	`12`	`{`
`13`	`13`	`app.UseServices(services =>`
`14`	`14`	`{`
`15`		`- services.Add(DataProtectionServices.GetDefaultServices());`
	`15`	`+ services.AddDataProtection();`
`16`	`16`	`});`
`17`	`17`
`18`	`18`	`app.UseCookieAuthentication(options =>`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using Microsoft.AspNet.Builder;`
`4`	`4`	`using Microsoft.AspNet.Http;`
`5`	`5`	`using Microsoft.AspNet.Security.Cookies;`
`6`		`-using Microsoft.AspNet.Security.DataProtection;`
	`6`	`+using Microsoft.Framework.DependencyInjection;`
`7`	`7`
`8`	`8`	`namespace CookieSessionSample`
`9`	`9`	`{`
`@@ -13,7 +13,7 @@ public void Configure(IApplicationBuilder app)`
`13`	`13`	`{`
`14`	`14`	`app.UseServices(services =>`
`15`	`15`	`{`
`16`		`- services.Add(DataProtectionServices.GetDefaultServices());`
	`16`	`+ services.AddDataProtection();`
`17`	`17`	`});`
`18`	`18`
`19`	`19`	`app.UseCookieAuthentication(options =>`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public void Configure(IApplicationBuilder app)`
`23`	`23`
`24`	`24`	`app.UseServices(services =>`
`25`	`25`	`{`
`26`		`- services.Add(DataProtectionServices.GetDefaultServices());`
	`26`	`+ services.AddDataProtection();`
`27`	`27`	`services.Configure<ExternalAuthenticationOptions>(options =>`
`28`	`28`	`{`
`29`	`29`	`options.SignInAsAuthenticationType = CookieAuthenticationDefaults.AuthenticationType;`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`using Microsoft.AspNet.Builder;`
`16`	`16`	`using Microsoft.AspNet.Http;`
`17`	`17`	`using Microsoft.AspNet.Http.Security;`
`18`		`-using Microsoft.AspNet.Security.DataProtection;`
`19`	`18`	`using Microsoft.AspNet.TestHost;`
	`19`	`+using Microsoft.Framework.DependencyInjection;`
`20`	`20`	`using Shouldly;`
`21`	`21`	`using Xunit;`
`22`	`22`
`@@ -368,7 +368,7 @@ private static TestServer CreateServer(Action<CookieAuthenticationOptions> confi`
`368`	`368`	`{`
`369`	`369`	`return TestServer.Create(app =>`
`370`	`370`	`{`
`371`		`- app.UseServices(services => services.Add(DataProtectionServices.GetDefaultServices()));`
	`371`	`+ app.UseServices(services => services.AddDataProtection());`
`372`	`372`	`app.UseCookieAuthentication(configureOptions);`
`373`	`373`	`app.Use(async (context, next) =>`
`374`	`374`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public async Task ChallengeWillTriggerApplyRedirectEvent()`
`27`	`27`	`{`
`28`	`28`	`app.UseServices(services =>`
`29`	`29`	`{`
`30`		`- services.Add(DataProtectionServices.GetDefaultServices());`
	`30`	`+ services.AddDataProtection();`
`31`	`31`	`services.ConfigureFacebookAuthentication(options =>`
`32`	`32`	`{`
`33`	`33`	`options.AppId = "Test App Id";`
`@@ -71,7 +71,7 @@ public async Task ChallengeWillTriggerRedirection()`
`71`	`71`	`{`
`72`	`72`	`app.UseServices(services =>`
`73`	`73`	`{`
`74`		`- services.Add(DataProtectionServices.GetDefaultServices());`
	`74`	`+ services.AddDataProtection();`
`75`	`75`	`services.ConfigureFacebookAuthentication(options =>`
`76`	`76`	`{`
`77`	`77`	`options.AppId = "Test App Id";`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ private static TestServer CreateServer(Action<GoogleAuthenticationOptions> confi`
`467`	`467`	`{`
`468`	`468`	`app.UseServices(services =>`
`469`	`469`	`{`
`470`		`- services.Add(DataProtectionServices.GetDefaultServices());`
	`470`	`+ services.AddDataProtection();`
`471`	`471`	`services.Configure<ExternalAuthenticationOptions>(options =>`
`472`	`472`	`{`
`473`	`473`	`options.SignInAsAuthenticationType = CookieAuthenticationType;`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ private static TestServer CreateServer(Action<MicrosoftAccountAuthenticationOpti`
`165`	`165`	`{`
`166`	`166`	`app.UseServices(services =>`
`167`	`167`	`{`
`168`		`- services.Add(DataProtectionServices.GetDefaultServices());`
	`168`	`+ services.AddDataProtection();`
`169`	`169`	`services.Configure<ExternalAuthenticationOptions>(options =>`
`170`	`170`	`{`
`171`	`171`	`options.SignInAsAuthenticationType = "External";`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ private static TestServer CreateServer(Action<IApplicationBuilder> configure, Fu`
`112`	`112`	`{`
`113`	`113`	`app.UseServices(services =>`
`114`	`114`	`{`
`115`		`- services.Add(DataProtectionServices.GetDefaultServices());`
	`115`	`+ services.AddDataProtection();`
`116`	`116`	`services.Configure<ExternalAuthenticationOptions>(options =>`
`117`	`117`	`{`
`118`	`118`	`options.SignInAsAuthenticationType = "External";`