nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-20 10:58:07 -05:00
Code

Cleanup

Browse Source
This commit is contained in:
Bernd Schoolmann 2025-06-05 15:33:29 +02:00
parent 39698a47a3
commit e7129315c7
No known key found for this signature in database
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Api/Billing/Controllers/AccountsController.cs
View File

@ -59,9 +59,9 @@ public class AccountsController(
var userTwoFactorEnabled = await twoFactorIsEnabledQuery.TwoFactorIsEnabledAsync(user); var userTwoFactorEnabled = await twoFactorIsEnabledQuery.TwoFactorIsEnabledAsync(user);
var userHasPremiumFromOrganization = await userService.HasPremiumFromOrganization(user); var userHasPremiumFromOrganization = await userService.HasPremiumFromOrganization(user);
var organizationIdsClaimingActiveUser = await GetOrganizationIdsClaimingUserAsync(user.Id); var organizationIdsClaimingActiveUser = await GetOrganizationIdsClaimingUserAsync(user.Id);
var userAccountKeysData = new PrivateKeysResponseModel(await userAccountKeysQuery.Run(user)); var accountKeys = new PrivateKeysResponseModel(await userAccountKeysQuery.Run(user));
var profile = new ProfileResponseModel(user, userAccountKeysData, null, null, null, userTwoFactorEnabled, var profile = new ProfileResponseModel(user, accountKeys, null, null, null, userTwoFactorEnabled,
userHasPremiumFromOrganization, organizationIdsClaimingActiveUser); userHasPremiumFromOrganization, organizationIdsClaimingActiveUser);
return new PaymentResponseModel return new PaymentResponseModel
{ {

3
src/Api/Vault/Controllers/SyncController.cs
View File

@ -124,8 +124,9 @@ public class SyncController : Controller
PublicKeyEncryptionKeyPairData = user.GetPublicKeyEncryptionKeyPair(), PublicKeyEncryptionKeyPairData = user.GetPublicKeyEncryptionKeyPair(),
SignatureKeyPairData = signingKeys, SignatureKeyPairData = signingKeys,
}; };
var accountKeys = new PrivateKeysResponseModel(userAccountKeysData);
var response = new SyncResponseModel(_globalSettings, user, new PrivateKeysResponseModel(userAccountKeysData), userTwoFactorEnabled, userHasPremiumFromOrganization, organizationAbilities, var response = new SyncResponseModel(_globalSettings, user, accountKeys, userTwoFactorEnabled, userHasPremiumFromOrganization, organizationAbilities,
organizationIdsClaimingActiveUser, organizationUserDetails, providerUserDetails, providerUserOrganizationDetails, organizationIdsClaimingActiveUser, organizationUserDetails, providerUserDetails, providerUserOrganizationDetails,
folders, collections, ciphers, collectionCiphersGroupDict, excludeDomains, policies, sends); folders, collections, ciphers, collectionCiphersGroupDict, excludeDomains, policies, sends);
return response; return response;