lib

KSemenenko · KSemenenko · commit fe9df145bde8 · 2023-01-16T21:46:48.000+01:00
diff --git a/ManagedCode.Orleans.Identity.Client/ManagedCode.Orleans.Identity.Client.csproj b/ManagedCode.Orleans.Identity.Client/ManagedCode.Orleans.Identity.Client.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+    <PropertyGroup>
+        <TargetFramework>net7.0</TargetFramework>
+        <LangVersion>11</LangVersion>
+        <OutputType>Library</OutputType>
+        <Nullable>enable</Nullable>
+        <IsPackable>true</IsPackable>
+    </PropertyGroup>
+
+    <!--NuGet-->
+    <PropertyGroup>
+        <Title>ManagedCode.Orleans.Identity.Client</Title>
+        <PackageId>ManagedCode.Orleans.Identity.Client</PackageId>
+        <Description>Identity base on Orleans</Description>
+        <PackageTags>managedcode, orleans, identity, session</PackageTags>
+    </PropertyGroup>
+
+    <ItemGroup>
+
+        <PackageReference Include="ManagedCode.Communication" Version="2.0.13" />
+        <PackageReference Include="ManagedCode.Communication.Orleans" Version="2.0.13" />
+        
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Orleans.Client" Version="7.0.0" />
+
+    </ItemGroup>
+
+</Project>
diff --git a/ManagedCode.Orleans.Identity.Server/Extensions/AuthenticationHandlerExtensions.cs b/ManagedCode.Orleans.Identity.Server/Extensions/AuthenticationHandlerExtensions.cs
@@ -1,12 +1,12 @@
 using System;
-using ManagedCode.Orleans.Identity.Middlewares;
-using ManagedCode.Orleans.Identity.Options;
-using ManagedCode.Orleans.Identity.Shared.Constants;
+using ManagedCode.Orleans.Identity.Server.Middlewares;
+using ManagedCode.Orleans.Identity.Server.Options;
+using ManagedCode.Orleans.Identity.Server.Shared.Constants;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace ManagedCode.Orleans.Identity.Extensions;
+namespace ManagedCode.Orleans.Identity.Server.Extensions;
 
 public static class AuthenticationHandlerExtensions
 {
diff --git a/ManagedCode.Orleans.Identity.Server/Extensions/ClaimsPrincipalExtensions.cs b/ManagedCode.Orleans.Identity.Server/Extensions/ClaimsPrincipalExtensions.cs
@@ -1,8 +1,8 @@
 using System.Linq;
 using System.Security.Claims;
-using ManagedCode.Orleans.Identity.Shared.Constants;
+using ManagedCode.Orleans.Identity.Server.Shared.Constants;
 
-namespace ManagedCode.Orleans.Identity.Middlewares;
+namespace ManagedCode.Orleans.Identity.Server.Middlewares;
 
 public static class ClaimsPrincipalExtensions
 {
diff --git a/ManagedCode.Orleans.Identity.Server/Extensions/OrleansContextMiddlewareExtensions.cs b/ManagedCode.Orleans.Identity.Server/Extensions/OrleansContextMiddlewareExtensions.cs
@@ -1,7 +1,7 @@
-﻿using ManagedCode.Orleans.Identity.Middlewares;
+﻿using ManagedCode.Orleans.Identity.Server.Middlewares;
 using Microsoft.AspNetCore.Builder;
 
-namespace ManagedCode.Orleans.Identity.Extensions;
+namespace ManagedCode.Orleans.Identity.Server.Extensions;
 
 public static class OrleansContextMiddlewareExtensions
 {
diff --git a/ManagedCode.Orleans.Identity.Server/Extensions/OrleansExtensions.cs b/ManagedCode.Orleans.Identity.Server/Extensions/OrleansExtensions.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Security.Claims;
-using ManagedCode.Orleans.Identity.Shared.Constants;
+using ManagedCode.Orleans.Identity.Server.Shared.Constants;
 using Orleans;
 using Orleans.Runtime;
 
-namespace ManagedCode.Orleans.Identity.Middlewares;
+namespace ManagedCode.Orleans.Identity.Server.Middlewares;
 
 public static class OrleansExtensions
 {
diff --git a/ManagedCode.Orleans.Identity.Server/Extensions/UserDataExtensions.cs b/ManagedCode.Orleans.Identity.Server/Extensions/UserDataExtensions.cs
@@ -2,7 +2,7 @@
 using System.Data;
 using System.Security.Claims;
 
-namespace ManagedCode.Orleans.Identity.Extensions;
+namespace ManagedCode.Orleans.Identity.Server.Extensions;
 
 public static class UserDataExtensions
 {
diff --git a/ManagedCode.Orleans.Identity.Server/GrainCallFilter/GrainAuthorizationIncomingFilter.cs b/ManagedCode.Orleans.Identity.Server/GrainCallFilter/GrainAuthorizationIncomingFilter.cs
@@ -3,12 +3,12 @@
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
-using ManagedCode.Orleans.Identity.Grains.Interfaces;
-using ManagedCode.Orleans.Identity.Middlewares;
+using ManagedCode.Orleans.Identity.Server.Middlewares;
+using ManagedCode.Orleans.Identity.Server.Grains.Interfaces;
 using Microsoft.AspNetCore.Authorization;
 using Orleans;
 
-namespace ManagedCode.Orleans.Identity.GrainCallFilter;
+namespace ManagedCode.Orleans.Identity.Server.GrainCallFilter;
 
 public class GrainAuthorizationIncomingFilter : IIncomingGrainCallFilter
 {
diff --git a/ManagedCode.Orleans.Identity.Server/Grains/Interfaces/ISessionGrain.cs b/ManagedCode.Orleans.Identity.Server/Grains/Interfaces/ISessionGrain.cs
@@ -2,10 +2,10 @@
 using System.Collections.Immutable;
 using System.Threading.Tasks;
 using ManagedCode.Communication;
-using ManagedCode.Orleans.Identity.Models;
+using ManagedCode.Orleans.Identity.Server.Models;
 using Orleans;
 
-namespace ManagedCode.Orleans.Identity.Grains.Interfaces;
+namespace ManagedCode.Orleans.Identity.Server.Grains.Interfaces;
 
 public interface ISessionGrain : IGrainWithStringKey
 {
diff --git a/ManagedCode.Orleans.Identity.Server/Grains/SessionGrain.cs b/ManagedCode.Orleans.Identity.Server/Grains/SessionGrain.cs
@@ -5,15 +5,15 @@
 using System.Threading;
 using System.Threading.Tasks;
 using ManagedCode.Communication;
-using ManagedCode.Orleans.Identity.Grains.Interfaces;
-using ManagedCode.Orleans.Identity.Models;
-using ManagedCode.Orleans.Identity.Options;
-using ManagedCode.Orleans.Identity.Shared.Constants;
-using ManagedCode.Orleans.Identity.Shared.Enums;
+using ManagedCode.Orleans.Identity.Server.Grains.Interfaces;
+using ManagedCode.Orleans.Identity.Server.Models;
+using ManagedCode.Orleans.Identity.Server.Options;
+using ManagedCode.Orleans.Identity.Server.Shared.Constants;
+using ManagedCode.Orleans.Identity.Server.Shared.Enums;
 using Orleans;
 using Orleans.Runtime;
 
-namespace ManagedCode.Orleans.Identity.Grains;
+namespace ManagedCode.Orleans.Identity.Server.Grains;
 
 public class SessionGrain : Grain, ISessionGrain
 {
diff --git a/ManagedCode.Orleans.Identity.Server/ManagedCode.Orleans.Identity.Server.csproj b/ManagedCode.Orleans.Identity.Server/ManagedCode.Orleans.Identity.Server.csproj
@@ -10,8 +10,8 @@
 
     <!--NuGet-->
     <PropertyGroup>
-        <Title>ManagedCode.Orleans.Identity</Title>
-        <PackageId>ManagedCode.Orleans.Identity</PackageId>
+        <Title>ManagedCode.Orleans.Identity.Server</Title>
+        <PackageId>ManagedCode.Orleans.Identity.Server.Server</PackageId>
         <Description>Identity base on Orleans</Description>
         <PackageTags>managedcode, orleans, identity, session</PackageTags>
     </PropertyGroup>
@@ -20,12 +20,9 @@
 
         <PackageReference Include="ManagedCode.Communication" Version="2.0.13" />
         <PackageReference Include="ManagedCode.Communication.Orleans" Version="2.0.13" />
-
-        <PackageReference Include="ManagedCode.Database.Core" Version="2.0.1" />
+        
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Orleans.Runtime" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Orleans.Sdk" Version="7.0.0" />
-
+        <PackageReference Include="Microsoft.Orleans.Server" Version="7.0.0" />
     </ItemGroup>
     
 </Project>
diff --git a/ManagedCode.Orleans.Identity.Server/Middlewares/OrleansContextMiddleware.cs b/ManagedCode.Orleans.Identity.Server/Middlewares/OrleansContextMiddleware.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
-namespace ManagedCode.Orleans.Identity.Middlewares;
+namespace ManagedCode.Orleans.Identity.Server.Middlewares;
 
 public class OrleansContextMiddleware
 {
diff --git a/ManagedCode.Orleans.Identity.Server/Middlewares/OrleansIdentityAuthenticationHandler.cs b/ManagedCode.Orleans.Identity.Server/Middlewares/OrleansIdentityAuthenticationHandler.cs
@@ -2,15 +2,15 @@
 using System.Security.Claims;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using ManagedCode.Orleans.Identity.Extensions;
-using ManagedCode.Orleans.Identity.Grains.Interfaces;
-using ManagedCode.Orleans.Identity.Shared.Constants;
+using ManagedCode.Orleans.Identity.Server.Extensions;
+using ManagedCode.Orleans.Identity.Server.Grains.Interfaces;
+using ManagedCode.Orleans.Identity.Server.Shared.Constants;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Orleans;
 
-namespace ManagedCode.Orleans.Identity.Middlewares;
+namespace ManagedCode.Orleans.Identity.Server.Middlewares;
 
 public class OrleansIdentityAuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions>
 {
diff --git a/ManagedCode.Orleans.Identity.Server/Models/CreateSessionModel.cs b/ManagedCode.Orleans.Identity.Server/Models/CreateSessionModel.cs
@@ -2,7 +2,7 @@
 using Orleans;
 using Orleans.Runtime;
 
-namespace ManagedCode.Orleans.Identity.Models;
+namespace ManagedCode.Orleans.Identity.Server.Models;
 
 [GenerateSerializer]
 public class CreateSessionModel
diff --git a/ManagedCode.Orleans.Identity.Server/Models/SessionModel.cs b/ManagedCode.Orleans.Identity.Server/Models/SessionModel.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using ManagedCode.Orleans.Identity.Shared.Enums;
+using ManagedCode.Orleans.Identity.Server.Shared.Enums;
 using Orleans;
 using Orleans.Runtime;
 
-namespace ManagedCode.Orleans.Identity.Models;
+namespace ManagedCode.Orleans.Identity.Server.Models;
 
 [GenerateSerializer]
 public class SessionModel
diff --git a/ManagedCode.Orleans.Identity.Server/Options/SessionOption.cs b/ManagedCode.Orleans.Identity.Server/Options/SessionOption.cs
@@ -1,4 +1,4 @@
-﻿namespace ManagedCode.Orleans.Identity.Options;
+﻿namespace ManagedCode.Orleans.Identity.Server.Options;
 
 public class SessionOption
 {
diff --git a/ManagedCode.Orleans.Identity.Server/Properties/AssemblyInfo.cs b/ManagedCode.Orleans.Identity.Server/Properties/AssemblyInfo.cs
diff --git a/ManagedCode.Orleans.Identity.Server/Serializations/ClaimSurrogate.cs b/ManagedCode.Orleans.Identity.Server/Serializations/ClaimSurrogate.cs
@@ -1,7 +1,7 @@
 using System.Security.Claims;
 using Orleans;
 
-namespace ManagedCode.Orleans.Identity.Serializations;
+namespace ManagedCode.Orleans.Identity.Server.Serializations;
 
 // This is the surrogate which will act as a stand-in for the foreign type.
 // Surrogates should use plain fields instead of properties for better perfomance.
diff --git a/ManagedCode.Orleans.Identity.Server/Serializations/ClaimSurrogateConverter.cs b/ManagedCode.Orleans.Identity.Server/Serializations/ClaimSurrogateConverter.cs
@@ -1,7 +1,7 @@
 using System.Security.Claims;
 using Orleans;
 
-namespace ManagedCode.Orleans.Identity.Serializations;
+namespace ManagedCode.Orleans.Identity.Server.Serializations;
 
 [RegisterConverter]
 public sealed class ClaimSurrogateConverter : IConverter<Claim, ClaimSurrogate>
diff --git a/ManagedCode.Orleans.Identity.Server/Serializations/ClaimsIdentitySurrogate.cs b/ManagedCode.Orleans.Identity.Server/Serializations/ClaimsIdentitySurrogate.cs
@@ -2,7 +2,7 @@
 using System.Security.Claims;
 using Orleans;
 
-namespace ManagedCode.Orleans.Identity.Serializations;
+namespace ManagedCode.Orleans.Identity.Server.Serializations;
 
 // This is the surrogate which will act as a stand-in for the foreign type.
 // Surrogates should use plain fields instead of properties for better perfomance.
diff --git a/ManagedCode.Orleans.Identity.Server/Serializations/ClaimsIdentitySurrogateConverter.cs b/ManagedCode.Orleans.Identity.Server/Serializations/ClaimsIdentitySurrogateConverter.cs
@@ -2,7 +2,7 @@
 using System.Security.Claims;
 using Orleans;
 
-namespace ManagedCode.Orleans.Identity.Serializations;
+namespace ManagedCode.Orleans.Identity.Server.Serializations;
 
 [RegisterConverter]
 public sealed class ClaimsIdentitySurrogateConverter : IConverter<ClaimsIdentity, ClaimsIdentitySurrogate>
diff --git a/ManagedCode.Orleans.Identity.Server/Shared/Constants/OrleansIdentityConstants.cs b/ManagedCode.Orleans.Identity.Server/Shared/Constants/OrleansIdentityConstants.cs
@@ -1,4 +1,4 @@
-﻿namespace ManagedCode.Orleans.Identity.Shared.Constants;
+﻿namespace ManagedCode.Orleans.Identity.Server.Shared.Constants;
 
 public static class OrleansIdentityConstants
 {
diff --git a/ManagedCode.Orleans.Identity.Server/Shared/Enums/ResultStatus.cs b/ManagedCode.Orleans.Identity.Server/Shared/Enums/ResultStatus.cs
@@ -1,7 +1,7 @@
 ﻿using System.Text.Json.Serialization;
 using Newtonsoft.Json.Converters;
 
-namespace ManagedCode.Orleans.Identity.Shared.Enums;
+namespace ManagedCode.Orleans.Identity.Server.Shared.Enums;
 
 [JsonConverter(typeof(StringEnumConverter))]
 public enum ResultStatus
diff --git a/ManagedCode.Orleans.Identity.Server/Shared/Enums/SessionStatus.cs b/ManagedCode.Orleans.Identity.Server/Shared/Enums/SessionStatus.cs
@@ -1,6 +1,6 @@
 ﻿using System.Text.Json.Serialization;
 
-namespace ManagedCode.Orleans.Identity.Shared.Enums;
+namespace ManagedCode.Orleans.Identity.Server.Shared.Enums;
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
 public enum SessionStatus
diff --git a/ManagedCode.Orleans.Identity.Tests/Cluster/Grains/PublicGrain.cs b/ManagedCode.Orleans.Identity.Tests/Cluster/Grains/PublicGrain.cs
@@ -1,5 +1,5 @@
-using ManagedCode.Orleans.Identity.Tests.Cluster.Grains.Interfaces;
-using ManagedCode.Orleans.Identity.Tests.Constants;
+using ManagedCode.Orleans.Identity.Server.Tests.Cluster.Grains.Interfaces;
+using ManagedCode.Orleans.Identity.Server.Tests.Constants;
 using Microsoft.AspNetCore.Authorization;
 
 namespace ManagedCode.Orleans.Identity.Tests.Cluster.Grains;
diff --git a/ManagedCode.Orleans.Identity.Tests/Cluster/Grains/UserGrain.cs b/ManagedCode.Orleans.Identity.Tests/Cluster/Grains/UserGrain.cs
@@ -1,5 +1,5 @@
-using ManagedCode.Orleans.Identity.Tests.Cluster.Grains.Interfaces;
-using ManagedCode.Orleans.Identity.Tests.Constants;
+using ManagedCode.Orleans.Identity.Server.Tests.Cluster.Grains.Interfaces;
+using ManagedCode.Orleans.Identity.Server.Tests.Constants;
 using Microsoft.AspNetCore.Authorization;
 
 namespace ManagedCode.Orleans.Identity.Tests.Cluster.Grains;
diff --git a/ManagedCode.Orleans.Identity.Tests/Cluster/TestSiloConfigurations.cs b/ManagedCode.Orleans.Identity.Tests/Cluster/TestSiloConfigurations.cs
@@ -1,5 +1,5 @@
-using ManagedCode.Orleans.Identity.GrainCallFilter;
-using ManagedCode.Orleans.Identity.Shared.Constants;
+using ManagedCode.Orleans.Identity.Server.GrainCallFilter;
+using ManagedCode.Orleans.Identity.Server.Shared.Constants;
 using Microsoft.Extensions.DependencyInjection;
 using Orleans.Serialization;
 using Orleans.TestingHost;
diff --git a/ManagedCode.Orleans.Identity.Tests/Cluster/TestSiloOptions.cs b/ManagedCode.Orleans.Identity.Tests/Cluster/TestSiloOptions.cs
@@ -1,4 +1,4 @@
-using ManagedCode.Orleans.Identity.Options;
+using ManagedCode.Orleans.Identity.Server.Options;
 
 namespace ManagedCode.Orleans.Identity.Tests.Cluster;
 
diff --git a/ManagedCode.Orleans.Identity.Tests/ControllerTests.cs b/ManagedCode.Orleans.Identity.Tests/ControllerTests.cs
@@ -1,12 +1,12 @@
 using System.Net;
 using System.Security.Claims;
 using FluentAssertions;
-using ManagedCode.Orleans.Identity.Grains.Interfaces;
-using ManagedCode.Orleans.Identity.Models;
-using ManagedCode.Orleans.Identity.Shared.Constants;
-using ManagedCode.Orleans.Identity.Tests.Cluster;
-using ManagedCode.Orleans.Identity.Tests.Constants;
-using ManagedCode.Orleans.Identity.Tests.Helpers;
+using ManagedCode.Orleans.Identity.Server.Grains.Interfaces;
+using ManagedCode.Orleans.Identity.Server.Models;
+using ManagedCode.Orleans.Identity.Server.Shared.Constants;
+using ManagedCode.Orleans.Identity.Server.Tests.Cluster;
+using ManagedCode.Orleans.Identity.Server.Tests.Constants;
+using ManagedCode.Orleans.Identity.Server.Tests.Helpers;
 using Orleans.Runtime;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/ManagedCode.Orleans.Identity.Tests/GrainFilterTests.cs b/ManagedCode.Orleans.Identity.Tests/GrainFilterTests.cs
@@ -1,12 +1,12 @@
 using System.Net;
 using System.Security.Claims;
 using FluentAssertions;
-using ManagedCode.Orleans.Identity.Grains.Interfaces;
-using ManagedCode.Orleans.Identity.Models;
-using ManagedCode.Orleans.Identity.Shared.Constants;
-using ManagedCode.Orleans.Identity.Tests.Cluster;
-using ManagedCode.Orleans.Identity.Tests.Constants;
-using ManagedCode.Orleans.Identity.Tests.Helpers;
+using ManagedCode.Orleans.Identity.Server.Grains.Interfaces;
+using ManagedCode.Orleans.Identity.Server.Models;
+using ManagedCode.Orleans.Identity.Server.Shared.Constants;
+using ManagedCode.Orleans.Identity.Server.Tests.Cluster;
+using ManagedCode.Orleans.Identity.Server.Tests.Constants;
+using ManagedCode.Orleans.Identity.Server.Tests.Helpers;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/ManagedCode.Orleans.Identity.Tests/Helpers/SessionHelper.cs b/ManagedCode.Orleans.Identity.Tests/Helpers/SessionHelper.cs
@@ -1,5 +1,5 @@
 ﻿using System.Security.Claims;
-using ManagedCode.Orleans.Identity.Models;
+using ManagedCode.Orleans.Identity.Server.Models;
 using Orleans.Runtime;
 
 namespace ManagedCode.Orleans.Identity.Tests.Helpers;
diff --git a/ManagedCode.Orleans.Identity.Tests/ManagedCode.Orleans.Identity.Tests.csproj b/ManagedCode.Orleans.Identity.Tests/ManagedCode.Orleans.Identity.Tests.csproj
@@ -50,7 +50,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\ManagedCode.Orleans.Identity\ManagedCode.Orleans.Identity.csproj" />
+        <ProjectReference Include="..\ManagedCode.Orleans.Identity.Client\ManagedCode.Orleans.Identity.Client.csproj" />
+        <ProjectReference Include="..\ManagedCode.Orleans.Identity.Server\ManagedCode.Orleans.Identity.Server.csproj" />
     </ItemGroup>
 
 
diff --git a/ManagedCode.Orleans.Identity.Tests/SessionGrainTests.cs b/ManagedCode.Orleans.Identity.Tests/SessionGrainTests.cs
@@ -1,10 +1,10 @@
 ﻿using System.Security.Claims;
 using FluentAssertions;
-using ManagedCode.Orleans.Identity.Grains.Interfaces;
-using ManagedCode.Orleans.Identity.Models;
-using ManagedCode.Orleans.Identity.Shared.Enums;
-using ManagedCode.Orleans.Identity.Tests.Cluster;
-using ManagedCode.Orleans.Identity.Tests.Helpers;
+using ManagedCode.Orleans.Identity.Server.Grains.Interfaces;
+using ManagedCode.Orleans.Identity.Server.Models;
+using ManagedCode.Orleans.Identity.Server.Shared.Enums;
+using ManagedCode.Orleans.Identity.Server.Tests.Cluster;
+using ManagedCode.Orleans.Identity.Server.Tests.Helpers;
 using Orleans.Runtime;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/ManagedCode.Orleans.Identity.Tests/SomeTest.cs b/ManagedCode.Orleans.Identity.Tests/SomeTest.cs
@@ -1,7 +1,7 @@
 using System.Net;
 using FluentAssertions;
-using ManagedCode.Orleans.Identity.Grains.Interfaces;
-using ManagedCode.Orleans.Identity.Tests.Cluster;
+using ManagedCode.Orleans.Identity.Server.Grains.Interfaces;
+using ManagedCode.Orleans.Identity.Server.Tests.Cluster;
 using Microsoft.AspNetCore.SignalR.Client;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/ManagedCode.Orleans.Identity.Tests/TestApp/Controllers/PublicController.cs b/ManagedCode.Orleans.Identity.Tests/TestApp/Controllers/PublicController.cs
diff --git a/ManagedCode.Orleans.Identity.Tests/TestApp/Controllers/TestController.cs b/ManagedCode.Orleans.Identity.Tests/TestApp/Controllers/TestController.cs
diff --git a/ManagedCode.Orleans.Identity.Tests/TestApp/Controllers/UserController.cs b/ManagedCode.Orleans.Identity.Tests/TestApp/Controllers/UserController.cs
diff --git a/ManagedCode.Orleans.Identity.Tests/TestApp/HttpHostProgram.cs b/ManagedCode.Orleans.Identity.Tests/TestApp/HttpHostProgram.cs
diff --git a/ManagedCode.Orleans.Identity.sln b/ManagedCode.Orleans.Identity.sln

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using System.Linq;`
`2`	`2`	`using System.Security.Claims;`
`3`		`-using ManagedCode.Orleans.Identity.Shared.Constants;`
	`3`	`+using ManagedCode.Orleans.Identity.Server.Shared.Constants;`
`4`	`4`
`5`		`-namespace ManagedCode.Orleans.Identity.Middlewares;`
	`5`	`+namespace ManagedCode.Orleans.Identity.Server.Middlewares;`
`6`	`6`
`7`	`7`	`public static class ClaimsPrincipalExtensions`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using ManagedCode.Orleans.Identity.Middlewares;`
	`1`	`+using ManagedCode.Orleans.Identity.Server.Middlewares;`
`2`	`2`	`using Microsoft.AspNetCore.Builder;`
`3`	`3`
`4`		`-namespace ManagedCode.Orleans.Identity.Extensions;`
	`4`	`+namespace ManagedCode.Orleans.Identity.Server.Extensions;`
`5`	`5`
`6`	`6`	`public static class OrleansContextMiddlewareExtensions`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Data;`
`3`	`3`	`using System.Security.Claims;`
`4`	`4`
`5`		`-namespace ManagedCode.Orleans.Identity.Extensions;`
	`5`	`+namespace ManagedCode.Orleans.Identity.Server.Extensions;`
`6`	`6`
`7`	`7`	`public static class UserDataExtensions`
`8`	`8`	`{`