mirror of
https://github.com/bitwarden/server.git
synced 2025-07-03 17:12:49 -05:00
[PM-1188] Server owner auth migration (#2825)
* [PM-1188] add sso project to auth * [PM-1188] move sso api models to auth * [PM-1188] fix sso api model namespace & imports * [PM-1188] move core files to auth * [PM-1188] fix core sso namespace & models * [PM-1188] move sso repository files to auth * [PM-1188] fix sso repo files namespace & imports * [PM-1188] move sso sql files to auth folder * [PM-1188] move sso test files to auth folders * [PM-1188] fix sso tests namespace & imports * [PM-1188] move auth api files to auth folder * [PM-1188] fix auth api files namespace & imports * [PM-1188] move auth core files to auth folder * [PM-1188] fix auth core files namespace & imports * [PM-1188] move auth email templates to auth folder * [PM-1188] move auth email folder back into shared directory * [PM-1188] fix auth email names * [PM-1188] move auth core models to auth folder * [PM-1188] fix auth model namespace & imports * [PM-1188] add entire Identity project to auth codeowners * [PM-1188] fix auth orm files namespace & imports * [PM-1188] move auth orm files to auth folder * [PM-1188] move auth sql files to auth folder * [PM-1188] move auth tests to auth folder * [PM-1188] fix auth test files namespace & imports * [PM-1188] move emergency access api files to auth folder * [PM-1188] fix emergencyaccess api files namespace & imports * [PM-1188] move emergency access core files to auth folder * [PM-1188] fix emergency access core files namespace & imports * [PM-1188] move emergency access orm files to auth folder * [PM-1188] fix emergency access orm files namespace & imports * [PM-1188] move emergency access sql files to auth folder * [PM-1188] move emergencyaccess test files to auth folder * [PM-1188] fix emergency access test files namespace & imports * [PM-1188] move captcha files to auth folder * [PM-1188] fix captcha files namespace & imports * [PM-1188] move auth admin files into auth folder * [PM-1188] fix admin auth files namespace & imports - configure mvc to look in auth folders for views * [PM-1188] remove extra imports and formatting * [PM-1188] fix ef auth model imports * [PM-1188] fix DatabaseContextModelSnapshot paths * [PM-1188] fix grant import in ef * [PM-1188] update sqlproj * [PM-1188] move missed sqlproj files * [PM-1188] move auth ef models out of auth folder * [PM-1188] fix auth ef models namespace * [PM-1188] remove auth ef models unused imports * [PM-1188] fix imports for auth ef models * [PM-1188] fix more ef model imports * [PM-1188] fix file encodings
This commit is contained in:
Jake Fink
@ -1,35 +0,0 @@
|
||||
using AutoMapper;
|
||||
using Bit.Core.Repositories;
|
||||
using Bit.Infrastructure.EntityFramework.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
namespace Bit.Infrastructure.EntityFramework.Repositories;
|
||||
|
||||
public class AuthRequestRepository : Repository<Core.Entities.AuthRequest, AuthRequest, Guid>, IAuthRequestRepository
|
||||
{
|
||||
public AuthRequestRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper)
|
||||
: base(serviceScopeFactory, mapper, (DatabaseContext context) => context.AuthRequests)
|
||||
{ }
|
||||
public async Task<int> DeleteExpiredAsync()
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var expiredRequests = await dbContext.AuthRequests.Where(a => a.CreationDate < DateTime.Now.AddMinutes(-15)).ToListAsync();
|
||||
dbContext.AuthRequests.RemoveRange(expiredRequests);
|
||||
await dbContext.SaveChangesAsync();
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<ICollection<Core.Entities.AuthRequest>> GetManyByUserIdAsync(Guid userId)
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var userAuthRequests = await dbContext.AuthRequests.Where(a => a.UserId.Equals(userId)).ToListAsync();
|
||||
return Mapper.Map<List<Core.Entities.AuthRequest>>(userAuthRequests);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
using Bit.Core.Enums;
|
||||
using Bit.Core.Auth.Enums;
|
||||
using Bit.Core.Enums;
|
||||
using Bit.Core.Enums.Provider;
|
||||
using Bit.Infrastructure.EntityFramework.Repositories.Queries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
@ -1,118 +0,0 @@
|
||||
using AutoMapper;
|
||||
using Bit.Core.Enums;
|
||||
using Bit.Core.Models.Data;
|
||||
using Bit.Core.Repositories;
|
||||
using Bit.Infrastructure.EntityFramework.Models;
|
||||
using Bit.Infrastructure.EntityFramework.Repositories.Queries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
namespace Bit.Infrastructure.EntityFramework.Repositories;
|
||||
|
||||
public class EmergencyAccessRepository : Repository<Core.Entities.EmergencyAccess, EmergencyAccess, Guid>, IEmergencyAccessRepository
|
||||
{
|
||||
public EmergencyAccessRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper)
|
||||
: base(serviceScopeFactory, mapper, (DatabaseContext context) => context.EmergencyAccesses)
|
||||
{ }
|
||||
|
||||
public async Task<int> GetCountByGrantorIdEmailAsync(Guid grantorId, string email, bool onlyRegisteredUsers)
|
||||
{
|
||||
var query = new EmergencyAccessReadCountByGrantorIdEmailQuery(grantorId, email, onlyRegisteredUsers);
|
||||
return await GetCountFromQuery(query);
|
||||
}
|
||||
|
||||
public override async Task DeleteAsync(Core.Entities.EmergencyAccess emergencyAccess)
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
await dbContext.UserBumpAccountRevisionDateByEmergencyAccessGranteeIdAsync(emergencyAccess.Id);
|
||||
await dbContext.SaveChangesAsync();
|
||||
}
|
||||
await base.DeleteAsync(emergencyAccess);
|
||||
}
|
||||
|
||||
public async Task<EmergencyAccessDetails> GetDetailsByIdGrantorIdAsync(Guid id, Guid grantorId)
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var view = new EmergencyAccessDetailsViewQuery();
|
||||
var query = view.Run(dbContext).Where(ea =>
|
||||
ea.Id == id &&
|
||||
ea.GrantorId == grantorId
|
||||
);
|
||||
return await query.FirstOrDefaultAsync();
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<ICollection<EmergencyAccessDetails>> GetExpiredRecoveriesAsync()
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var view = new EmergencyAccessDetailsViewQuery();
|
||||
var query = view.Run(dbContext).Where(ea =>
|
||||
ea.Status == EmergencyAccessStatusType.RecoveryInitiated
|
||||
);
|
||||
return await query.ToListAsync();
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<ICollection<EmergencyAccessDetails>> GetManyDetailsByGranteeIdAsync(Guid granteeId)
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var view = new EmergencyAccessDetailsViewQuery();
|
||||
var query = view.Run(dbContext).Where(ea =>
|
||||
ea.GranteeId == granteeId
|
||||
);
|
||||
return await query.ToListAsync();
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<ICollection<EmergencyAccessDetails>> GetManyDetailsByGrantorIdAsync(Guid grantorId)
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var view = new EmergencyAccessDetailsViewQuery();
|
||||
var query = view.Run(dbContext).Where(ea =>
|
||||
ea.GrantorId == grantorId
|
||||
);
|
||||
return await query.ToListAsync();
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<ICollection<EmergencyAccessNotify>> GetManyToNotifyAsync()
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var view = new EmergencyAccessDetailsViewQuery();
|
||||
var query = view.Run(dbContext).Where(ea =>
|
||||
ea.Status == EmergencyAccessStatusType.RecoveryInitiated
|
||||
);
|
||||
var notifies = await query.Select(ea => new EmergencyAccessNotify
|
||||
{
|
||||
Id = ea.Id,
|
||||
GrantorId = ea.GrantorId,
|
||||
GranteeId = ea.GranteeId,
|
||||
Email = ea.Email,
|
||||
KeyEncrypted = ea.KeyEncrypted,
|
||||
Type = ea.Type,
|
||||
Status = ea.Status,
|
||||
WaitTimeDays = ea.WaitTimeDays,
|
||||
RecoveryInitiatedDate = ea.RecoveryInitiatedDate,
|
||||
LastNotificationDate = ea.LastNotificationDate,
|
||||
CreationDate = ea.CreationDate,
|
||||
RevisionDate = ea.RevisionDate,
|
||||
GranteeName = ea.GranteeName,
|
||||
GranteeEmail = ea.GranteeEmail,
|
||||
GrantorEmail = ea.GrantorEmail,
|
||||
}).ToListAsync();
|
||||
return notifies;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,94 +0,0 @@
|
||||
using AutoMapper;
|
||||
using Bit.Core.Repositories;
|
||||
using Bit.Infrastructure.EntityFramework.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
namespace Bit.Infrastructure.EntityFramework.Repositories;
|
||||
|
||||
public class GrantRepository : BaseEntityFrameworkRepository, IGrantRepository
|
||||
{
|
||||
public GrantRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper)
|
||||
: base(serviceScopeFactory, mapper)
|
||||
{ }
|
||||
|
||||
public async Task DeleteByKeyAsync(string key)
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var query = from g in dbContext.Grants
|
||||
where g.Key == key
|
||||
select g;
|
||||
dbContext.Remove(query);
|
||||
await dbContext.SaveChangesAsync();
|
||||
}
|
||||
}
|
||||
|
||||
public async Task DeleteManyAsync(string subjectId, string sessionId, string clientId, string type)
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var query = from g in dbContext.Grants
|
||||
where g.SubjectId == subjectId &&
|
||||
g.ClientId == clientId &&
|
||||
g.SessionId == sessionId &&
|
||||
g.Type == type
|
||||
select g;
|
||||
dbContext.Remove(query);
|
||||
await dbContext.SaveChangesAsync();
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<Core.Entities.Grant> GetByKeyAsync(string key)
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var query = from g in dbContext.Grants
|
||||
where g.Key == key
|
||||
select g;
|
||||
var grant = await query.FirstOrDefaultAsync();
|
||||
return grant;
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<ICollection<Core.Entities.Grant>> GetManyAsync(string subjectId, string sessionId, string clientId, string type)
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var query = from g in dbContext.Grants
|
||||
where g.SubjectId == subjectId &&
|
||||
g.ClientId == clientId &&
|
||||
g.SessionId == sessionId &&
|
||||
g.Type == type
|
||||
select g;
|
||||
var grants = await query.ToListAsync();
|
||||
return (ICollection<Core.Entities.Grant>)grants;
|
||||
}
|
||||
}
|
||||
|
||||
public async Task SaveAsync(Core.Entities.Grant obj)
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var existingGrant = await (from g in dbContext.Grants
|
||||
where g.Key == obj.Key
|
||||
select g).FirstOrDefaultAsync();
|
||||
if (existingGrant != null)
|
||||
{
|
||||
dbContext.Entry(existingGrant).CurrentValues.SetValues(obj);
|
||||
}
|
||||
else
|
||||
{
|
||||
var entity = Mapper.Map<Grant>(obj);
|
||||
await dbContext.AddAsync(entity);
|
||||
await dbContext.SaveChangesAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
using Bit.Core.Models.Data;
|
||||
|
||||
namespace Bit.Infrastructure.EntityFramework.Repositories.Queries;
|
||||
|
||||
public class EmergencyAccessDetailsViewQuery : IQuery<EmergencyAccessDetails>
|
||||
{
|
||||
public IQueryable<EmergencyAccessDetails> Run(DatabaseContext dbContext)
|
||||
{
|
||||
var query = from ea in dbContext.EmergencyAccesses
|
||||
join grantee in dbContext.Users
|
||||
on ea.GranteeId equals grantee.Id into grantee_g
|
||||
from grantee in grantee_g.DefaultIfEmpty()
|
||||
join grantor in dbContext.Users
|
||||
on ea.GrantorId equals grantor.Id into grantor_g
|
||||
from grantor in grantor_g.DefaultIfEmpty()
|
||||
select new { ea, grantee, grantor };
|
||||
return query.Select(x => new EmergencyAccessDetails
|
||||
{
|
||||
Id = x.ea.Id,
|
||||
GrantorId = x.ea.GrantorId,
|
||||
GranteeId = x.ea.GranteeId,
|
||||
Email = x.ea.Email,
|
||||
KeyEncrypted = x.ea.KeyEncrypted,
|
||||
Type = x.ea.Type,
|
||||
Status = x.ea.Status,
|
||||
WaitTimeDays = x.ea.WaitTimeDays,
|
||||
RecoveryInitiatedDate = x.ea.RecoveryInitiatedDate,
|
||||
LastNotificationDate = x.ea.LastNotificationDate,
|
||||
CreationDate = x.ea.CreationDate,
|
||||
RevisionDate = x.ea.RevisionDate,
|
||||
GranteeName = x.grantee.Name,
|
||||
GranteeEmail = x.grantee.Email ?? x.ea.Email,
|
||||
GrantorName = x.grantor.Name,
|
||||
GrantorEmail = x.grantor.Email,
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -1,30 +0,0 @@
|
||||
using Bit.Infrastructure.EntityFramework.Models;
|
||||
|
||||
namespace Bit.Infrastructure.EntityFramework.Repositories.Queries;
|
||||
|
||||
public class EmergencyAccessReadCountByGrantorIdEmailQuery : IQuery<EmergencyAccess>
|
||||
{
|
||||
private readonly Guid _grantorId;
|
||||
private readonly string _email;
|
||||
private readonly bool _onlyRegisteredUsers;
|
||||
|
||||
public EmergencyAccessReadCountByGrantorIdEmailQuery(Guid grantorId, string email, bool onlyRegisteredUsers)
|
||||
{
|
||||
_grantorId = grantorId;
|
||||
_email = email;
|
||||
_onlyRegisteredUsers = onlyRegisteredUsers;
|
||||
}
|
||||
|
||||
public IQueryable<EmergencyAccess> Run(DatabaseContext dbContext)
|
||||
{
|
||||
var query = from ea in dbContext.EmergencyAccesses
|
||||
join u in dbContext.Users
|
||||
on ea.GranteeId equals u.Id into u_g
|
||||
from u in u_g.DefaultIfEmpty()
|
||||
where ea.GrantorId == _grantorId &&
|
||||
((!_onlyRegisteredUsers && (ea.Email == _email || u.Email == _email))
|
||||
|| (_onlyRegisteredUsers && u.Email == _email))
|
||||
select ea;
|
||||
return query;
|
||||
}
|
||||
}
|
||||
@ -1,45 +0,0 @@
|
||||
using AutoMapper;
|
||||
using Bit.Core.Repositories;
|
||||
using Bit.Infrastructure.EntityFramework.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
namespace Bit.Infrastructure.EntityFramework.Repositories;
|
||||
|
||||
public class SsoConfigRepository : Repository<Core.Entities.SsoConfig, SsoConfig, long>, ISsoConfigRepository
|
||||
{
|
||||
public SsoConfigRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper)
|
||||
: base(serviceScopeFactory, mapper, (DatabaseContext context) => context.SsoConfigs)
|
||||
{ }
|
||||
|
||||
public async Task<Core.Entities.SsoConfig> GetByOrganizationIdAsync(Guid organizationId)
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var ssoConfig = await GetDbSet(dbContext).SingleOrDefaultAsync(sc => sc.OrganizationId == organizationId);
|
||||
return Mapper.Map<Core.Entities.SsoConfig>(ssoConfig);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<Core.Entities.SsoConfig> GetByIdentifierAsync(string identifier)
|
||||
{
|
||||
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var ssoConfig = await GetDbSet(dbContext).SingleOrDefaultAsync(sc => sc.Organization.Identifier == identifier);
|
||||
return Mapper.Map<Core.Entities.SsoConfig>(ssoConfig);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<ICollection<Core.Entities.SsoConfig>> GetManyByRevisionNotBeforeDate(DateTime? notBefore)
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var ssoConfigs = await GetDbSet(dbContext).Where(sc => sc.Enabled && sc.RevisionDate >= notBefore).ToListAsync();
|
||||
return Mapper.Map<List<Core.Entities.SsoConfig>>(ssoConfigs);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
using AutoMapper;
|
||||
using Bit.Core.Repositories;
|
||||
using Bit.Infrastructure.EntityFramework.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
namespace Bit.Infrastructure.EntityFramework.Repositories;
|
||||
|
||||
public class SsoUserRepository : Repository<Core.Entities.SsoUser, SsoUser, long>, ISsoUserRepository
|
||||
{
|
||||
public SsoUserRepository(IServiceScopeFactory serviceScopeFactory, IMapper mapper)
|
||||
: base(serviceScopeFactory, mapper, (DatabaseContext context) => context.SsoUsers)
|
||||
{ }
|
||||
|
||||
public async Task DeleteAsync(Guid userId, Guid? organizationId)
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var entity = await GetDbSet(dbContext).SingleOrDefaultAsync(su => su.UserId == userId && su.OrganizationId == organizationId);
|
||||
dbContext.Entry(entity).State = EntityState.Deleted;
|
||||
await dbContext.SaveChangesAsync();
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<Core.Entities.SsoUser> GetByUserIdOrganizationIdAsync(Guid organizationId, Guid userId)
|
||||
{
|
||||
using (var scope = ServiceScopeFactory.CreateScope())
|
||||
{
|
||||
var dbContext = GetDatabaseContext(scope);
|
||||
var entity = await GetDbSet(dbContext)
|
||||
.FirstOrDefaultAsync(e => e.OrganizationId == organizationId && e.UserId == userId);
|
||||
return entity;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user