mirror of
https://github.com/bitwarden/server.git
synced 2025-12-10 15:55:10 -06:00
Refactor HasPremiumAccessQuery to throw NotFoundException for null users
This commit is contained in:
parent
b8ff0ea2c0
commit
415a0b93c4
@ -1,4 +1,5 @@
|
|||||||
using Bit.Core.Repositories;
|
using Bit.Core.Exceptions;
|
||||||
|
using Bit.Core.Repositories;
|
||||||
|
|
||||||
namespace Bit.Core.Billing.Premium.Queries;
|
namespace Bit.Core.Billing.Premium.Queries;
|
||||||
|
|
||||||
@ -18,7 +19,11 @@ public class HasPremiumAccessQuery : IHasPremiumAccessQuery
|
|||||||
public async Task<bool> HasPremiumAccessAsync(Guid userId)
|
public async Task<bool> HasPremiumAccessAsync(Guid userId)
|
||||||
{
|
{
|
||||||
var user = await _userRepository.GetCalculatedPremiumAsync(userId);
|
var user = await _userRepository.GetCalculatedPremiumAsync(userId);
|
||||||
return user?.HasPremiumAccess ?? false;
|
if (user == null)
|
||||||
|
{
|
||||||
|
throw new NotFoundException();
|
||||||
|
}
|
||||||
|
return user.HasPremiumAccess;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<Dictionary<Guid, bool>> HasPremiumAccessAsync(IEnumerable<Guid> userIds)
|
public async Task<Dictionary<Guid, bool>> HasPremiumAccessAsync(IEnumerable<Guid> userIds)
|
||||||
@ -32,7 +37,7 @@ public class HasPremiumAccessQuery : IHasPremiumAccessQuery
|
|||||||
var user = await _userRepository.GetCalculatedPremiumAsync(userId);
|
var user = await _userRepository.GetCalculatedPremiumAsync(userId);
|
||||||
if (user == null)
|
if (user == null)
|
||||||
{
|
{
|
||||||
return false;
|
throw new NotFoundException();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Has org premium if has premium access but not personal premium
|
// Has org premium if has premium access but not personal premium
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user