nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-13 00:58:13 -05:00
Code

device registration on auth bearer migration

Browse Source
This commit is contained in:
Kyle Spearrin 2017-01-25 23:03:07 -05:00
parent f2d58a3678
commit 5f573355dc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Api/IdentityServer/ResourceOwnerPasswordValidator.cs
View File

@ -63,7 +63,7 @@ namespace Bit.Api.IdentityServer
if(user != null && user.SecurityStamp == securityTokenClaim.Value)
{
var device = await SaveDeviceAsync(user, context);
BuildSuccessResult(user, context, null);
BuildSuccessResult(user, context, device);
return;
}
}
@ -177,10 +177,10 @@ namespace Bit.Api.IdentityServer
private Device GetDeviceFromRequest(ResourceOwnerPasswordValidationContext context)
{
var deviceIdentifier = context.Request.Raw["deviceIdentifier"]?.ToString();
var deviceType = context.Request.Raw["deviceType"]?.ToString();
var deviceName = context.Request.Raw["deviceName"]?.ToString();
var devicePushToken = context.Request.Raw["devicePushToken"]?.ToString();
var deviceIdentifier = context.Request.Raw["DeviceIdentifier"]?.ToString();
var deviceType = context.Request.Raw["DeviceType"]?.ToString();
var deviceName = context.Request.Raw["DeviceName"]?.ToString();
var devicePushToken = context.Request.Raw["DevicePushToken"]?.ToString();
DeviceType type;
if(string.IsNullOrWhiteSpace(deviceIdentifier) || string.IsNullOrWhiteSpace(deviceType) ||
@ -194,7 +194,7 @@ namespace Bit.Api.IdentityServer
Identifier = deviceIdentifier,
Name = deviceName,
Type = type,
PushToken = devicePushToken
PushToken = string.IsNullOrWhiteSpace(devicePushToken) ? null : devicePushToken
};
}