Move idenityserver implementations into API project

src/Api/IdentityServer/ApiResources.cs

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

src/Api/IdentityServer/Clients.cs

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

src/Api/IdentityServer/PersistedGrantStore.cs

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

src/Api/IdentityServer/ProfileService.cs

@@ -4,7 +4,7 @@ using IdentityServer4.Models;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 
-namespace Bit.Core.Identity
+namespace Bit.Api.IdentityServer
 {
     public class ProfileService : IProfileService
     {

src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs

@@ -1,5 +1,6 @@
 using Bit.Core.Domains;
 using Bit.Core.Enums;
+using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 using IdentityServer4.Models;
 using IdentityServer4.Validation;
@@ -10,7 +11,7 @@ using System;
 using System.Security.Claims;
 using System.Threading.Tasks;
 
-namespace Bit.Core.Identity
+namespace Bit.Api.IdentityServer
 {
     public class ResourceOwnerPasswordValidator : IResourceOwnerPasswordValidator
     {
@@ -66,7 +67,8 @@ namespace Bit.Core.Identity
             }
 
             context.Result = new GrantValidationResult(TokenRequestErrors.InvalidGrant,
-               twoFactorRequest ? "Code is not correct. Try again." : "Username or password is incorrect. Try again.");
+               twoFactorRequest ? "Code is not correct. Try again." : "Username or password is incorrect. Try again.",
+               new System.Collections.Generic.Dictionary<string, object> { { "Error", true } });
         }
 
         private async Task<bool> TwoFactorRequiredAsync(User user)

src/Api/IdentityServer/TokenRetrieval.cs

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

src/Api/Startup.cs

@@ -29,6 +29,7 @@ using IdentityServer4.Stores;
 using Bit.Core.Utilities;
 using Serilog;
 using Serilog.Events;
+using Bit.Api.IdentityServer;
 
 namespace Bit.Api
 {

src/Api/project.json

@@ -22,7 +22,9 @@
     "Microsoft.ApplicationInsights.AspNetCore": "1.0.2",
     "AspNetCoreRateLimit": "1.0.5",
     "Serilog.Extensions.Logging": "1.3.1",
-    "Serilog.Sinks.AzureDocumentDb": "3.5.17"
+    "Serilog.Sinks.AzureDocumentDb": "3.5.17",
+    "IdentityServer4": "1.0.1",
+    "IdentityServer4.AccessTokenValidation": "1.0.2"
   },
 
   "tools": {

src/Core/project.json

@@ -8,8 +8,6 @@
     "Sendgrid": "6.3.4",
     "PushSharp": "4.0.10",
     "WindowsAzure.Storage": "8.0.0",
-    "IdentityServer4": "1.0.1",
-    "IdentityServer4.AccessTokenValidation": "1.0.2",
     "Otp.NET": "1.0.0"
   },