Skip to content

Commit ca116c7

Browse files
Remove code around sso/details
1 parent 93604aa commit ca116c7

7 files changed

Lines changed: 4 additions & 122 deletions

File tree

src/Api/AdminConsole/Controllers/OrganizationDomainController.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,6 @@ public async Task PostRemoveDomain(Guid orgId, Guid id)
125125
await RemoveDomain(orgId, id);
126126
}
127127

128-
[AllowAnonymous]
129-
[HttpPost("domain/sso/details")] // must be post to accept email cleanly
130-
public async Task<OrganizationDomainSsoDetailsResponseModel> GetOrgDomainSsoDetails(
131-
[FromBody] OrganizationDomainSsoDetailsRequestModel model)
132-
{
133-
var ssoResult = await _organizationDomainRepository.GetOrganizationDomainSsoDetailsAsync(model.Email);
134-
if (ssoResult is null)
135-
{
136-
throw new NotFoundException("Claimed org domain not found");
137-
}
138-
139-
return new OrganizationDomainSsoDetailsResponseModel(ssoResult);
140-
}
141-
142128
[AllowAnonymous]
143129
[HttpPost("domain/sso/verified")]
144130
public async Task<VerifiedOrganizationDomainSsoDetailsResponseModel> GetVerifiedOrgDomainSsoDetailsAsync(

src/Api/AdminConsole/Models/Response/Organizations/OrganizationDomainSsoDetailsResponseModel.cs

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/Core/Models/Data/Organizations/OrganizationDomainSsoDetailsData.cs

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/Core/Repositories/IOrganizationDomainRepository.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ public interface IOrganizationDomainRepository : IRepository<OrganizationDomain,
1010
Task<ICollection<OrganizationDomain>> GetClaimedDomainsByDomainNameAsync(string domainName);
1111
Task<ICollection<OrganizationDomain>> GetDomainsByOrganizationIdAsync(Guid orgId);
1212
Task<ICollection<OrganizationDomain>> GetManyByNextRunDateAsync(DateTime date);
13-
Task<OrganizationDomainSsoDetailsData?> GetOrganizationDomainSsoDetailsAsync(string email);
1413
Task<IEnumerable<VerifiedOrganizationDomainSsoDetail>> GetVerifiedOrganizationDomainSsoDetailsAsync(string email);
1514
Task<IEnumerable<OrganizationDomain>> GetVerifiedDomainsByOrganizationIdsAsync(IEnumerable<Guid> organizationIds);
1615
Task<OrganizationDomain?> GetDomainByIdOrganizationIdAsync(Guid id, Guid organizationId);

src/Infrastructure.Dapper/Repositories/OrganizationDomainRepository.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,6 @@ public async Task<ICollection<OrganizationDomain>> GetManyByNextRunDateAsync(Dat
7171
return results.ToList();
7272
}
7373

74-
public async Task<OrganizationDomainSsoDetailsData?> GetOrganizationDomainSsoDetailsAsync(string email)
75-
{
76-
using (var connection = new SqlConnection(ConnectionString))
77-
{
78-
var results = await connection
79-
.QueryAsync<OrganizationDomainSsoDetailsData>(
80-
$"[{Schema}].[OrganizationDomainSsoDetails_ReadByEmail]",
81-
new { Email = email },
82-
commandType: CommandType.StoredProcedure);
83-
84-
return results.SingleOrDefault();
85-
}
86-
}
87-
8874
public async Task<IEnumerable<VerifiedOrganizationDomainSsoDetail>> GetVerifiedOrganizationDomainSsoDetailsAsync(string email)
8975
{
9076
await using var connection = new SqlConnection(ConnectionString);

src/Infrastructure.EntityFramework/Repositories/OrganizationDomainRepository.cs

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -59,32 +59,6 @@ public OrganizationDomainRepository(IServiceScopeFactory serviceScopeFactory, IM
5959
return Mapper.Map<List<Core.Entities.OrganizationDomain>>(pastDomains);
6060
}
6161

62-
public async Task<OrganizationDomainSsoDetailsData?> GetOrganizationDomainSsoDetailsAsync(string email)
63-
{
64-
var domainName = new MailAddress(email).Host;
65-
66-
using var scope = ServiceScopeFactory.CreateScope();
67-
var dbContext = GetDatabaseContext(scope);
68-
var ssoDetails = await (from o in dbContext.Organizations
69-
from od in o.Domains
70-
join s in dbContext.SsoConfigs on o.Id equals s.OrganizationId into sJoin
71-
from s in sJoin.DefaultIfEmpty()
72-
where od.DomainName == domainName && o.Enabled
73-
select new OrganizationDomainSsoDetailsData
74-
{
75-
OrganizationId = o.Id,
76-
OrganizationName = o.Name,
77-
SsoAvailable = o.SsoConfigs.Any(sc => sc.Enabled),
78-
OrganizationIdentifier = o.Identifier,
79-
VerifiedDate = od.VerifiedDate,
80-
DomainName = od.DomainName
81-
})
82-
.AsNoTracking()
83-
.SingleOrDefaultAsync();
84-
85-
return ssoDetails;
86-
}
87-
8862
public async Task<IEnumerable<VerifiedOrganizationDomainSsoDetail>> GetVerifiedOrganizationDomainSsoDetailsAsync(string email)
8963
{
9064
var domainName = new MailAddress(email).Host;

test/Api.Test/AdminConsole/Controllers/OrganizationDomainControllerTests.cs

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -294,37 +294,15 @@ await sutProvider.GetDependency<IDeleteOrganizationDomainCommand>().Received(1)
294294
}
295295

296296
[Theory, BitAutoData]
297-
public async Task GetOrgDomainSsoDetails_ShouldThrowNotFound_WhenEmailHasNotClaimedDomain(
298-
OrganizationDomainSsoDetailsRequestModel model, SutProvider<OrganizationDomainController> sutProvider)
299-
{
300-
sutProvider.GetDependency<IOrganizationDomainRepository>()
301-
.GetOrganizationDomainSsoDetailsAsync(model.Email).ReturnsNull();
302-
303-
var requestAction = async () => await sutProvider.Sut.GetOrgDomainSsoDetails(model);
304-
305-
await Assert.ThrowsAsync<NotFoundException>(requestAction);
306-
}
307-
308-
[Theory, BitAutoData]
309-
public async Task GetOrgDomainSsoDetails_ShouldReturnOrganizationDomainSsoDetails_WhenEmailHasClaimedDomain(
310-
OrganizationDomainSsoDetailsRequestModel model, OrganizationDomainSsoDetailsData ssoDetailsData, SutProvider<OrganizationDomainController> sutProvider)
311-
{
312-
sutProvider.GetDependency<IOrganizationDomainRepository>()
313-
.GetOrganizationDomainSsoDetailsAsync(model.Email).Returns(ssoDetailsData);
314-
315-
var result = await sutProvider.Sut.GetOrgDomainSsoDetails(model);
316-
317-
Assert.IsType<OrganizationDomainSsoDetailsResponseModel>(result);
318-
}
319-
320-
[Theory, BitAutoData]
321-
public async Task GetVerifiedOrgDomainSsoDetails_ShouldThrowNotFound_WhenEmailHasNotClaimedDomain(
297+
public async Task GetVerifiedOrgDomainSsoDetails_ShouldReturnEmptyList_WhenEmailHasNoVerifiedDomain(
322298
OrganizationDomainSsoDetailsRequestModel model, SutProvider<OrganizationDomainController> sutProvider)
323299
{
324300
sutProvider.GetDependency<IOrganizationDomainRepository>()
325301
.GetVerifiedOrganizationDomainSsoDetailsAsync(model.Email).Returns(Array.Empty<VerifiedOrganizationDomainSsoDetail>());
326302

327-
await Assert.ThrowsAsync<NotFoundException>(() => sutProvider.Sut.GetOrgDomainSsoDetails(model));
303+
var result = await sutProvider.Sut.GetVerifiedOrgDomainSsoDetailsAsync(model);
304+
305+
Assert.IsType<VerifiedOrganizationDomainSsoDetailsResponseModel>(result);
328306
}
329307

330308
[Theory, BitAutoData]

0 commit comments

Comments
 (0)