nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-02 16:42:50 -05:00
Code Activity

More CanAccessPremium checks

Browse Source
This commit is contained in:
Kyle Spearrin
2018-08-28 17:40:08 -04:00
parent c41a1e0936
commit cf73b168ee
16 changed files with 90 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Api/Controllers/AccountsController.cs
View File

@ -282,7 +282,8 @@ namespace Bit.Api.Controllers
var organizationUserDetails = await _organizationUserRepository.GetManyDetailsByUserAsync(user.Id,
OrganizationUserStatusType.Confirmed);
var response = new ProfileResponseModel(user, organizationUserDetails);
var response = new ProfileResponseModel(user, organizationUserDetails,
await user.TwoFactorIsEnabledAsync(_userService));
return response;
}
@ -307,7 +308,7 @@ namespace Bit.Api.Controllers
}
await _userService.SaveUserAsync(model.ToUser(user));
var response = new ProfileResponseModel(user, null);
var response = new ProfileResponseModel(user, null, await user.TwoFactorIsEnabledAsync(_userService));
return response;
}
@ -437,7 +438,7 @@ namespace Bit.Api.Controllers
await _userService.SignUpPremiumAsync(user, model.PaymentToken,
model.AdditionalStorageGb.GetValueOrDefault(0), license);
return new ProfileResponseModel(user, null);
return new ProfileResponseModel(user, null, await user.TwoFactorIsEnabledAsync(_userService));
}
[HttpGet("billing")]

5
src/Api/Controllers/SyncController.cs
View File

@ -69,8 +69,9 @@ namespace Bit.Api.Controllers
collectionCiphersGroupDict = collectionCiphers.GroupBy(c => c.CipherId).ToDictionary(s => s.Key);
}
var response = new SyncResponseModel(_globalSettings, user, organizationUserDetails, folders,
collections, ciphers, collectionCiphersGroupDict, excludeDomains);
var userTwoFactorEnabled = await user.TwoFactorIsEnabledAsync(_userService);
var response = new SyncResponseModel(_globalSettings, user, userTwoFactorEnabled, organizationUserDetails,
folders, collections, ciphers, collectionCiphersGroupDict, excludeDomains);
return response;
}
}