Merge 37f0ea6 into b799fc4

castle · Mar 27, 2019 · 3f0ff7a · 3f0ff7a
2 parents b799fc4 + 37f0ea6
commit 3f0ff7a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/Castle.Sdk/CastleClient.cs b/src/Castle.Sdk/CastleClient.cs
@@ -101,6 +101,11 @@ public async Task ImpersonateEnd(ImpersonateEndRequest request)
             await TryRequest(() => _messageSender.Delete<VoidResponse>("/v1/impersonate", request));
         }
 
+        public async Task ArchiveDevices(string userId)
+        {
+            await TryRequest(() => _messageSender.Put<VoidResponse>($"/v1/users/{userId}/archive_devices"));
+        }
+
         private async Task<T> TryRequest<T>(Func<Task<T>> request)
             where T : new()
         {

diff --git a/src/Castle.Sdk/Context.cs b/src/Castle.Sdk/Context.cs
@@ -55,7 +55,7 @@ public static RequestContext FromHttpRequest(Microsoft.AspNetCore.Http.HttpReque
             {
                 ClientId = GetClientIdForCore(request.Headers, request.Cookies),
                 Headers = request.Headers.ToDictionary(x => x.Key, y => y.Value.FirstOrDefault()),
-                Ip = GetIpForCore(request.Headers, ipHeaders, () => request.HttpContext.Connection.RemoteIpAddress.ToString())
+                Ip = GetIpForCore(request.Headers, ipHeaders, () => request.HttpContext.Connection.RemoteIpAddress?.ToString())
             };
         }
 

diff --git a/src/Tests/When_calling_client.cs b/src/Tests/When_calling_client.cs
@@ -61,5 +61,12 @@ public void Should_end_impersonation(ImpersonateEndRequest request, CastleClient
             Func<Task> act = async () => await sut.ImpersonateEnd(request);
             act.Should().NotThrow();
         }
+
+        [Theory, AutoFakeData(typeof(CastleConfigurationNoTrackCustomization))]
+        public void Should_archive_devices(string userId, CastleClient sut)
+        {
+            Func<Task> act = async () => await sut.ArchiveDevices(userId);
+            act.Should().NotThrow();
+        }
     }
 }