Allow client_id param in get devices querystring (#11)

castle · Mar 19, 2019 · 9eb6bff · 9eb6bff
1 parent cdd3c84
commit 9eb6bff
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -10,4 +10,4 @@ test_script:
   - ps: nuget install OpenCover -OutputDirectory packages -Version 4.7.922
   - ps: dotnet tool install coveralls.net --tool-path tools
   - ps: .\packages\OpenCover.4.7.922\tools\OpenCover.Console.exe -register:user -target:dotnet.exe -targetargs:"test Tests\Tests.csproj" -filter:"+[Castle.Sdk*]*" -oldStyle -output:opencoverCoverage.xml
-  - ps: .\tools\csmacnz.coveralls.exe --opencover -i opencoverCoverage.xml --repoToken $env:COVERALLS_REPO_TOKEN --commitId $env:APPVEYOR_REPO_COMMIT --commitBranch $env:APPVEYOR_REPO_BRANCH --commitAuthor $env:APPVEYOR_REPO_COMMIT_AUTHOR --commitEmail $env:APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL --commitMessage $env:APPVEYOR_REPO_COMMIT_MESSAGE --jobId $env:APPVEYOR_JOB_ID
+  - ps: .\tools\csmacnz.coveralls.exe --opencover --useRelativePaths --basePath "src" -i opencoverCoverage.xml --repoToken $env:COVERALLS_REPO_TOKEN --commitId $env:APPVEYOR_REPO_COMMIT --commitBranch $env:APPVEYOR_REPO_BRANCH --commitAuthor $env:APPVEYOR_REPO_COMMIT_AUTHOR --commitEmail $env:APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL --commitMessage $env:APPVEYOR_REPO_COMMIT_MESSAGE --jobId $env:APPVEYOR_JOB_ID
diff --git a/src/Castle.Sdk/CastleClient.cs b/src/Castle.Sdk/CastleClient.cs
@@ -70,9 +70,10 @@ public async Task Track(ActionRequest request)
             await SendTrackRequest(jsonRequest);
         }
 
-        public async Task<DeviceList> GetDevicesForUser(string userId)
+        public async Task<DeviceList> GetDevicesForUser(string userId, string clientId = null)
         {
-            return await TryRequest(() => _messageSender.Get<DeviceList>($"/v1/users/{userId}/devices"));
+            var clientIdQuery = string.IsNullOrEmpty(clientId) ? "" : $"?client_id={clientId}";
+            return await TryRequest(() => _messageSender.Get<DeviceList>($"/v1/users/{userId}/devices{clientIdQuery}"));
         }
 
         public async Task<Device> GetDevice(string deviceToken)

diff --git a/src/Castle.Sdk/Messages/Responses/DeviceItem.cs b/src/Castle.Sdk/Messages/Responses/DeviceItem.cs
@@ -19,5 +19,7 @@ public class DeviceItem
         public DateTime? MitigatedAt { get; set; }
 
         public DeviceContext Context { get; set; }
+
+        public bool IsCurrentDevice { get; set; }
     }
 }
diff --git a/src/pack_to_local_folder.ps1 b/src/pack_to_local_folder.ps1
@@ -10,5 +10,5 @@ if (Test-Path $packagePath) {
 }
 
 dotnet pack (Join-Path $PSScriptRoot "Castle.Sdk")
-nuget add (Join-Path $PSScriptRoot Castle.Sdk\bin\Debug\Castle.Sdk.1.0.0.nupkg) -source $packages
+nuget add (Join-Path $PSScriptRoot Castle.Sdk\bin\Debug\Castle.Sdk.1.0.1.nupkg) -source $packages
 dotnet nuget locals all --clear