1
0
mirror of https://github.com/bitwarden/server.git synced 2025-02-26 03:31:34 +01:00

[AC-1895] AC Team code ownership moves: Bitwarden Portal (#3528)

---------

Co-authored-by: Addison Beck <hello@addisonbeck.com>
This commit is contained in:
Thomas Rittson 2024-02-21 09:18:09 +10:00 committed by GitHub
parent 3a6b2d85d3
commit 0abd52b5be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
34 changed files with 52 additions and 38 deletions

View File

@ -1,5 +1,5 @@
using Bit.Admin.Enums;
using Bit.Admin.Models;
using Bit.Admin.AdminConsole.Models;
using Bit.Admin.Enums;
using Bit.Admin.Services;
using Bit.Admin.Utilities;
using Bit.Core.AdminConsole.Entities;
@ -23,7 +23,7 @@ using Bit.Core.Vault.Repositories;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Admin.Controllers;
namespace Bit.Admin.AdminConsole.Controllers;
[Authorize]
public class OrganizationsController : Controller
@ -38,7 +38,6 @@ public class OrganizationsController : Controller
private readonly IGroupRepository _groupRepository;
private readonly IPolicyRepository _policyRepository;
private readonly IPaymentService _paymentService;
private readonly ILicensingService _licensingService;
private readonly IApplicationCacheService _applicationCacheService;
private readonly GlobalSettings _globalSettings;
private readonly IReferenceEventService _referenceEventService;
@ -65,7 +64,6 @@ public class OrganizationsController : Controller
IGroupRepository groupRepository,
IPolicyRepository policyRepository,
IPaymentService paymentService,
ILicensingService licensingService,
IApplicationCacheService applicationCacheService,
GlobalSettings globalSettings,
IReferenceEventService referenceEventService,
@ -91,7 +89,6 @@ public class OrganizationsController : Controller
_groupRepository = groupRepository;
_policyRepository = policyRepository;
_paymentService = paymentService;
_licensingService = licensingService;
_applicationCacheService = applicationCacheService;
_globalSettings = globalSettings;
_referenceEventService = referenceEventService;

View File

@ -8,7 +8,7 @@ using Bit.Core.Utilities;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Admin.Controllers;
namespace Bit.Admin.AdminConsole.Controllers;
[Authorize]
[SelfHosted(NotSelfHostedOnly = true)]

View File

@ -1,5 +1,5 @@
using Bit.Admin.Enums;
using Bit.Admin.Models;
using Bit.Admin.AdminConsole.Models;
using Bit.Admin.Enums;
using Bit.Admin.Utilities;
using Bit.Core;
using Bit.Core.AdminConsole.Entities.Provider;
@ -15,7 +15,7 @@ using Bit.Core.Utilities;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace Bit.Admin.Controllers;
namespace Bit.Admin.AdminConsole.Controllers;
[Authorize]
[SelfHosted(NotSelfHostedOnly = true)]

View File

@ -3,7 +3,7 @@ using Bit.Core.AdminConsole.Entities.Provider;
using Bit.Core.AdminConsole.Enums.Provider;
using Bit.SharedWeb.Utilities;
namespace Bit.Admin.Models;
namespace Bit.Admin.AdminConsole.Models;
public class CreateProviderModel : IValidatableObject
{

View File

@ -11,7 +11,7 @@ using Bit.Core.Utilities;
using Bit.Core.Vault.Entities;
using Bit.SharedWeb.Utilities;
namespace Bit.Admin.Models;
namespace Bit.Admin.AdminConsole.Models;
public class OrganizationEditModel : OrganizationViewModel
{

View File

@ -1,6 +1,6 @@
using Bit.Core.AdminConsole.Entities;
namespace Bit.Admin.Models;
namespace Bit.Admin.AdminConsole.Models;
public class OrganizationSelectableViewModel : Organization
{

View File

@ -1,6 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Bit.Admin.Models;
namespace Bit.Admin.Models;
namespace Bit.Admin.AdminConsole.Models;
public class OrganizationUnassignedToProviderSearchViewModel : PagedModel<OrganizationSelectableViewModel>
{

View File

@ -5,7 +5,7 @@ using Bit.Core.Enums;
using Bit.Core.Models.Data.Organizations.OrganizationUsers;
using Bit.Core.Vault.Entities;
namespace Bit.Admin.Models;
namespace Bit.Admin.AdminConsole.Models;
public class OrganizationViewModel
{

View File

@ -1,6 +1,7 @@
using Bit.Core.AdminConsole.Entities;
using Bit.Admin.Models;
using Bit.Core.AdminConsole.Entities;
namespace Bit.Admin.Models;
namespace Bit.Admin.AdminConsole.Models;
public class OrganizationsModel : PagedModel<Organization>
{

View File

@ -2,7 +2,7 @@
using Bit.Core.AdminConsole.Entities.Provider;
using Bit.Core.AdminConsole.Models.Data.Provider;
namespace Bit.Admin.Models;
namespace Bit.Admin.AdminConsole.Models;
public class ProviderEditModel : ProviderViewModel
{

View File

@ -2,7 +2,7 @@
using Bit.Core.AdminConsole.Enums.Provider;
using Bit.Core.AdminConsole.Models.Data.Provider;
namespace Bit.Admin.Models;
namespace Bit.Admin.AdminConsole.Models;
public class ProviderViewModel
{

View File

@ -1,6 +1,7 @@
using Bit.Core.AdminConsole.Entities.Provider;
using Bit.Admin.Models;
using Bit.Core.AdminConsole.Entities.Provider;
namespace Bit.Admin.Models;
namespace Bit.Admin.AdminConsole.Models;
public class ProvidersModel : PagedModel<Provider>
{

View File

@ -1,3 +1,4 @@
@using Bit.Core.Enums
@model OrganizationViewModel
<h2>Connections</h2>
<div class="row">

View File

@ -1,4 +1,6 @@
@using Bit.Admin.Enums;
@using Bit.Admin.Models
@using Bit.Core.Enums
@inject Bit.Admin.Services.IAccessControlService AccessControlService
@model OrganizationEditModel
@{
@ -12,7 +14,7 @@
}
@section Scripts {
@await Html.PartialAsync("_OrganizationFormScripts")
@await Html.PartialAsync("~/AdminConsole/Views/Shared/_OrganizationFormScripts.cshtml")
<script>
(() => {
@ -77,7 +79,7 @@
new BillingInformationModel { BillingInfo = Model.BillingInfo, OrganizationId = Model.Organization.Id, Entity = "Organization" })
}
@await Html.PartialAsync("_OrganizationForm", Model)
@await Html.PartialAsync("~/AdminConsole/Views/Shared/_OrganizationForm.cshtml", Model)
<div class="d-flex mt-4">
<button type="submit" class="btn btn-primary" form="edit-form">Save</button>

View File

@ -1,5 +1,4 @@
@using Bit.SharedWeb.Utilities
@using Microsoft.AspNetCore.Mvc.TagHelpers
@model OrganizationUnassignedToProviderSearchViewModel
@{

View File

@ -4,7 +4,7 @@
}
@section Scripts {
@await Html.PartialAsync("_OrganizationFormScripts")
@await Html.PartialAsync("~/AdminConsole/Views/Shared/_OrganizationFormScripts.cshtml")
<script>
(() => {
@ -15,7 +15,7 @@
<h1>New Client Organization</h1>
@await Html.PartialAsync("_OrganizationForm", Model)
@await Html.PartialAsync("~/AdminConsole/Views/Shared/_OrganizationForm.cshtml", Model)
<div class="d-flex mt-4">
<button type="submit" class="btn btn-primary" form="edit-form">Save</button>
<div class="ml-auto d-flex">

View File

@ -1,6 +1,7 @@
@using Bit.Core.AdminConsole.Enums.Provider
@using Microsoft.AspNetCore.Mvc.TagHelpers
@using Bit.Admin.Enums
@using Bit.Core.Enums
@inject Bit.Admin.Services.IAccessControlService AccessControlService
@model ProviderViewModel

View File

@ -1,6 +1,7 @@
@using Bit.SharedWeb.Utilities
@using Bit.Admin.Enums;
@using Bit.Core.Enums
@using Bit.Core.AdminConsole.Enums.Provider
@using Bit.SharedWeb.Utilities
@inject Bit.Admin.Services.IAccessControlService AccessControlService;
@model OrganizationEditModel

View File

@ -1,5 +1,6 @@
@inject IWebHostEnvironment HostingEnvironment
@using Bit.Admin.Utilities
@using Bit.Core.Enums
@model OrganizationEditModel
<script>

View File

@ -0,0 +1,5 @@
@using Microsoft.AspNetCore.Identity
@using Bit.Admin.AdminConsole
@using Bit.Admin.AdminConsole.Models
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper "*, Admin"

View File

@ -0,0 +1,3 @@
@{
Layout = "_Layout";
}

View File

@ -107,6 +107,7 @@ public class Startup
services.Configure<RazorViewEngineOptions>(o =>
{
o.ViewLocationFormats.Add("/Auth/Views/{1}/{0}.cshtml");
o.ViewLocationFormats.Add("/AdminConsole/Views/{1}/{0}.cshtml");
});
// Jobs service