move identityserver libs into core

src/Api/Api.csproj

@@ -39,7 +39,6 @@
     <PackageReference Include="AspNetCoreRateLimit" Version="1.0.5" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="1.4.0" />
     <PackageReference Include="Serilog.Sinks.AzureDocumentDb" Version="3.6.1" />
-    <PackageReference Include="IdentityServer4" Version="1.3.1" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.1.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.1" />
   </ItemGroup>

src/Api/Startup.cs

@@ -26,7 +26,7 @@ using IdentityServer4.Stores;
 using Bit.Core.Utilities;
 using Serilog;
 using Serilog.Events;
-using Bit.Api.IdentityServer;
+using Bit.Core.IdentityServer;
 using Bit.Core.Enums;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.WindowsAzure.Storage;

src/Core/Core.csproj

@@ -14,6 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="IdentityServer4" Version="1.3.1" />
     <PackageReference Include="Microsoft.AspNetCore.Identity" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="1.1.2" />

src/Core/IdentityServer/AllowAllCorsPolicyService.cs

@@ -1,7 +1,7 @@
 using IdentityServer4.Services;
 using System.Threading.Tasks;
 
-namespace Bit.Api.IdentityServer
+namespace Bit.Core.IdentityServer
 {
     public class AllowAllCorsPolicyService : ICorsPolicyService
     {

src/Core/IdentityServer/ApiResources.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Security.Claims;
 
-namespace Bit.Api.IdentityServer
+namespace Bit.Core.IdentityServer
 {
     public class ApiResources
     {

src/Core/IdentityServer/Clients.cs

@@ -1,7 +1,7 @@
 using IdentityServer4.Models;
 using System.Collections.Generic;
 
-namespace Bit.Api.IdentityServer
+namespace Bit.Core.IdentityServer
 {
     public class Clients
     {

src/Core/IdentityServer/PersistedGrantStore.cs

@@ -7,7 +7,7 @@ using Bit.Core.Repositories;
 using IdentityServer4.Models;
 using IdentityServer4.Stores;
 
-namespace Bit.Api.IdentityServer
+namespace Bit.Core.IdentityServer
 {
     public class PersistedGrantStore : IPersistedGrantStore
     {

src/Core/IdentityServer/ProfileService.cs

@@ -10,7 +10,7 @@ using System.Linq;
 using Microsoft.Extensions.Options;
 using System;
 
-namespace Bit.Api.IdentityServer
+namespace Bit.Core.IdentityServer
 {
     public class ProfileService : IProfileService
     {

src/Core/IdentityServer/ResourceOwnerPasswordValidator.cs

@@ -17,7 +17,7 @@ using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 
-namespace Bit.Api.IdentityServer
+namespace Bit.Core.IdentityServer
 {
     public class ResourceOwnerPasswordValidator : IResourceOwnerPasswordValidator
     {

src/Core/IdentityServer/TokenRetrieval.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Linq;
 
-namespace Bit.Api.IdentityServer
+namespace Bit.Core.IdentityServer
 {
     public static class TokenRetrieval
     {

src/Identity/Identity.csproj

@@ -9,5 +9,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="1.1.1" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\Core\Core.csproj" />
+  </ItemGroup>
 
 </Project>