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

[EC-427] Add provider types (MSP/Reseller) to Provider table (#2518)

Browse Source 
* [EC-427] Add columns 'Type' and 'BillingPhone' to Provider table

* [EC-427] Provider table Type and BillingPhone MySql migrations

* [EC-427] Provider table Type and BillingPhone Postgres migrations

* [EC-427] Add mysql migration script

* [EC-427] Add mysql migration script

* [EC-427] Updated Provider sql script to include default column value

* [EC-427] Removed default value from Provider.Type column

* [EC-427] Changed migration script to include a default value constraint instead of updating the null type

* [EC-427] Updated Sql project Provider table script

* [EC-427] Changed migration script to use 'Create OR Alter' for views and sprocs

* [EC-427] Added default values for 'BillingPhone' and 'Type' fields on sprocs [dbo].[Provider_Create] and [dbo].[Provider_Update]

* [EC-427] Adjusting metadata in migration script

* [EC-427] Updated Provider sprocs SQL script files

* [EC-427] Fixed migration script

* [EC-427] Added sqlite migration

* [EC-427] Add missing Provider_Update sproc default value

* [EC-427] Added missing GO action to migration script

* [EC-428] Redirect to Edit after creating Provider

* Revert "[EC-428] Redirect to Edit after creating Provider"

This reverts commit 6347bca1ed.
This commit is contained in:
Rui Tomé
2023-01-23 16:08:05 +00:00
committed by GitHub
parent c6c0f95ed7
commit 68989442c8
18 changed files with 5406 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Entities/Provider/Provider.cs
View File

@ -14,8 +14,10 @@ public class Provider : ITableObject<Guid>
public string BusinessCountry { get; set; }
public string BusinessTaxNumber { get; set; }
public string BillingEmail { get; set; }
public string BillingPhone { get; set; }
public ProviderStatusType Status { get; set; }
public bool UseEvents { get; set; }
public ProviderType Type { get; set; }
public bool Enabled { get; set; } = true;
public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;

7
src/Core/Enums/Provider/ProviderType.cs Normal file
View File

@ -0,0 +1,7 @@
namespace Bit.Core.Enums.Provider;
public enum ProviderType : byte
{
Msp = 0,
Reseller = 1,
}

6
src/Sql/dbo/Stored Procedures/Provider_Create.sql
View File

@ -8,7 +8,9 @@
@BusinessCountry VARCHAR(2),
@BusinessTaxNumber NVARCHAR(30),
@BillingEmail NVARCHAR(256),
@BillingPhone NVARCHAR(50) = NULL,
@Status TINYINT,
@Type TINYINT = 0,
@UseEvents BIT,
@Enabled BIT,
@CreationDate DATETIME2(7),
@ -28,7 +30,9 @@ BEGIN
[BusinessCountry],
[BusinessTaxNumber],
[BillingEmail],
[BillingPhone],
[Status],
[Type],
[UseEvents],
[Enabled],
[CreationDate],
@ -45,7 +49,9 @@ BEGIN
@BusinessCountry,
@BusinessTaxNumber,
@BillingEmail,
@BillingPhone,
@Status,
@Type,
@UseEvents,
@Enabled,
@CreationDate,

4
src/Sql/dbo/Stored Procedures/Provider_Update.sql
View File

@ -8,7 +8,9 @@
@BusinessCountry VARCHAR(2),
@BusinessTaxNumber NVARCHAR(30),
@BillingEmail NVARCHAR(256),
@BillingPhone NVARCHAR(50) = NULL,
@Status TINYINT,
@Type TINYINT = 0,
@UseEvents BIT,
@Enabled BIT,
@CreationDate DATETIME2(7),
@ -28,7 +30,9 @@ BEGIN
[BusinessCountry] = @BusinessCountry,
[BusinessTaxNumber] = @BusinessTaxNumber,
[BillingEmail] = @BillingEmail,
[BillingPhone] = @BillingPhone,
[Status] = @Status,
[Type] = @Type,
[UseEvents] = @UseEvents,
[Enabled] = @Enabled,
[CreationDate] = @CreationDate,

2
src/Sql/dbo/Tables/Provider.sql
View File

@ -8,8 +8,10 @@
[BusinessCountry] VARCHAR (2) NULL,
[BusinessTaxNumber] NVARCHAR (30) NULL,
[BillingEmail] NVARCHAR (256) NULL,
[BillingPhone] NVARCHAR (50) NULL,
[Status] TINYINT NOT NULL,
[UseEvents] BIT NOT NULL,
[Type] TINYINT NOT NULL CONSTRAINT DF_Provider_Type DEFAULT (0),
[Enabled] BIT NOT NULL,
[CreationDate] DATETIME2 (7) NOT NULL,
[RevisionDate] DATETIME2 (7) NOT NULL,

3
src/Sql/dbo/Views/ProviderUserProviderDetailsView.sql
View File

@ -10,7 +10,8 @@ SELECT
P.[Enabled],
PU.[Permissions],
P.[UseEvents],
P.[Status] ProviderStatus
P.[Status] ProviderStatus,
P.[Type] ProviderType
FROM
[dbo].[ProviderUser] PU
LEFT JOIN