Update IdentityModel versions to latest, fix samples.

Tratcher · Tratcher · commit 5485846b5c11 · 2017-07-12T09:56:25.000-07:00
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
     <CoreFxVersion>4.4.0-*</CoreFxVersion>
-    <IdentityModelActiveDirectoryVersion>3.13.9</IdentityModelActiveDirectoryVersion>
-    <IdentityModelOpenIdVersion>2.1.3</IdentityModelOpenIdVersion>
+    <IdentityModelActiveDirectoryVersion>3.14.1</IdentityModelActiveDirectoryVersion>
+    <IdentityModelOpenIdVersion>2.1.4</IdentityModelOpenIdVersion>
     <InternalAspNetCoreSdkVersion>2.0.1-*</InternalAspNetCoreSdkVersion>
     <JsonNetVersion>10.0.1</JsonNetVersion>
     <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
diff --git a/samples/OpenIdConnect.AzureAdSample/Startup.cs b/samples/OpenIdConnect.AzureAdSample/Startup.cs
@@ -45,8 +45,7 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddAuthentication(sharedOptions =>
             {
-                sharedOptions.DefaultAuthenticateScheme = CookieAuthenticationDefaults.AuthenticationScheme;
-                sharedOptions.DefaultSignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
+                sharedOptions.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme;
                 sharedOptions.DefaultChallengeScheme = OpenIdConnectDefaults.AuthenticationScheme;
             })
                 .AddCookie()
diff --git a/samples/OpenIdConnectSample/Startup.cs b/samples/OpenIdConnectSample/Startup.cs
@@ -147,7 +147,7 @@ await WriteHtmlAsync(context.Response, async res =>
                 // Authenticated, but not authorized
                 if (context.Request.Path.Equals("/restricted") && !user.Identities.Any(identity => identity.HasClaim("special", "true")))
                 {
-                    await context.ChallengeAsync();
+                    await context.ForbidAsync();
                     return;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,7 @@ public void ConfigureServices(IServiceCollection services)`
`45`	`45`	`{`
`46`	`46`	`services.AddAuthentication(sharedOptions =>`
`47`	`47`	`{`
`48`		`- sharedOptions.DefaultAuthenticateScheme = CookieAuthenticationDefaults.AuthenticationScheme;`
`49`		`- sharedOptions.DefaultSignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;`
	`48`	`+ sharedOptions.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme;`
`50`	`49`	`sharedOptions.DefaultChallengeScheme = OpenIdConnectDefaults.AuthenticationScheme;`
`51`	`50`	`})`
`52`	`51`	`.AddCookie()`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ await WriteHtmlAsync(context.Response, async res =>`
`147`	`147`	`// Authenticated, but not authorized`
`148`	`148`	`if (context.Request.Path.Equals("/restricted") && !user.Identities.Any(identity => identity.HasClaim("special", "true")))`
`149`	`149`	`{`
`150`		`- await context.ChallengeAsync();`
	`150`	`+ await context.ForbidAsync();`
`151`	`151`	`return;`
`152`	`152`	`}`
`153`	`153`