Skip to content

[SG-823] Set push token on login #2189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
trmartin4 wants to merge 2 commits into from
Closed

[SG-823] Set push token on login #2189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b53c0c
Added code to update PushToken that is used on login.
trmartin4 Nov 13, 2022
3e9d378
Removed check for OS type before setting current push token on state.
trmartin4 Nov 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/App/Services/PushNotificationListenerService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,8 @@ await _apiService.Value.PutDeviceTokenAsync(appId,
Debug.WriteLine($"{TAG} Registered device with server.");

await _stateService.Value.SetPushLastRegistrationDateAsync(DateTime.UtcNow);
if (deviceType == Device.Android)
{
await _stateService.Value.SetPushCurrentTokenAsync(token);
}

await _stateService.Value.SetPushCurrentTokenAsync(token);
}
#if DEBUG
catch (ApiException apiEx)
Expand Down
3 changes: 2 additions & 1 deletion src/Core/Models/Request/DeviceRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ namespace Bit.Core.Models.Request
{
public class DeviceRequest
{
public DeviceRequest(string appId, IPlatformUtilsService platformUtilsService)
public DeviceRequest(string appId, string pushToken, IPlatformUtilsService platformUtilsService)
{
Type = platformUtilsService.GetDevice();
Name = platformUtilsService.GetDeviceString();
PushToken = pushToken;
Identifier = appId;
}

Expand Down
3 changes: 2 additions & 1 deletion src/Core/Services/AuthService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,8 @@ private async Task<AuthResult> LogInHelperAsync(string email, string hashedPassw
{
var storedTwoFactorToken = await _tokenService.GetTwoFactorTokenAsync(email);
var appId = await _appIdService.GetAppIdAsync();
var deviceRequest = new DeviceRequest(appId, _platformUtilsService);
var pushToken = await _stateService.GetPushCurrentTokenAsync();
var deviceRequest = new DeviceRequest(appId, pushToken, _platformUtilsService);

string[] emailPassword;
string[] codeCodeVerifier;
Expand Down