nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 13:08:17 -05:00
Code

Created sso config service with save (#936)

Browse Source
This commit is contained in:
Kyle Spearrin 2020-09-15 10:17:44 -04:00 committed by GitHub
parent 692b3970af
commit 1c6c599b8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bitwarden_license/src/Portal/Controllers/SsoController.cs
View File

@ -12,17 +12,20 @@ namespace Bit.Portal.Controllers
public class SsoController : Controller
{
private readonly ISsoConfigRepository _ssoConfigRepository;
private readonly ISsoConfigService _ssoConfigService;
private readonly EnterprisePortalCurrentContext _enterprisePortalCurrentContext;
private readonly II18nService _i18nService;
private readonly GlobalSettings _globalSettings;
public SsoController(
ISsoConfigRepository ssoConfigRepository,
ISsoConfigService ssoConfigService,
EnterprisePortalCurrentContext enterprisePortalCurrentContext,
II18nService i18nService,
GlobalSettings globalSettings)
{
_ssoConfigRepository = ssoConfigRepository;
_ssoConfigService = ssoConfigService;
_enterprisePortalCurrentContext = enterprisePortalCurrentContext;
_i18nService = i18nService;
_globalSettings = globalSettings;
@ -74,16 +77,14 @@ namespace Bit.Portal.Controllers
var ssoConfig = await _ssoConfigRepository.GetByOrganizationIdAsync(orgId.Value);
if (ssoConfig == null)
{
ssoConfig = model.ToSsoConfig();
ssoConfig.OrganizationId = orgId.GetValueOrDefault();
await _ssoConfigRepository.CreateAsync(ssoConfig);
ssoConfig = model.ToSsoConfig(orgId.GetValueOrDefault());
}
else
{
ssoConfig = model.ToSsoConfig(ssoConfig);
await _ssoConfigRepository.ReplaceAsync(ssoConfig);
}
await _ssoConfigService.SaveAsync(ssoConfig);
return View(model);
}
}

4
bitwarden_license/src/Portal/Models/SsoConfigEditViewModel.cs
View File

@ -55,9 +55,9 @@ namespace Bit.Portal.Models
public List<SelectListItem> SigningBehaviors { get; set; }
public List<SelectListItem> SigningAlgorithms { get; set; }
public SsoConfig ToSsoConfig()
public SsoConfig ToSsoConfig(Guid organizationId)
{
return ToSsoConfig(new SsoConfig());
return ToSsoConfig(new SsoConfig { OrganizationId = organizationId });
}
public SsoConfig ToSsoConfig(SsoConfig existingConfig)

12
src/Core/Repositories/SqlServer/SsoConfigRepository.cs
View File

@ -57,17 +57,5 @@ namespace Bit.Core.Repositories.SqlServer
return results.ToList();
}
}
public override async Task CreateAsync(SsoConfig obj)
{
obj.CreationDate = obj.RevisionDate = DateTime.UtcNow;
await base.CreateAsync(obj);
}
public override async Task ReplaceAsync(SsoConfig obj)
{
obj.RevisionDate = DateTime.UtcNow;
await base.ReplaceAsync(obj);
}
}
}

10
src/Core/Services/ISsoConfigService.cs Normal file
View File

@ -0,0 +1,10 @@
using System.Threading.Tasks;
using Bit.Core.Models.Table;
namespace Bit.Core.Services
{
public interface ISsoConfigService
{
Task SaveAsync(SsoConfig config);
}
}

29
src/Core/Services/Implementations/SsoConfigService.cs Normal file
View File

@ -0,0 +1,29 @@
using System;
using System.Threading.Tasks;
using Bit.Core.Models.Table;
using Bit.Core.Repositories;
namespace Bit.Core.Services
{
public class SsoConfigService : ISsoConfigService
{
private readonly ISsoConfigRepository _ssoConfigRepository;
public SsoConfigService(
ISsoConfigRepository ssoConfigRepository)
{
_ssoConfigRepository = ssoConfigRepository;
}
public async Task SaveAsync(SsoConfig config)
{
var now = DateTime.UtcNow;
config.RevisionDate = now;
if (config.Id == default)
{
config.CreationDate = now;
}
await _ssoConfigRepository.UpsertAsync(config);
}
}
}

1
src/Core/Utilities/ServiceCollectionExtensions.cs
View File

@ -112,6 +112,7 @@ namespace Bit.Core.Utilities
services.AddScoped<Services.IEventService, EventService>();
services.AddSingleton<IDeviceService, DeviceService>();
services.AddSingleton<IAppleIapService, AppleIapService>();
services.AddSingleton<ISsoConfigService, SsoConfigService>();
}
public static void AddDefaultServices(this IServiceCollection services, GlobalSettings globalSettings)