Merge remote-tracking branch 'origin/release/2.2' into origin/master

build/dependencies.props

@@ -4,9 +4,9 @@
   </PropertyGroup>
   <PropertyGroup Label="Package Versions">
     <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
-    <IdentityServer4AspNetIdentityPackageVersion>2.3.0-preview1-update2</IdentityServer4AspNetIdentityPackageVersion>
-    <IdentityServer4EntityFrameworkPackageVersion>2.3.0-preview1-update1</IdentityServer4EntityFrameworkPackageVersion>
-    <IdentityServer4PackageVersion>2.3.0-preview1-update2</IdentityServer4PackageVersion>
+    <IdentityServer4AspNetIdentityPackageVersion>2.3.0</IdentityServer4AspNetIdentityPackageVersion>
+    <IdentityServer4EntityFrameworkPackageVersion>2.3.0</IdentityServer4EntityFrameworkPackageVersion>
+    <IdentityServer4PackageVersion>2.3.0</IdentityServer4PackageVersion>
     <InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion>
     <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
     <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>

src/ApiAuth.IS/Configuration/AspNetConventionsConfigureOptions.cs

@@ -16,9 +16,6 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer
             options.Events.RaiseFailureEvents = true;
             options.Events.RaiseSuccessEvents = true;
             options.Authentication.CookieAuthenticationScheme = IdentityConstants.ApplicationScheme;
-            options.UserInteraction.LoginUrl = "/Identity/Account/Login";
-            options.UserInteraction.LogoutUrl = "/Identity/Account/Logout";
-            options.UserInteraction.ErrorUrl = "/Identity/Error";
         }
     }
 }

src/ApiAuth.IS/Data/ApiAuthorizationDbContext.cs

@@ -35,10 +35,15 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer
         }
 
         /// <summary>
-        /// Gets or sets the <see cref="PersistedGrant"/>.
+        /// Gets or sets the <see cref="DbSet{PersistedGrant}"/>.
         /// </summary>
         public DbSet<PersistedGrant> PersistedGrants { get; set; }
 
+        /// <summary>
+        /// Gets or sets the <see cref="DbSet{DeviceFlowCodes}"/>.
+        /// </summary>
+        public DbSet<DeviceFlowCodes> DeviceFlowCodes { get; set; }
+
         Task<int> IPersistedGrantDbContext.SaveChangesAsync() => base.SaveChangesAsync();
 
         /// <inheritdoc />

test/ApiAuth.IS.Test/Configuration/AspNetConventionsConfigureOptionsTests.cs

@@ -20,9 +20,6 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer
             configure.Configure(options);
 
             // Assert
-            Assert.Equal("/Identity/Account/Login", options.UserInteraction.LoginUrl);
-            Assert.Equal("/Identity/Account/Logout", options.UserInteraction.LogoutUrl);
-            Assert.Equal("/Identity/Error", options.UserInteraction.ErrorUrl);
             Assert.Equal(IdentityConstants.ApplicationScheme, options.Authentication.CookieAuthenticationScheme);
         }