diff --git a/src/Admin/Admin.csproj b/src/Admin/Admin.csproj index 20508c1c92..a0c6dd05d7 100644 --- a/src/Admin/Admin.csproj +++ b/src/Admin/Admin.csproj @@ -18,11 +18,6 @@ - - - Admins.razor - - diff --git a/src/Admin/AdminConsole/Components/Admins.cs b/src/Admin/AdminConsole/Components/Admins.cs deleted file mode 100644 index 93808f8743..0000000000 --- a/src/Admin/AdminConsole/Components/Admins.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using Bit.Admin.AdminConsole.Models; -using Bit.Admin.Enums; -using Bit.Admin.Services; -using Microsoft.AspNetCore.Components; - -namespace Bit.Admin.AdminConsole.Components; - -public partial class Admins( - IAccessControlService accessControlService) : ComponentBase -{ - private readonly bool _canResendEmailInvite = accessControlService.UserHasPermission(Permission.Provider_ResendEmailInvite); - - [Parameter] public ProviderViewModel Model { get; set; } - - [SupplyParameterFromForm(FormName = "ManageAdminsForm")] - public ManageAdminsFormModel FormModel { get; set; } = new(); - - [Parameter] - public Guid ProviderId { get; set; } - - [Parameter] - public Guid OwnerId { get; set; } - - [SupplyParameterFromQuery] - public Guid? InviteResentTo { get; set; } - - private async Task OnValidSubmitAsync() - { - await ProviderService.ResendProviderSetupInviteEmailAsync(ProviderId, OwnerId); - var uri = NavigationManager.GetUriWithQueryParameters($"/admin/providers/{ProviderId}/admins", new Dictionary { { "inviteResentTo", OwnerId.ToString() } }); - NavigationManager.NavigateTo(uri); - } - - public class ManageAdminsFormModel - { - [Required] - public Guid UserId { get; set; } - } -} diff --git a/src/Admin/AdminConsole/Components/Admins.razor b/src/Admin/AdminConsole/Components/Admins.razor deleted file mode 100644 index 6e671621ac..0000000000 --- a/src/Admin/AdminConsole/Components/Admins.razor +++ /dev/null @@ -1,69 +0,0 @@ -@using Bit.Admin.Services -@using Bit.Core.AdminConsole.Enums.Provider -@using Bit.Core.AdminConsole.Services - -@inject IAccessControlService AccessControlService -@inject IProviderService ProviderService -@inject NavigationManager NavigationManager - -

Provider Admins

-
-
-
- - - - - - - - - - - - @if (!Model.ProviderAdmins.Any()) - { - - - - } - else - { - @foreach (var admin in Model.ProviderAdmins) - { - - - - - - } - } - -
EmailStatus
No results to list.
- @admin.Email - - @admin.Status - - @if (admin.Status.Equals(ProviderUserStatusType.Confirmed) - && Model.Provider.Status.Equals(ProviderStatusType.Pending) - && _canResendEmailInvite) - { - @if (InviteResentTo == admin.UserId!.Value) - { - - } - else - { - - } - } -
- -
-
-
diff --git a/src/Admin/AdminConsole/Components/EditProviderPage.razor b/src/Admin/AdminConsole/Components/EditProviderPage.razor deleted file mode 100644 index cb4bb433aa..0000000000 --- a/src/Admin/AdminConsole/Components/EditProviderPage.razor +++ /dev/null @@ -1,187 +0,0 @@ -@page "/providers2/edit/{id:guid}" - -@using Bit.Admin.Enums -@using Bit.Core -@using Bit.Core.Billing.Extensions - -@{ - //ViewData["Title"] = "Provider: " + Model.Provider.DisplayName(); - var canEdit = accessControlService.UserHasPermission(Permission.Provider_Edit); -} - -

Provider @Model.Provider.DisplayName()

- -

Provider Information

- - -
-
- -

General

-
-
Name
-
@Model.Provider.DisplayName()
-
-

Business Information

-
-
Business Name
-
@Model.Provider.DisplayBusinessName()
-
-

Billing

-
-
-
- - -
-
-
-
-
-
- - -
-
-
- @if (featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling) && Model.Provider.IsBillable()) - { -
-
-
- - -
-
-
-
- - -
-
-
-
-
-
-
- - -
-
-
-
-
-
-
- -
- -
- - - -
-
-
-
-
-
- -
- -
- - - -
-
-
-
-
- } -
- -@if (canEdit) -{ - - - - - - - -
- -
- - - - - - - - -
-
-} diff --git a/src/Admin/AdminConsole/Components/EditProviderPage.razor.cs b/src/Admin/AdminConsole/Components/EditProviderPage.razor.cs deleted file mode 100644 index 52c2966a61..0000000000 --- a/src/Admin/AdminConsole/Components/EditProviderPage.razor.cs +++ /dev/null @@ -1,98 +0,0 @@ -using Bit.Admin.AdminConsole.Models; -using Bit.Admin.Services; -using Bit.Admin.Utilities; -using Bit.Core; -using Bit.Core.AdminConsole.Entities.Provider; -using Bit.Core.AdminConsole.Repositories; -using Bit.Core.Billing.Entities; -using Bit.Core.Billing.Extensions; -using Bit.Core.Billing.Repositories; -using Bit.Core.Enums; -using Bit.Core.Services; -using Bit.Core.Settings; -using Microsoft.AspNetCore.Components; - -namespace Bit.Admin.AdminConsole.Components; - -public partial class EditProviderPage( - GlobalSettings globalSettings, - IAccessControlService accessControlService, - IFeatureService featureService, - IProviderRepository providerRepository, - IProviderOrganizationRepository providerOrganizationRepository, - IProviderPlanRepository providerPlanRepository, - IProviderUserRepository providerUserRepository, - IWebHostEnvironment webHostEnvironment) - : ComponentBase -{ - private readonly string _stripeUrl = webHostEnvironment.GetStripeUrl(); - private readonly string _braintreeMerchantUrl = webHostEnvironment.GetBraintreeMerchantUrl(); - private readonly string _braintreeMerchantId = globalSettings.Braintree.MerchantId; - - [Parameter] public Guid Id { get; set; } - - public ProviderEditModel? Model { get; set; } - - public ProviderViewModel? ViewModel { get; set; } - - protected override async Task OnInitializedAsync() - { - var provider = await providerRepository.GetByIdAsync(Id); - - if (provider == null) - { - return; - } - - var users = await providerUserRepository.GetManyDetailsByProviderAsync(Id); - var providerOrganizations = await providerOrganizationRepository.GetManyDetailsByProviderAsync(Id); - - var isConsolidatedBillingEnabled = featureService.IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling); - - if (!isConsolidatedBillingEnabled || !provider.IsBillable()) - { - Model = new ProviderEditModel(provider, users, providerOrganizations, new List()); - ViewModel = new ProviderViewModel(provider, users, providerOrganizations); - return; - } - - var providerPlans = await providerPlanRepository.GetByProviderId(Id); - - Model = new ProviderEditModel( - provider, users, providerOrganizations, - providerPlans.ToList(), GetGatewayCustomerUrl(provider), GetGatewaySubscriptionUrl(provider)); - - ViewModel = new ProviderViewModel(provider, users, providerOrganizations); - } - - private string GetGatewayCustomerUrl(Provider provider) - { - if (!provider.Gateway.HasValue || string.IsNullOrEmpty(provider.GatewayCustomerId)) - { - return null; - } - - return provider.Gateway switch - { - GatewayType.Stripe => $"{_stripeUrl}/customers/{provider.GatewayCustomerId}", - GatewayType.PayPal => $"{_braintreeMerchantUrl}/{_braintreeMerchantId}/${provider.GatewayCustomerId}", - _ => null - }; - } - - private string GetGatewaySubscriptionUrl(Provider provider) - { - if (!provider.Gateway.HasValue || string.IsNullOrEmpty(provider.GatewaySubscriptionId)) - { - return null; - } - - return provider.Gateway switch - { - GatewayType.Stripe => $"{_stripeUrl}/subscriptions/{provider.GatewaySubscriptionId}", - GatewayType.PayPal => $"{_braintreeMerchantUrl}/{_braintreeMerchantId}/subscriptions/${provider.GatewaySubscriptionId}", - _ => null - }; - } -} - diff --git a/src/Admin/AdminConsole/Components/ViewInformation.razor b/src/Admin/AdminConsole/Components/ViewInformation.razor deleted file mode 100644 index 2f4298f2f6..0000000000 --- a/src/Admin/AdminConsole/Components/ViewInformation.razor +++ /dev/null @@ -1,22 +0,0 @@ -@using Bit.SharedWeb.Utilities -@using Bit.Core.AdminConsole.Enums.Provider - -
-
Id
-
@Model.Provider.Id
- -
Status
-
@Model.Provider.Status
- -
Users
-
@(Model.Provider.Type == ProviderType.Reseller ? "N/A" : Model.UserCount)
- -
Provider Type
-
@(Model.Provider.Type.GetDisplayAttribute()?.GetName())
- -
Created
-
@Model.Provider.CreationDate
- -
Modified
-
@Model.Provider.RevisionDate
-
diff --git a/src/Admin/AdminConsole/Components/ViewInformation.razor.cs b/src/Admin/AdminConsole/Components/ViewInformation.razor.cs deleted file mode 100644 index 7f93beace3..0000000000 --- a/src/Admin/AdminConsole/Components/ViewInformation.razor.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Bit.Admin.AdminConsole.Models; -using Microsoft.AspNetCore.Components; - -namespace Bit.Admin.AdminConsole.Components; - -public partial class ViewInformation : ComponentBase -{ - [Parameter] public ProviderViewModel Model { get; set; } -} diff --git a/src/Admin/AdminConsole/Components/_Imports.razor b/src/Admin/AdminConsole/Components/_Imports.razor deleted file mode 100644 index 97859fa7bf..0000000000 --- a/src/Admin/AdminConsole/Components/_Imports.razor +++ /dev/null @@ -1,5 +0,0 @@ -@using Bit.Core.Utilities -@using Microsoft.AspNetCore.Authorization - -@attribute [Authorize] -@attribute [SelfHosted(NotSelfHostedOnly = true)]