nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 15:42:48 -05:00
Code Activity

[Provider] Setup provider (#1378)

Browse Source
This commit is contained in:
Oscar Hinton
2021-06-30 09:35:26 +02:00
committed by GitHub
parent 08f508f536
commit 43f7271147
85 changed files with 1810 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Admin/Admin.csproj
View File

@ -9,6 +9,14 @@
<ProjectReference Include="..\Core\Core.csproj" />
</ItemGroup>
<Choose>
<When Condition="!$(DefineConstants.Contains('OSS'))">
<ItemGroup>
<ProjectReference Include="..\..\bitwarden_license\src\CommCore\CommCore.csproj" />
</ItemGroup>
</When>
</Choose>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.3" />
</ItemGroup>

4
src/Admin/Controllers/ProvidersController.cs
View File

@ -85,7 +85,7 @@ namespace Bit.Admin.Controllers
return RedirectToAction("Index");
}
var users = await _providerUserRepository.GetManyByProviderAsync(id);
var users = await _providerUserRepository.GetManyDetailsByProviderAsync(id);
return View(new ProviderViewModel(provider, users));
}
@ -98,7 +98,7 @@ namespace Bit.Admin.Controllers
return RedirectToAction("Index");
}
var users = await _providerUserRepository.GetManyByProviderAsync(id);
var users = await _providerUserRepository.GetManyDetailsByProviderAsync(id);
return View(new ProviderEditModel(provider, users));
}

3
src/Admin/Models/ProviderEditModel.cs
View File

@ -1,13 +1,14 @@
using System.Collections.Generic;
using System.Linq;
using Bit.Core.Enums.Provider;
using Bit.Core.Models.Data;
using Bit.Core.Models.Table.Provider;
namespace Bit.Admin.Models
{
public class ProviderEditModel : ProviderViewModel
{
public ProviderEditModel(Provider provider, IEnumerable<ProviderUser> providerUsers)
public ProviderEditModel(Provider provider, IEnumerable<ProviderUserUserDetails> providerUsers)
: base(provider, providerUsers)
{
Name = provider.Name;

3
src/Admin/Models/ProviderViewModel.cs
View File

@ -1,13 +1,14 @@
using System.Collections.Generic;
using System.Linq;
using Bit.Core.Enums.Provider;
using Bit.Core.Models.Data;
using Bit.Core.Models.Table.Provider;
namespace Bit.Admin.Models
{
public class ProviderViewModel
{
public ProviderViewModel(Provider provider, IEnumerable<ProviderUser> providerUsers)
public ProviderViewModel(Provider provider, IEnumerable<ProviderUserUserDetails> providerUsers)
{
Provider = provider;
UserCount = providerUsers.Count();

10
src/Admin/Startup.cs
View File

@ -13,6 +13,10 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Stripe;
#if !OSS
using Bit.CommCore.Utilities;
#endif
namespace Bit.Admin
{
public class Startup
@ -65,6 +69,12 @@ namespace Bit.Admin
// Services
services.AddBaseServices();
services.AddDefaultServices(globalSettings);
#if OSS
services.AddOosServices();
#else
services.AddCommCoreServices();
#endif
// Mvc
services.AddMvc(config =>