Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-25 12:45:18 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #788 from bitwarden/sso-config2

Browse Source 
Updates to SSO config DB setup
This commit is contained in:
Matt Portune 2020-06-24 14:24:16 -04:00 committed by GitHub
commit 4e355cef33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Sql/dbo/Stored Procedures/SsoConfig_ReadByIdentifier.sql
View File

@ -5,9 +5,10 @@ BEGIN
SET NOCOUNT ON
SELECT TOP 1
*
SSO.*
FROM
[dbo].[SsoConfigView]
WHERE
[Identifier] = @Identifier
[dbo].[SsoConfigView] SSO
INNER JOIN
[dbo].[Organization] O ON O.[Id] = SSO.[OrganizationId]
AND O.[Identifier] = @Identifier
END

6
src/Sql/dbo/Tables/Organization.sql
View File

@ -1,5 +1,6 @@
CREATE TABLE [dbo].[Organization] (
[Id] UNIQUEIDENTIFIER NOT NULL,
[Identifier] NVARCHAR (50) NULL,
[Name] NVARCHAR (50) NOT NULL,
[BusinessName] NVARCHAR (50) NULL,
[BusinessAddress1] NVARCHAR (50) NULL,
@ -42,3 +43,8 @@ CREATE NONCLUSTERED INDEX [IX_Organization_Enabled]
ON [dbo].[Organization]([Id] ASC, [Enabled] ASC)
INCLUDE ([UseTotp]);
GO
CREATE UNIQUE NONCLUSTERED INDEX [IX_Organization_Identifier]
ON [dbo].[Organization]([Identifier] ASC)
WHERE [Identifier] IS NOT NULL;

5
src/Sql/dbo/Tables/SsoConfig.sql
View File

@ -1,8 +1,11 @@
CREATE TABLE [dbo].[SsoConfig] (
[OrganizationId] UNIQUEIDENTIFIER NULL,
[Id] BIGINT IDENTITY (1, 1) NOT NULL,
[Enabled] BIT NOT NULL,
[OrganizationId] UNIQUEIDENTIFIER NOT NULL,
[Identifier] NVARCHAR (50) NULL,
[Data] NVARCHAR (MAX) NULL,
[CreationDate] DATETIME2 (7) NOT NULL,
[RevisionDate] DATETIME2 (7) NOT NULL,
CONSTRAINT [PK_SsoConfig] PRIMARY KEY CLUSTERED ([Id] ASC),
CONSTRAINT [FK_SsoConfig_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id])
);

19
util/Migrator/DbScripts/2020-06-23_00_OrgIdentifier.sql Normal file
View File

@ -0,0 +1,19 @@
IF COL_LENGTH('[dbo].[Organization]', 'Identifier') IS NULL
BEGIN
ALTER TABLE
[dbo].[Organization]
ADD
[Identifier] NVARCHAR (50) NULL
END
GO
IF NOT EXISTS (
SELECT * FROM sys.indexes WHERE [Name]='IX_Organization_Identifier'
AND object_id = OBJECT_ID('[dbo].[Organization]')
)
BEGIN
CREATE UNIQUE NONCLUSTERED INDEX [IX_Organization_Identifier]
ON [dbo].[Organization]([Identifier] ASC)
WHERE [Identifier] IS NOT NULL;
END
GO

10
util/Migrator/DbScripts/2020-06-16_00_OrgSso.sql → util/Migrator/DbScripts/2020-06-23_01_SsoConfig.sql
View File

@ -1,11 +1,14 @@
IF OBJECT_ID('[dbo].[SsoConfig]') IS NULL
BEGIN
CREATE TABLE [dbo].[SsoConfig] (
[OrganizationId] UNIQUEIDENTIFIER NULL,
[Id] BIGINT IDENTITY (1, 1) NOT NULL,
[Enabled] BIT NOT NULL,
[OrganizationId] UNIQUEIDENTIFIER NOT NULL,
[Identifier] NVARCHAR (50) NULL,
[Data] NVARCHAR (MAX) NULL,
[CreationDate] DATETIME2 (7) NOT NULL,
[RevisionDate] DATETIME2 (7) NOT NULL,
CONSTRAINT [PK_SsoConfig] PRIMARY KEY CLUSTERED ([Id] ASC),
CONSTRAINT [FK_SsoConfig_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id])
);
END
@ -23,7 +26,6 @@ SELECT
*
FROM
[dbo].[SsoConfig]
GO
IF OBJECT_ID('[dbo].[SsoConfig_ReadByIdentifier]') IS NOT NULL
BEGIN
@ -42,7 +44,7 @@ BEGIN
FROM
[dbo].[SsoConfigView]
WHERE
[Identifier] = @Identifier
[Identifier] = @Identifier
END
GO
@ -63,6 +65,6 @@ BEGIN
FROM
[dbo].[SsoConfigView]
WHERE
[OrganizationId] = @OrganizationId
[OrganizationId] = @OrganizationId
END
GO