move migrations to migrator project

bitwarden-server.sln

@@ -131,7 +131,7 @@ Global
 		{28635027-20E5-42FA-B218-B6C878DE5350} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}
 		{8EF31E6C-400A-4174-8BE3-502B08FB10B5} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84F}
 		{79BB453F-D0D8-4DDF-9809-A405C56692BD} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}
-		{54DED792-A022-417E-9804-21FCC9C7C610} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}
+		{54DED792-A022-417E-9804-21FCC9C7C610} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E01CBF68-2E20-425F-9EDB-E0A6510CA92F}

src/Admin/Admin.csproj

@@ -9,6 +9,7 @@
   
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />
+    <ProjectReference Include="..\Migrator\Migrator.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/Admin/HostedServices/DatabaseMigrationHostedService.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Data.SqlClient;
+using System.Threading;
+using System.Threading.Tasks;
+using Bit.Core;
+using Bit.Core.Jobs;
+using Bit.Migrator;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace Bit.Admin.HostedServices
+{
+    public class DatabaseMigrationHostedService : IHostedService, IDisposable
+    {
+        private readonly GlobalSettings _globalSettings;
+        private readonly ILogger<DatabaseMigrationHostedService> _logger;
+        private readonly DbMigrator _dbMigrator;
+
+        public DatabaseMigrationHostedService(
+            GlobalSettings globalSettings,
+            ILogger<DatabaseMigrationHostedService> logger,
+            ILogger<DbMigrator> migratorLogger,
+            ILogger<JobListener> listenerLogger)
+        {
+            _globalSettings = globalSettings;
+            _logger = logger;
+            _dbMigrator = new DbMigrator(globalSettings.SqlServer.ConnectionString, migratorLogger);
+        }
+
+        public virtual async Task StartAsync(CancellationToken cancellationToken)
+        {
+            var maxMigrationAttempts = 10;
+            for(var i = 1; i <= maxMigrationAttempts; i++)
+            {
+                try
+                {
+                    _dbMigrator.MigrateMsSqlDatabase(true, cancellationToken);
+                    // TODO: Maybe flip a flag somewhere to indicate migration is complete??
+                    break;
+                }
+                catch(SqlException e)
+                {
+                    if(i >= maxMigrationAttempts)
+                    {
+                        _logger.LogError(e, "Database failed to migrate.");
+                        throw e;
+                    }
+                    else
+                    {
+                        _logger.LogError(e,
+                            "Database unavailable for migration. Trying again (attempt #{0})...", i + 1);
+                        await Task.Delay(20000);
+                    }
+                }
+            }
+        }
+
+        public virtual Task StopAsync(CancellationToken cancellationToken)
+        {
+            return Task.FromResult(0);
+        }
+
+        public virtual void Dispose()
+        { }
+    }
+}

src/Admin/Startup.cs

@@ -75,7 +75,11 @@ namespace Bit.Admin
             // Jobs service
             Jobs.JobsHostedService.AddJobsServices(services);
             services.AddHostedService<Jobs.JobsHostedService>();
-            if(!globalSettings.SelfHosted)
+            if(globalSettings.SelfHosted)
+            {
+                services.AddHostedService<HostedServices.DatabaseMigrationHostedService>();
+            }
+            else
             {
                 if(CoreHelpers.SettingHasValue(globalSettings.Storage.ConnectionString))
                 {

src/Migrator/DbMigrator.cs

@@ -1,69 +1,97 @@
 using System;
 using System.Data.SqlClient;
 using System.Reflection;
+using System.Threading;
 using DbUp;
+using Microsoft.Extensions.Logging;
 
 namespace Bit.Migrator
 {
-    public static class DbMigrator
+    public class DbMigrator
     {
-        private static void MigrateMsSqlDatabase(string connectionString, int attempt = 1)
+        private readonly string _connectionString;
+        private readonly ILogger<DbMigrator> _logger;
+        private readonly string _masterConnectionString;
+
+        public DbMigrator(string connectionString, ILogger<DbMigrator> logger)
         {
-            var masterConnectionString = new SqlConnectionStringBuilder(connectionString)
+            _connectionString = connectionString;
+            _logger = logger;
+            _masterConnectionString = new SqlConnectionStringBuilder(connectionString)
             {
                 InitialCatalog = "master"
             }.ConnectionString;
+        }
 
-            try
+        public bool MigrateMsSqlDatabase(bool enableLogging = true,
+            CancellationToken cancellationToken = default(CancellationToken))
         {
-                using(var connection = new SqlConnection(masterConnectionString))
+            if(enableLogging && _logger != null)
+            {
+                _logger.LogInformation("Migrating database.");
+            }
+
+            using(var connection = new SqlConnection(_masterConnectionString))
             {
                 var command = new SqlCommand(
                     "IF ((SELECT COUNT(1) FROM sys.databases WHERE [name] = 'vault') = 0) " +
                     "CREATE DATABASE [vault];", connection);
                 command.Connection.Open();
                 command.ExecuteNonQuery();
+
                 command.CommandText = "IF ((SELECT DATABASEPROPERTYEX([name], 'IsAutoClose') " +
                     "FROM sys.databases WHERE [name] = 'vault') = 1) " +
                     "ALTER DATABASE [vault] SET AUTO_CLOSE OFF;";
                 command.ExecuteNonQuery();
             }
 
+            using(var connection = new SqlConnection(_connectionString))
+            {
+                // Rename old migration scripts to new namespace.
+                var command = new SqlCommand(
+                    "IF OBJECT_ID('Migration','U') IS NOT NULL " +
+                    "UPDATE [dbo].[Migration] SET " +
+                    "[ScriptName] = REPLACE([ScriptName], '.Setup.', '.Migrator.');", connection);
+                command.Connection.Open();
+                command.ExecuteNonQuery();
+            }
+
             var builder = DeployChanges.To
-                    .SqlDatabase(connectionString)
+                .SqlDatabase(_connectionString)
                 .JournalToSqlTable("dbo", "Migration")
                 .WithScriptsAndCodeEmbeddedInAssembly(Assembly.GetExecutingAssembly(),
                     s => s.Contains($".DbScripts.") && !s.Contains(".Archive."))
                 .WithTransaction()
-                    .WithExecutionTimeout(new TimeSpan(0, 5, 0))
+                .WithExecutionTimeout(new TimeSpan(0, 5, 0));
-                    .LogToConsole();
 
-                var upgrader = builder.Build();
+            if(enableLogging)
-                var result = upgrader.PerformUpgrade();
-                if(result.Successful)
             {
-                    Console.WriteLine("Migration successful.");
+                if(_logger != null)
+                {
+                    builder.LogTo(new DbUpLogger(_logger));
                 }
                 else
                 {
-                    Console.WriteLine("Migration failed.");
+                    builder.LogToConsole();
-                }
-            }
-            catch(SqlException e)
-            {
-                if(e.Message.Contains("Server is in script upgrade mode") && attempt < 10)
-                {
-                    var nextAttempt = attempt + 1;
-                    Console.WriteLine("Database is in script upgrade mode. " +
-                        "Trying again (attempt #{0})...", nextAttempt);
-                    System.Threading.Thread.Sleep(20000);
-                    MigrateMsSqlDatabase(connectionString, nextAttempt);
-                    return;
-                }
-
-                throw e;
                 }
             }
 
+            var upgrader = builder.Build();
+            var result = upgrader.PerformUpgrade();
+
+            if(enableLogging && _logger != null)
+            {
+                if(result.Successful)
+                {
+                    _logger.LogInformation("Migration successful.");
+                }
+                else
+                {
+                    _logger.LogError(result.Error, "Migration failed.");
+                }
+            }
+
+            return result.Successful;
+        }
     }
 }

src/Migrator/DbUpLogger.cs

@@ -0,0 +1,30 @@
+using DbUp.Engine.Output;
+using Microsoft.Extensions.Logging;
+
+namespace Bit.Migrator
+{
+    public class DbUpLogger : IUpgradeLog
+    {
+        private readonly ILogger _logger;
+
+        public DbUpLogger(ILogger logger)
+        {
+            _logger = logger;
+        }
+
+        public void WriteError(string format, params object[] args)
+        {
+            _logger.LogError(format, args);
+        }
+
+        public void WriteInformation(string format, params object[] args)
+        {
+            _logger.LogInformation(format, args);
+        }
+
+        public void WriteWarning(string format, params object[] args)
+        {
+            _logger.LogWarning(format, args);
+        }
+    }
+}

src/Migrator/Migrator.csproj

@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="dbup-sqlserver" Version="4.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
   </ItemGroup>
 
 </Project>

util/Setup/DbScripts/2017-08-22_00_LicenseCheckScripts.sql

@@ -1,46 +0,0 @@
-IF OBJECT_ID('[dbo].[Organization_Read]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_Read]
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_ReadByEnabled]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_ReadByEnabled]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_ReadByEnabled]
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[OrganizationView]
-    WHERE
-        [Enabled] = 1
-END
-GO
-
-IF OBJECT_ID('[dbo].[User_ReadByPremium]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[User_ReadByPremium]
-END
-GO
-
-CREATE PROCEDURE [dbo].[User_ReadByPremium]
-    @Premium BIT
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[UserView]
-    WHERE
-        [Premium] = @Premium
-END
-GO

util/Setup/DbScripts/2017-08-30_00_CollectionWriteOnly.sql

@@ -1,224 +0,0 @@
-IF OBJECT_ID('[dbo].[Collection_ReadByUserId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Collection_ReadByUserId]
-END
-GO
-
-IF OBJECT_ID('[dbo].[Cipher_UpdateWithCollections]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Cipher_UpdateWithCollections]
-END
-GO
-
-IF OBJECT_ID('[dbo].[CollectionCipher_UpdateCollections]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CollectionCipher_UpdateCollections]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Collection_ReadByUserId]
-    @UserId UNIQUEIDENTIFIER,
-    @WriteOnly BIT
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        C.*
-    FROM
-        [dbo].[CollectionView] C
-    INNER JOIN
-        [dbo].[OrganizationUser] OU ON C.[OrganizationId] = OU.[OrganizationId]
-    INNER JOIN
-        [dbo].[Organization] O ON O.[Id] = C.[OrganizationId]
-    LEFT JOIN
-        [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = [OU].[Id]
-    LEFT JOIN
-        [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-    LEFT JOIN
-        [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-    LEFT JOIN
-        [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
-    WHERE
-        OU.[UserId] = @UserId
-        AND OU.[Status] = 2 -- 2 = Confirmed
-        AND O.[Enabled] = 1
-        AND (
-            OU.[AccessAll] = 1
-            OR CU.[CollectionId] IS NOT NULL
-            OR G.[AccessAll] = 1
-            OR CG.[CollectionId] IS NOT NULL
-        )
-        AND (
-            @WriteOnly = 0
-            OR OU.[AccessAll] = 1
-            OR G.[AccessAll] = 1
-            OR CU.[ReadOnly] = 0
-            OR CG.[ReadOnly] = 0
-        )
-END
-GO
-
-CREATE PROCEDURE [dbo].[Cipher_UpdateWithCollections]
-    @Id UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @Type TINYINT,
-    @Data NVARCHAR(MAX),
-    @Favorites NVARCHAR(MAX),
-    @Folders NVARCHAR(MAX),
-    @Attachments NVARCHAR(MAX),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7),
-    @CollectionIds AS [dbo].[GuidIdArray] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    CREATE TABLE #AvailableCollections (
-        [Id] UNIQUEIDENTIFIER
-    )
-
-    INSERT INTO #AvailableCollections
-        SELECT
-            C.[Id]
-        FROM
-            [dbo].[Collection] C
-        INNER JOIN
-            [Organization] O ON O.[Id] = C.[OrganizationId]
-        INNER JOIN
-            [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
-        LEFT JOIN
-            [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = OU.[Id]
-        LEFT JOIN
-            [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-        LEFT JOIN
-            [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-        LEFT JOIN
-            [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[GroupId] = GU.[GroupId]
-        WHERE
-            O.[Id] = @OrganizationId
-            AND O.[Enabled] = 1
-            AND OU.[Status] = 2 -- Confirmed
-            AND (
-                OU.[AccessAll] = 1
-                OR CU.[ReadOnly] = 0
-                OR G.[AccessAll] = 1
-                OR CG.[ReadOnly] = 0
-            )
-
-    IF (SELECT COUNT(1) FROM #AvailableCollections) < 1
-    BEGIN
-        -- No writable collections available to share with in this organization.
-        SELECT -1 -- -1 = Failure
-        RETURN
-    END
-
-    UPDATE
-        [dbo].[Cipher]
-    SET
-        [UserId] = NULL,
-        [OrganizationId] = @OrganizationId,
-        [Data] = @Data,
-        [Attachments] = @Attachments,
-        [RevisionDate] = @RevisionDate
-        -- No need to update CreationDate, Favorites, Folders, or Type since that data will not change
-    WHERE
-        [Id] = @Id
-
-    INSERT INTO [dbo].[CollectionCipher]
-    (
-        [CollectionId],
-        [CipherId]
-    )
-    SELECT
-        [Id],
-        @Id
-    FROM
-        @CollectionIds
-    WHERE
-        [Id] IN (SELECT [Id] FROM #AvailableCollections)
-
-    IF @Attachments IS NOT NULL
-    BEGIN
-        EXEC [dbo].[Organization_UpdateStorage] @OrganizationId
-        EXEC [dbo].[User_UpdateStorage] @UserId
-    END
-
-    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
-
-    SELECT 0 -- 0 = Success
-END
-GO
-
-CREATE PROCEDURE [dbo].[CollectionCipher_UpdateCollections]
-    @CipherId UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @CollectionIds AS [dbo].[GuidIdArray] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @OrgId UNIQUEIDENTIFIER = (
-        SELECT TOP 1
-            [OrganizationId]
-        FROM
-            [dbo].[Cipher]
-        WHERE
-            [Id] = @CipherId
-    )
-
-    ;WITH [AvailableCollectionsCTE] AS(
-        SELECT
-            C.[Id]
-        FROM
-            [dbo].[Collection] C
-        INNER JOIN
-            [Organization] O ON O.[Id] = C.[OrganizationId]
-        INNER JOIN
-            [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
-        LEFT JOIN
-            [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = OU.[Id]
-        LEFT JOIN
-            [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-        LEFT JOIN
-            [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-        LEFT JOIN
-            [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[GroupId] = GU.[GroupId]
-        WHERE
-            O.[Id] = @OrgId
-            AND O.[Enabled] = 1
-            AND OU.[Status] = 2 -- Confirmed
-            AND (
-                OU.[AccessAll] = 1
-                OR CU.[ReadOnly] = 0
-                OR G.[AccessAll] = 1
-                OR CG.[ReadOnly] = 0
-            )
-    )
-    MERGE
-        [dbo].[CollectionCipher] AS [Target]
-    USING 
-        @CollectionIds AS [Source]
-    ON
-        [Target].[CollectionId] = [Source].[Id]
-        AND [Target].[CipherId] = @CipherId
-    WHEN NOT MATCHED BY TARGET
-    AND [Source].[Id] IN (SELECT [Id] FROM [AvailableCollectionsCTE]) THEN
-        INSERT VALUES
-        (
-            [Source].[Id],
-            @CipherId
-        )
-    WHEN NOT MATCHED BY SOURCE
-    AND [Target].[CipherId] = @CipherId
-    AND [Target].[CollectionId] IN (SELECT [Id] FROM [AvailableCollectionsCTE]) THEN
-        DELETE
-    ;
-
-    IF @OrgId IS NOT NULL
-    BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrgId
-    END
-END
-GO

util/Setup/DbScripts/2017-09-06_00_CipherDetails.sql

@@ -1,180 +0,0 @@
-IF OBJECT_ID('[dbo].[CipherDetails]') IS NOT NULL
-BEGIN
-    DROP FUNCTION [dbo].[CipherDetails]
-END
-GO
-
-CREATE FUNCTION [dbo].[CipherDetails](@UserId UNIQUEIDENTIFIER)
-RETURNS TABLE
-AS RETURN
-SELECT
-    C.[Id],
-    C.[UserId],
-    C.[OrganizationId],
-    C.[Type],
-    C.[Data],
-    C.[Attachments],
-    C.[CreationDate],
-    C.[RevisionDate],
-    CASE WHEN
-        @UserId IS NULL
-        OR C.[Favorites] IS NULL
-        OR JSON_VALUE(C.[Favorites], CONCAT('$."', @UserId, '"')) IS NULL
-    THEN 0
-    ELSE 1
-    END [Favorite],
-    CASE WHEN
-        @UserId IS NULL
-        OR C.[Folders] IS NULL
-    THEN NULL
-    ELSE TRY_CONVERT(UNIQUEIDENTIFIER, JSON_VALUE(C.[Folders], CONCAT('$."', @UserId, '"')))
-    END [FolderId]
-FROM
-    [dbo].[Cipher] C
-GO
-
-IF OBJECT_ID('[dbo].[CipherDetails_ReadById]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CipherDetails_ReadById]
-END
-GO
-
-CREATE PROCEDURE [dbo].[CipherDetails_ReadById]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        C.*,
-        1 [Edit],
-        CASE 
-            WHEN O.[UseTotp] = 1 THEN 1
-            ELSE 0
-        END [OrganizationUseTotp]
-    FROM
-        [dbo].[CipherDetails](NULL) C
-    LEFT JOIN
-        [dbo].[Organization] O ON O.[Id] = C.[OrganizationId]
-    WHERE
-        C.[Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[CipherDetails_ReadByUserIdHasCollection]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CipherDetails_ReadByUserIdHasCollection]
-END
-GO
-
-CREATE PROCEDURE [dbo].[CipherDetails_ReadByUserIdHasCollection]
-    @UserId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        C.*,
-        CASE 
-            WHEN C.[UserId] IS NOT NULL OR OU.[AccessAll] = 1 OR CU.[ReadOnly] = 0 OR G.[AccessAll] = 1 OR CG.[ReadOnly] = 0 THEN 1
-            ELSE 0
-        END [Edit],
-        CASE 
-            WHEN C.[UserId] IS NULL AND O.[UseTotp] = 1 THEN 1
-            ELSE 0
-        END [OrganizationUseTotp]
-    FROM
-        [dbo].[CipherDetails](@UserId) C
-    INNER JOIN
-        [dbo].[Organization] O ON C.[UserId] IS NULL AND O.[Id] = C.[OrganizationId]
-    INNER JOIN
-        [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
-    LEFT JOIN
-        [dbo].[CollectionCipher] CC ON C.[UserId] IS NULL AND OU.[AccessAll] = 0 AND CC.[CipherId] = C.[Id]
-    LEFT JOIN
-        [dbo].[CollectionUser] CU ON CU.[CollectionId] = CC.[CollectionId] AND CU.[OrganizationUserId] = OU.[Id]
-    LEFT JOIN
-        [dbo].[GroupUser] GU ON C.[UserId] IS NULL AND CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-    LEFT JOIN
-        [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-    LEFT JOIN
-        [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId]
-    WHERE
-        OU.[Status] = 2 -- 2 = Confirmed
-        AND O.[Enabled] = 1
-        AND (
-            OU.[AccessAll] = 1
-            OR CU.[CollectionId] IS NOT NULL
-            OR G.[AccessAll] = 1
-            OR CG.[CollectionId] IS NOT NULL
-        )
-END
-GO
-
-IF OBJECT_ID('[dbo].[Cipher_ReadCanEditByIdUserId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Cipher_ReadCanEditByIdUserId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Cipher_ReadCanEditByIdUserId]
-    @Id UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @CanEdit BIT
-
-    ;WITH [CTE] AS (
-        SELECT
-            CASE 
-                WHEN C.[UserId] IS NOT NULL OR OU.[AccessAll] = 1 OR CU.[ReadOnly] = 0 OR G.[AccessAll] = 1 OR CG.[ReadOnly] = 0 THEN 1
-                ELSE 0
-            END [Edit]
-        FROM
-            [dbo].[Cipher] C
-        LEFT JOIN
-            [dbo].[Organization] O ON C.[UserId] IS NULL AND O.[Id] = C.[OrganizationId]
-        LEFT JOIN
-            [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
-        LEFT JOIN
-            [dbo].[CollectionCipher] CC ON C.[UserId] IS NULL AND OU.[AccessAll] = 0 AND CC.[CipherId] = C.[Id]
-        LEFT JOIN
-            [dbo].[CollectionUser] CU ON CU.[CollectionId] = CC.[CollectionId] AND CU.[OrganizationUserId] = OU.[Id]
-        LEFT JOIN
-            [dbo].[GroupUser] GU ON C.[UserId] IS NULL AND CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-        LEFT JOIN
-            [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-        LEFT JOIN
-            [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId]
-        WHERE
-            C.Id = @Id
-            AND (
-                C.[UserId] = @UserId
-                OR (
-                    C.[UserId] IS NULL
-                    AND OU.[Status] = 2 -- 2 = Confirmed
-                    AND O.[Enabled] = 1
-                    AND (
-                        OU.[AccessAll] = 1
-                        OR CU.[CollectionId] IS NOT NULL
-                        OR G.[AccessAll] = 1
-                        OR CG.[CollectionId] IS NOT NULL
-                    )
-                )
-            )
-    )
-    SELECT
-        @CanEdit = CASE
-            WHEN COUNT(1) > 0 THEN 1
-            ELSE 0
-        END
-    FROM
-        [CTE]
-    WHERE
-        [Edit] = 1
-
-    SELECT @CanEdit
-END
-GO

util/Setup/DbScripts/2017-09-08_00_OrgUserCounts.sql

@@ -1,48 +0,0 @@
-IF OBJECT_ID('[dbo].[OrganizationUser_ReadCountByFreeOrganizationAdminUser]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[OrganizationUser_ReadCountByFreeOrganizationAdminUser]
-END
-GO
-
-CREATE PROCEDURE [dbo].[OrganizationUser_ReadCountByFreeOrganizationAdminUser]
-    @UserId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        COUNT(1)
-    FROM
-        [dbo].[OrganizationUser] OU
-    INNER JOIN
-        [dbo].[Organization] O ON O.Id = OU.[OrganizationId]
-    WHERE
-        OU.[UserId] = @UserId
-        AND OU.[Type] < 2 -- Owner or Admin
-        AND O.[PlanType] = 0 -- Free
-        AND OU.[Status] = 2 -- 2 = Confirmed
-END
-GO
-
-IF OBJECT_ID('[dbo].[OrganizationUser_ReadCountByOrganizationOwnerUser]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[OrganizationUser_ReadCountByOrganizationOwnerUser]
-END
-GO
-
-CREATE PROCEDURE [dbo].[OrganizationUser_ReadCountByOrganizationOwnerUser]
-    @UserId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        COUNT(1)
-    FROM
-        [dbo].[OrganizationUser] OU
-    WHERE
-        OU.[UserId] = @UserId
-        AND OU.[Type] = 0
-        AND OU.[Status] = 2 -- 2 = Confirmed
-END
-GO

util/Setup/DbScripts/2017-10-25_00_OrgUserUpdates.sql

@@ -1,396 +0,0 @@
-IF OBJECT_ID('[dbo].[OrganizationUser_ReadCountByOrganizationOwnerUser]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[OrganizationUser_ReadCountByOrganizationOwnerUser]
-END
-GO
-
-IF OBJECT_ID('[dbo].[OrganizationUser_ReadCountByOnlyOwner]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[OrganizationUser_ReadCountByOnlyOwner]
-END
-GO
-
-CREATE PROCEDURE [dbo].[OrganizationUser_ReadCountByOnlyOwner]
-    @UserId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    ;WITH [OwnerCountCTE] AS
-    (
-        SELECT
-            OU.[UserId],
-            COUNT(1) OVER (PARTITION BY OU.[OrganizationId]) [ConfirmedOwnerCount]
-        FROM
-            [dbo].[OrganizationUser] OU
-        WHERE
-            OU.[Type] = 0 -- 0 = Owner
-            AND OU.[Status] = 2 -- 2 = Confirmed
-    )
-    SELECT
-        COUNT(1)
-    FROM
-        [OwnerCountCTE] OC
-    WHERE
-        OC.[UserId] = @UserId
-        AND OC.[ConfirmedOwnerCount] = 1
-END
-GO
-
-IF OBJECT_ID('[dbo].[User_DeleteById]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[User_DeleteById]
-END
-GO
-
-CREATE PROCEDURE [dbo].[User_DeleteById]
-    @Id UNIQUEIDENTIFIER
-WITH RECOMPILE
-AS
-BEGIN
-    SET NOCOUNT ON
-    DECLARE @BatchSize INT = 100
-
-    -- Delete ciphers
-    WHILE @BatchSize > 0
-    BEGIN
-        BEGIN TRANSACTION User_DeleteById_Ciphers
-
-        DELETE TOP(@BatchSize)
-        FROM
-            [dbo].[Cipher]
-        WHERE
-            [UserId] = @Id
-
-        SET @BatchSize = @@ROWCOUNT
-
-        COMMIT TRANSACTION User_DeleteById_Ciphers
-    END
-
-    BEGIN TRANSACTION User_DeleteById
-
-    -- Delete folders
-    DELETE
-    FROM
-        [dbo].[Folder]
-    WHERE
-        [UserId] = @Id
-
-    -- Delete devices
-    DELETE
-    FROM
-        [dbo].[Device]
-    WHERE
-        [UserId] = @Id
-
-    -- Delete collection users
-    DELETE
-        CU
-    FROM
-        [dbo].[CollectionUser] CU
-    INNER JOIN
-        [dbo].[OrganizationUser] OU ON OU.[Id] = CU.[OrganizationUserId]
-    WHERE
-        OU.[UserId] = @Id
-
-    -- Delete group users
-    DELETE
-        GU
-    FROM
-        [dbo].[GroupUser] GU
-    INNER JOIN
-        [dbo].[OrganizationUser] OU ON OU.[Id] = GU.[OrganizationUserId]
-    WHERE
-        OU.[UserId] = @Id
-
-    -- Delete organization users
-    DELETE
-    FROM
-        [dbo].[OrganizationUser]
-    WHERE
-        [UserId] = @Id
-
-    -- Finally, delete the user
-    DELETE
-    FROM
-        [dbo].[User]
-    WHERE
-        [Id] = @Id
-
-    COMMIT TRANSACTION User_DeleteById
-END
-GO
-
-IF COL_LENGTH('[dbo].[Organization]', 'BusinessAddress1') IS NULL
-BEGIN
-    ALTER TABLE
-        [dbo].[Organization]
-    ADD 
-        [BusinessAddress1]  NVARCHAR(50) NULL,
-        [BusinessAddress2]  NVARCHAR(50) NULL,
-        [BusinessAddress3]  NVARCHAR(50) NULL,
-        [BusinessCountry]   VARCHAR(2)   NULL,
-        [BusinessTaxNumber] NVARCHAR(30) NULL
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_Create]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_Create]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_Create]
-    @Id UNIQUEIDENTIFIER,
-    @Name NVARCHAR(50),
-    @BusinessName NVARCHAR(50),
-    @BusinessAddress1 NVARCHAR(50),
-    @BusinessAddress2 NVARCHAR(50),
-    @BusinessAddress3 NVARCHAR(50),
-    @BusinessCountry VARCHAR(2),
-    @BusinessTaxNumber NVARCHAR(30),
-    @BillingEmail NVARCHAR(50),
-    @Plan NVARCHAR(50),
-    @PlanType TINYINT,
-    @Seats SMALLINT,
-    @MaxCollections SMALLINT,
-    @UseGroups BIT,
-    @UseDirectory BIT,
-    @UseTotp BIT,
-    @SelfHost BIT,
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @Enabled BIT,
-    @LicenseKey VARCHAR(100),
-    @ExpirationDate DATETIME2(7),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    INSERT INTO [dbo].[Organization]
-    (
-        [Id],
-        [Name],
-        [BusinessName],
-        [BusinessAddress1],
-        [BusinessAddress2],
-        [BusinessAddress3],
-        [BusinessCountry],
-        [BusinessTaxNumber],
-        [BillingEmail],
-        [Plan],
-        [PlanType],
-        [Seats],
-        [MaxCollections],
-        [UseGroups],
-        [UseDirectory],
-        [UseTotp],
-        [SelfHost],
-        [Storage],
-        [MaxStorageGb],
-        [Gateway],
-        [GatewayCustomerId],
-        [GatewaySubscriptionId],
-        [Enabled],
-        [LicenseKey],
-        [ExpirationDate],
-        [CreationDate],
-        [RevisionDate]
-    )
-    VALUES
-    (
-        @Id,
-        @Name,
-        @BusinessName,
-        @BusinessAddress1,
-        @BusinessAddress2,
-        @BusinessAddress3,
-        @BusinessCountry,
-        @BusinessTaxNumber,
-        @BillingEmail,
-        @Plan,
-        @PlanType,
-        @Seats,
-        @MaxCollections,
-        @UseGroups,
-        @UseDirectory,
-        @UseTotp,
-        @SelfHost,
-        @Storage,
-        @MaxStorageGb,
-        @Gateway,
-        @GatewayCustomerId,
-        @GatewaySubscriptionId,
-        @Enabled,
-        @LicenseKey,
-        @ExpirationDate,
-        @CreationDate,
-        @RevisionDate
-    )
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_Update]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_Update]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_Update]
-    @Id UNIQUEIDENTIFIER,
-    @Name NVARCHAR(50),
-    @BusinessName NVARCHAR(50),
-    @BusinessAddress1 NVARCHAR(50),
-    @BusinessAddress2 NVARCHAR(50),
-    @BusinessAddress3 NVARCHAR(50),
-    @BusinessCountry VARCHAR(2),
-    @BusinessTaxNumber NVARCHAR(30),
-    @BillingEmail NVARCHAR(50),
-    @Plan NVARCHAR(50),
-    @PlanType TINYINT,
-    @Seats SMALLINT,
-    @MaxCollections SMALLINT,
-    @UseGroups BIT,
-    @UseDirectory BIT,
-    @UseTotp BIT,
-    @SelfHost BIT,
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @Enabled BIT,
-    @LicenseKey VARCHAR(100),
-    @ExpirationDate DATETIME2(7),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    UPDATE
-        [dbo].[Organization]
-    SET
-        [Name] = @Name,
-        [BusinessName] = @BusinessName,
-        [BusinessAddress1] = @BusinessAddress1,
-        [BusinessAddress2] = @BusinessAddress2,
-        [BusinessAddress3] = @BusinessAddress3,
-        [BusinessCountry] = @BusinessCountry,
-        [BusinessTaxNumber] = @BusinessTaxNumber,
-        [BillingEmail] = @BillingEmail,
-        [Plan] = @Plan,
-        [PlanType] = @PlanType,
-        [Seats] = @Seats,
-        [MaxCollections] = @MaxCollections,
-        [UseGroups] = @UseGroups,
-        [UseDirectory] = @UseDirectory,
-        [UseTotp] = @UseTotp,
-        [SelfHost] = @SelfHost,
-        [Storage] = @Storage,
-        [MaxStorageGb] = @MaxStorageGb,
-        [Gateway] = @Gateway,
-        [GatewayCustomerId] = @GatewayCustomerId,
-        [GatewaySubscriptionId] = @GatewaySubscriptionId,
-        [Enabled] = @Enabled,
-        [LicenseKey] = @LicenseKey,
-        [ExpirationDate] = @ExpirationDate,
-        [CreationDate] = @CreationDate,
-        [RevisionDate] = @RevisionDate
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[Cipher_DeleteByUserId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Cipher_DeleteByUserId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Cipher_DeleteByUserId]
-    @UserId AS UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @BatchSize INT = 100
-
-    -- Delete ciphers
-    WHILE @BatchSize > 0
-    BEGIN
-        BEGIN TRANSACTION Cipher_DeleteByUserId_Ciphers
-
-        DELETE TOP(@BatchSize)
-        FROM
-            [dbo].[Cipher]
-        WHERE
-            [UserId] = @UserId
-
-        SET @BatchSize = @@ROWCOUNT
-
-        COMMIT TRANSACTION Cipher_DeleteByUserId_Ciphers
-    END
-
-    -- Cleanup user
-    EXEC [dbo].[User_UpdateStorage] @UserId
-    EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
-END
-GO
-
-IF OBJECT_ID('[dbo].[Cipher_DeleteById]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Cipher_DeleteById]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Cipher_DeleteById]
-    @Id UNIQUEIDENTIFIER
-WITH RECOMPILE
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @UserId UNIQUEIDENTIFIER
-    DECLARE @OrganizationId UNIQUEIDENTIFIER
-    DECLARE @Attachments BIT
-
-    SELECT TOP 1
-        @UserId = [UserId],
-        @OrganizationId = [OrganizationId],
-        @Attachments = CASE WHEN [Attachments] IS NOT NULL THEN 1 ELSE 0 END
-    FROM
-        [dbo].[Cipher]
-    WHERE
-        [Id] = @Id
-
-    DELETE
-    FROM
-        [dbo].[Cipher]
-    WHERE
-        [Id] = @Id
-
-    IF @OrganizationId IS NOT NULL
-    BEGIN
-        IF @Attachments = 1
-        BEGIN
-            EXEC [dbo].[Organization_UpdateStorage] @OrganizationId
-        END
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
-    END
-    ELSE IF @UserId IS NOT NULL
-    BEGIN
-        IF @Attachments = 1
-        BEGIN
-            EXEC [dbo].[User_UpdateStorage] @UserId
-        END
-        EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
-    END
-END
-GO

util/Setup/DbScripts/2017-11-06_00_FamilyPlanAdjustments.sql

@@ -1,250 +0,0 @@
-IF COL_LENGTH('[dbo].[Organization]', 'UsersGetPremium') IS NULL
-BEGIN
-    ALTER TABLE
-        [dbo].[Organization]
-    ADD
-        [UsersGetPremium] BIT NULL
-END
-GO
-
-UPDATE
-    [dbo].[Organization]
-SET
-    [UsersGetPremium] = (CASE WHEN [PlanType] = 5 OR [PlanType] = 4 THEN 1 ELSE 0 END)
-GO
-
-UPDATE
-    [dbo].[Organization]
-SET
-    [Plan] = 'Families'
-WHERE
-    [PlanType] = 1
-GO
-
-ALTER TABLE
-    [dbo].[Organization]
-ALTER COLUMN
-    [UsersGetPremium] BIT NOT NULL
-GO
-
-IF OBJECT_ID('[dbo].[Organization_Create]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_Create]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_Create]
-    @Id UNIQUEIDENTIFIER,
-    @Name NVARCHAR(50),
-    @BusinessName NVARCHAR(50),
-    @BusinessAddress1 NVARCHAR(50),
-    @BusinessAddress2 NVARCHAR(50),
-    @BusinessAddress3 NVARCHAR(50),
-    @BusinessCountry VARCHAR(2),
-    @BusinessTaxNumber NVARCHAR(30),
-    @BillingEmail NVARCHAR(50),
-    @Plan NVARCHAR(50),
-    @PlanType TINYINT,
-    @Seats SMALLINT,
-    @MaxCollections SMALLINT,
-    @UseGroups BIT,
-    @UseDirectory BIT,
-    @UseTotp BIT,
-    @SelfHost BIT,
-    @UsersGetPremium BIT,
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @Enabled BIT,
-    @LicenseKey VARCHAR(100),
-    @ExpirationDate DATETIME2(7),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    INSERT INTO [dbo].[Organization]
-    (
-        [Id],
-        [Name],
-        [BusinessName],
-        [BusinessAddress1],
-        [BusinessAddress2],
-        [BusinessAddress3],
-        [BusinessCountry],
-        [BusinessTaxNumber],
-        [BillingEmail],
-        [Plan],
-        [PlanType],
-        [Seats],
-        [MaxCollections],
-        [UseGroups],
-        [UseDirectory],
-        [UseTotp],
-        [SelfHost],
-        [UsersGetPremium],
-        [Storage],
-        [MaxStorageGb],
-        [Gateway],
-        [GatewayCustomerId],
-        [GatewaySubscriptionId],
-        [Enabled],
-        [LicenseKey],
-        [ExpirationDate],
-        [CreationDate],
-        [RevisionDate]
-    )
-    VALUES
-    (
-        @Id,
-        @Name,
-        @BusinessName,
-        @BusinessAddress1,
-        @BusinessAddress2,
-        @BusinessAddress3,
-        @BusinessCountry,
-        @BusinessTaxNumber,
-        @BillingEmail,
-        @Plan,
-        @PlanType,
-        @Seats,
-        @MaxCollections,
-        @UseGroups,
-        @UseDirectory,
-        @UseTotp,
-        @SelfHost,
-        @UsersGetPremium,
-        @Storage,
-        @MaxStorageGb,
-        @Gateway,
-        @GatewayCustomerId,
-        @GatewaySubscriptionId,
-        @Enabled,
-        @LicenseKey,
-        @ExpirationDate,
-        @CreationDate,
-        @RevisionDate
-    )
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_Update]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_Update]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_Update]
-    @Id UNIQUEIDENTIFIER,
-    @Name NVARCHAR(50),
-    @BusinessName NVARCHAR(50),
-    @BusinessAddress1 NVARCHAR(50),
-    @BusinessAddress2 NVARCHAR(50),
-    @BusinessAddress3 NVARCHAR(50),
-    @BusinessCountry VARCHAR(2),
-    @BusinessTaxNumber NVARCHAR(30),
-    @BillingEmail NVARCHAR(50),
-    @Plan NVARCHAR(50),
-    @PlanType TINYINT,
-    @Seats SMALLINT,
-    @MaxCollections SMALLINT,
-    @UseGroups BIT,
-    @UseDirectory BIT,
-    @UseTotp BIT,
-    @SelfHost BIT,
-    @UsersGetPremium BIT,
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @Enabled BIT,
-    @LicenseKey VARCHAR(100),
-    @ExpirationDate DATETIME2(7),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    UPDATE
-        [dbo].[Organization]
-    SET
-        [Name] = @Name,
-        [BusinessName] = @BusinessName,
-        [BusinessAddress1] = @BusinessAddress1,
-        [BusinessAddress2] = @BusinessAddress2,
-        [BusinessAddress3] = @BusinessAddress3,
-        [BusinessCountry] = @BusinessCountry,
-        [BusinessTaxNumber] = @BusinessTaxNumber,
-        [BillingEmail] = @BillingEmail,
-        [Plan] = @Plan,
-        [PlanType] = @PlanType,
-        [Seats] = @Seats,
-        [MaxCollections] = @MaxCollections,
-        [UseGroups] = @UseGroups,
-        [UseDirectory] = @UseDirectory,
-        [UseTotp] = @UseTotp,
-        [SelfHost] = @SelfHost,
-        [UsersGetPremium] = @UsersGetPremium,
-        [Storage] = @Storage,
-        [MaxStorageGb] = @MaxStorageGb,
-        [Gateway] = @Gateway,
-        [GatewayCustomerId] = @GatewayCustomerId,
-        [GatewaySubscriptionId] = @GatewaySubscriptionId,
-        [Enabled] = @Enabled,
-        [LicenseKey] = @LicenseKey,
-        [ExpirationDate] = @ExpirationDate,
-        [CreationDate] = @CreationDate,
-        [RevisionDate] = @RevisionDate
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'OrganizationUserOrganizationDetailsView')
-BEGIN
-    DROP VIEW [dbo].[OrganizationUserOrganizationDetailsView]
-END
-GO
-
-CREATE VIEW [dbo].[OrganizationUserOrganizationDetailsView]
-AS
-SELECT
-    OU.[UserId],
-    OU.[OrganizationId],
-    O.[Name],
-    O.[Enabled],
-    O.[UseGroups],
-    O.[UseDirectory],
-    O.[UseTotp],
-    O.[SelfHost],
-    O.[UsersGetPremium],
-    O.[Seats],
-    O.[MaxCollections],
-    O.[MaxStorageGb],
-    OU.[Key],
-    OU.[Status],
-    OU.[Type]
-FROM
-    [dbo].[OrganizationUser] OU
-INNER JOIN
-    [dbo].[Organization] O ON O.[Id] = OU.[OrganizationId]
-GO
-
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'OrganizationView')
-BEGIN
-    DROP VIEW [dbo].[OrganizationView]
-END
-GO
-
-CREATE VIEW [dbo].[OrganizationView]
-AS
-SELECT
-    *
-FROM
-    [dbo].[Organization]
-GO

util/Setup/DbScripts/2017-11-13_00_IndexTuning.sql

@@ -1,76 +0,0 @@
-IF OBJECT_ID('[dbo].[OrganizationUser_ReadByOrganizationIdEmail]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[OrganizationUser_ReadByOrganizationIdEmail]
-END
-GO
-
-IF OBJECT_ID('[dbo].[OrganizationUser_ReadCountByOrganizationIdEmail]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[OrganizationUser_ReadCountByOrganizationIdEmail]
-END
-GO
-
-CREATE PROCEDURE [dbo].[OrganizationUser_ReadCountByOrganizationIdEmail]
-    @OrganizationId UNIQUEIDENTIFIER,
-    @Email NVARCHAR(50),
-    @OnlyUsers BIT
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        COUNT(1)
-    FROM
-        [dbo].[OrganizationUser] OU
-    LEFT JOIN
-        [dbo].[User] U ON OU.[UserId] = U.[Id]
-    WHERE
-        OU.[OrganizationId] = @OrganizationId
-        AND (
-            (@OnlyUsers = 0 AND (OU.[Email] = @Email OR U.[Email] = @Email))
-            OR (@OnlyUsers = 1 AND U.[Email] = @Email)
-        )
-END
-GO
-
-IF EXISTS (
-    SELECT *  FROM sys.indexes  WHERE [Name]='IX_Cipher_UserId_Type'
-    AND object_id = OBJECT_ID('[dbo].[Cipher]')
-)
-BEGIN
-    DROP INDEX [IX_Cipher_UserId_Type] ON [dbo].[Cipher]
-END
-GO
-
-IF NOT EXISTS (
-    SELECT *  FROM sys.indexes  WHERE [Name]='IX_Cipher_UserId_Type_IncludeAll'
-    AND object_id = OBJECT_ID('[dbo].[Cipher]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_Cipher_UserId_Type_IncludeAll]
-        ON [dbo].[Cipher]([UserId] ASC, [Type] ASC)
-        INCLUDE ([OrganizationId], [Data], [Favorites], [Folders], [Attachments], [CreationDate], [RevisionDate])
-END
-GO
-
-IF NOT EXISTS (
-    SELECT *  FROM sys.indexes  WHERE [Name] = 'IX_Folder_UserId_IncludeAll'
-    AND object_id = OBJECT_ID('[dbo].[Folder]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_Folder_UserId_IncludeAll]
-        ON [dbo].[Folder]([UserId] ASC)
-        INCLUDE ([Name], [CreationDate], [RevisionDate])
-END
-GO
-
-IF NOT EXISTS (
-    SELECT *  FROM sys.indexes  WHERE [Name] = 'IX_OrganizationUser_UserIdOrganizationIdStatus'
-    AND object_id = OBJECT_ID('[dbo].[OrganizationUser]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_OrganizationUser_UserIdOrganizationIdStatus]
-        ON [dbo].[OrganizationUser]([UserId] ASC,[OrganizationId] ASC,[Status] ASC)
-        INCLUDE ([AccessAll])
-END
-GO

util/Setup/DbScripts/2017-12-12_00_Events.sql

@@ -1,498 +0,0 @@
-IF COL_LENGTH('[dbo].[Organization]', 'UseEvents') IS NULL
-BEGIN
-    ALTER TABLE
-        [dbo].[Organization]
-    ADD
-        [UseEvents] BIT NULL
-END
-GO
-
-UPDATE
-    [dbo].[Organization]
-SET
-    [UseEvents] = (CASE WHEN [PlanType] = 5 OR [PlanType] = 4 THEN 1 ELSE 0 END)
-GO
-
-ALTER TABLE
-    [dbo].[Organization]
-ALTER COLUMN
-    [UseEvents] BIT NOT NULL
-GO
-
-IF OBJECT_ID('[dbo].[Organization_Create]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_Create]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_Create]
-    @Id UNIQUEIDENTIFIER,
-    @Name NVARCHAR(50),
-    @BusinessName NVARCHAR(50),
-    @BusinessAddress1 NVARCHAR(50),
-    @BusinessAddress2 NVARCHAR(50),
-    @BusinessAddress3 NVARCHAR(50),
-    @BusinessCountry VARCHAR(2),
-    @BusinessTaxNumber NVARCHAR(30),
-    @BillingEmail NVARCHAR(50),
-    @Plan NVARCHAR(50),
-    @PlanType TINYINT,
-    @Seats SMALLINT,
-    @MaxCollections SMALLINT,
-    @UseGroups BIT,
-    @UseDirectory BIT,
-    @UseEvents BIT,
-    @UseTotp BIT,
-    @SelfHost BIT,
-    @UsersGetPremium BIT,
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @Enabled BIT,
-    @LicenseKey VARCHAR(100),
-    @ExpirationDate DATETIME2(7),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    INSERT INTO [dbo].[Organization]
-    (
-        [Id],
-        [Name],
-        [BusinessName],
-        [BusinessAddress1],
-        [BusinessAddress2],
-        [BusinessAddress3],
-        [BusinessCountry],
-        [BusinessTaxNumber],
-        [BillingEmail],
-        [Plan],
-        [PlanType],
-        [Seats],
-        [MaxCollections],
-        [UseGroups],
-        [UseDirectory],
-        [UseEvents],
-        [UseTotp],
-        [SelfHost],
-        [UsersGetPremium],
-        [Storage],
-        [MaxStorageGb],
-        [Gateway],
-        [GatewayCustomerId],
-        [GatewaySubscriptionId],
-        [Enabled],
-        [LicenseKey],
-        [ExpirationDate],
-        [CreationDate],
-        [RevisionDate]
-    )
-    VALUES
-    (
-        @Id,
-        @Name,
-        @BusinessName,
-        @BusinessAddress1,
-        @BusinessAddress2,
-        @BusinessAddress3,
-        @BusinessCountry,
-        @BusinessTaxNumber,
-        @BillingEmail,
-        @Plan,
-        @PlanType,
-        @Seats,
-        @MaxCollections,
-        @UseGroups,
-        @UseDirectory,
-        @UseEvents,
-        @UseTotp,
-        @SelfHost,
-        @UsersGetPremium,
-        @Storage,
-        @MaxStorageGb,
-        @Gateway,
-        @GatewayCustomerId,
-        @GatewaySubscriptionId,
-        @Enabled,
-        @LicenseKey,
-        @ExpirationDate,
-        @CreationDate,
-        @RevisionDate
-    )
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_Update]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_Update]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_Update]
-    @Id UNIQUEIDENTIFIER,
-    @Name NVARCHAR(50),
-    @BusinessName NVARCHAR(50),
-    @BusinessAddress1 NVARCHAR(50),
-    @BusinessAddress2 NVARCHAR(50),
-    @BusinessAddress3 NVARCHAR(50),
-    @BusinessCountry VARCHAR(2),
-    @BusinessTaxNumber NVARCHAR(30),
-    @BillingEmail NVARCHAR(50),
-    @Plan NVARCHAR(50),
-    @PlanType TINYINT,
-    @Seats SMALLINT,
-    @MaxCollections SMALLINT,
-    @UseGroups BIT,
-    @UseDirectory BIT,
-    @UseEvents BIT,
-    @UseTotp BIT,
-    @SelfHost BIT,
-    @UsersGetPremium BIT,
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @Enabled BIT,
-    @LicenseKey VARCHAR(100),
-    @ExpirationDate DATETIME2(7),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    UPDATE
-        [dbo].[Organization]
-    SET
-        [Name] = @Name,
-        [BusinessName] = @BusinessName,
-        [BusinessAddress1] = @BusinessAddress1,
-        [BusinessAddress2] = @BusinessAddress2,
-        [BusinessAddress3] = @BusinessAddress3,
-        [BusinessCountry] = @BusinessCountry,
-        [BusinessTaxNumber] = @BusinessTaxNumber,
-        [BillingEmail] = @BillingEmail,
-        [Plan] = @Plan,
-        [PlanType] = @PlanType,
-        [Seats] = @Seats,
-        [MaxCollections] = @MaxCollections,
-        [UseGroups] = @UseGroups,
-        [UseDirectory] = @UseDirectory,
-        [UseEvents] = @UseEvents,
-        [UseTotp] = @UseTotp,
-        [SelfHost] = @SelfHost,
-        [UsersGetPremium] = @UsersGetPremium,
-        [Storage] = @Storage,
-        [MaxStorageGb] = @MaxStorageGb,
-        [Gateway] = @Gateway,
-        [GatewayCustomerId] = @GatewayCustomerId,
-        [GatewaySubscriptionId] = @GatewaySubscriptionId,
-        [Enabled] = @Enabled,
-        [LicenseKey] = @LicenseKey,
-        [ExpirationDate] = @ExpirationDate,
-        [CreationDate] = @CreationDate,
-        [RevisionDate] = @RevisionDate
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_ReadAbilities]') IS NULL
-BEGIN
-    EXEC('CREATE PROCEDURE [dbo].[Organization_ReadAbilities] AS BEGIN SET NOCOUNT ON; END')
-END
-GO
-
-ALTER PROCEDURE [dbo].[Organization_ReadAbilities]
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        [Id],
-        [UseEvents],
-        [Enabled]
-    FROM
-        [dbo].[Organization]
-END
-GO
-
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'OrganizationView')
-BEGIN
-    DROP VIEW [dbo].[OrganizationView]
-END
-GO
-
-CREATE VIEW [dbo].[OrganizationView]
-AS
-SELECT
-    *
-FROM
-    [dbo].[Organization]
-GO
-
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'OrganizationUserOrganizationDetailsView')
-BEGIN
-    DROP VIEW [dbo].[OrganizationUserOrganizationDetailsView]
-END
-GO
-
-CREATE VIEW [dbo].[OrganizationUserOrganizationDetailsView]
-AS
-SELECT
-    OU.[UserId],
-    OU.[OrganizationId],
-    O.[Name],
-    O.[Enabled],
-    O.[UseGroups],
-    O.[UseDirectory],
-    O.[UseEvents],
-    O.[UseTotp],
-    O.[SelfHost],
-    O.[UsersGetPremium],
-    O.[Seats],
-    O.[MaxCollections],
-    O.[MaxStorageGb],
-    OU.[Key],
-    OU.[Status],
-    OU.[Type]
-FROM
-    [dbo].[OrganizationUser] OU
-INNER JOIN
-    [dbo].[Organization] O ON O.[Id] = OU.[OrganizationId]
-GO
-
-IF OBJECT_ID('[dbo].[Event]') IS NULL
-BEGIN
-    CREATE TABLE [dbo].[Event] (
-        [Id]                    UNIQUEIDENTIFIER NOT NULL,
-        [Type]                  INT              NOT NULL,
-        [UserId]                UNIQUEIDENTIFIER NULL,
-        [OrganizationId]        UNIQUEIDENTIFIER NULL,
-        [CipherId]              UNIQUEIDENTIFIER NULL,
-        [CollectionId]          UNIQUEIDENTIFIER NULL,
-        [GroupId]               UNIQUEIDENTIFIER NULL,
-        [OrganizationUserId]    UNIQUEIDENTIFIER NULL,
-        [ActingUserId]          UNIQUEIDENTIFIER NULL,
-        [DeviceType]            SMALLINT         NULL,
-        [IpAddress]             VARCHAR(50)      NULL,
-        [Date]                  DATETIME2 (7)    NOT NULL,
-        CONSTRAINT [PK_Event] PRIMARY KEY CLUSTERED ([Id] ASC)
-    );
-
-    CREATE NONCLUSTERED INDEX [IX_Event_DateOrganizationIdUserId]
-        ON [dbo].[Event]([Date] DESC, [OrganizationId] ASC, [ActingUserId] ASC, [CipherId] ASC);
-END
-GO
-
-IF OBJECT_ID('[dbo].[Event_Create]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Event_Create]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Event_Create]
-    @Id UNIQUEIDENTIFIER,
-    @Type INT,
-    @UserId UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @CipherId UNIQUEIDENTIFIER,
-    @CollectionId UNIQUEIDENTIFIER,
-    @GroupId UNIQUEIDENTIFIER,
-    @OrganizationUserId UNIQUEIDENTIFIER,
-    @ActingUserId UNIQUEIDENTIFIER,
-    @DeviceType SMALLINT,
-    @IpAddress VARCHAR(50),
-    @Date DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    INSERT INTO [dbo].[Event]
-    (
-        [Id],
-        [Type],
-        [UserId],
-        [OrganizationId],
-        [CipherId],
-        [CollectionId],
-        [GroupId],
-        [OrganizationUserId],
-        [ActingUserId],
-        [DeviceType],
-        [IpAddress],
-        [Date]
-    )
-    VALUES
-    (
-        @Id,
-        @Type,
-        @UserId,
-        @OrganizationId,
-        @CipherId,
-        @CollectionId,
-        @GroupId,
-        @OrganizationUserId,
-        @ActingUserId,
-        @DeviceType,
-        @IpAddress,
-        @Date
-    )
-END
-GO
-
-IF OBJECT_ID('[dbo].[Event_ReadPageByCipherId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Event_ReadPageByCipherId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Event_ReadPageByCipherId]
-    @OrganizationId UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @CipherId UNIQUEIDENTIFIER,
-    @StartDate DATETIME2(7),
-    @EndDate DATETIME2(7),
-    @BeforeDate DATETIME2(7),
-    @PageSize INT
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[EventView]
-    WHERE
-        [Date] >= @StartDate
-        AND (@BeforeDate IS NOT NULL OR [Date] <= @EndDate)
-        AND (@BeforeDate IS NULL OR [Date] < @BeforeDate)
-        AND (
-            (@OrganizationId IS NULL AND [OrganizationId] IS NULL)
-            OR (@OrganizationId IS NOT NULL AND [OrganizationId] = @OrganizationId)
-        )
-        AND (
-            (@UserId IS NULL AND [UserId] IS NULL)
-            OR (@UserId IS NOT NULL AND [UserId] = @UserId)
-        )
-        AND [CipherId]  = @CipherId
-    ORDER BY [Date] DESC
-    OFFSET 0 ROWS
-    FETCH NEXT @PageSize ROWS ONLY
-END
-GO
-
-IF OBJECT_ID('[dbo].[Event_ReadPageByOrganizationId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Event_ReadPageByOrganizationId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Event_ReadPageByOrganizationId]
-    @OrganizationId UNIQUEIDENTIFIER,
-    @StartDate DATETIME2(7),
-    @EndDate DATETIME2(7),
-    @BeforeDate DATETIME2(7),
-    @PageSize INT
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[EventView]
-    WHERE
-        [Date] >= @StartDate
-        AND (@BeforeDate IS NOT NULL OR [Date] <= @EndDate)
-        AND (@BeforeDate IS NULL OR [Date] < @BeforeDate)
-        AND [OrganizationId] = @OrganizationId
-    ORDER BY [Date] DESC
-    OFFSET 0 ROWS
-    FETCH NEXT @PageSize ROWS ONLY
-END
-GO
-
-IF OBJECT_ID('[dbo].[Event_ReadPageByOrganizationIdActingUserId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Event_ReadPageByOrganizationIdActingUserId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Event_ReadPageByOrganizationIdActingUserId]
-    @OrganizationId UNIQUEIDENTIFIER,
-    @ActingUserId UNIQUEIDENTIFIER,
-    @StartDate DATETIME2(7),
-    @EndDate DATETIME2(7),
-    @BeforeDate DATETIME2(7),
-    @PageSize INT
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[EventView]
-    WHERE
-        [Date] >= @StartDate
-        AND (@BeforeDate IS NOT NULL OR [Date] <= @EndDate)
-        AND (@BeforeDate IS NULL OR [Date] < @BeforeDate)
-        AND [OrganizationId] = @OrganizationId
-        AND [ActingUserId] = @ActingUserId
-    ORDER BY [Date] DESC
-    OFFSET 0 ROWS
-    FETCH NEXT @PageSize ROWS ONLY
-END
-GO
-
-IF OBJECT_ID('[dbo].[Event_ReadPageByUserId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Event_ReadPageByUserId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Event_ReadPageByUserId]
-    @UserId UNIQUEIDENTIFIER,
-    @StartDate DATETIME2(7),
-    @EndDate DATETIME2(7),
-    @BeforeDate DATETIME2(7),
-    @PageSize INT
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[EventView]
-    WHERE
-        [Date] >= @StartDate
-        AND (@BeforeDate IS NOT NULL OR [Date] <= @EndDate)
-        AND (@BeforeDate IS NULL OR [Date] < @BeforeDate)
-        AND [OrganizationId] IS NULL
-        AND [ActingUserId] = @UserId
-    ORDER BY [Date] DESC
-    OFFSET 0 ROWS
-    FETCH NEXT @PageSize ROWS ONLY
-END
-GO
-
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'EventView')
-BEGIN
-    DROP VIEW [dbo].[EventView]
-END
-GO
-
-CREATE VIEW [dbo].[EventView]
-AS
-SELECT
-    *
-FROM
-    [dbo].[Event]
-GO

util/Setup/DbScripts/2018-02-28_00_LoginUris.sql

@@ -1,112 +0,0 @@
-/*
-{
-    "Name":"2.xx",
-    "Uri":"2.yy",
-    "Username":"2.zz",
-    "Password":"2.aa"
-}
-=>
-{
-    "Name":"2.xx",
-    "Username":"2.zz",
-    "Password":"2.aa",
-    "Uris":[{"Uri": "2.yy"}]
-}
-*/
-
-IF NOT EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'CompletedIds')
-BEGIN
-    CREATE TABLE [CompletedIds] ([Id] UNIQUEIDENTIFIER PRIMARY KEY)
-END
-GO
-
-DECLARE @UriPath VARCHAR(50) = '$.Uri'
-DECLARE @UrisPath VARCHAR(50) = '$.Uris'
-DECLARE @BatchSize INT = 1000
-DECLARE @LastId UNIQUEIDENTIFIER = NULL
-
--- Step 1: Add new Uris property with data from Uri
-WHILE @BatchSize > 0
-BEGIN
-    SELECT TOP 1
-        @LastId = [Id]
-    FROM
-        [CompletedIds]
-    ORDER BY
-        [Id] DESC
-
-    ;WITH [CTE] AS (
-        SELECT TOP (@BatchSize)
-            *
-        FROM
-            [Cipher]
-        WHERE
-            (@LastId IS NULL OR [Id] > @LastId)
-            AND JSON_VALUE([Data], @UriPath) IS NOT NULL
-            AND JSON_QUERY([Data], @UrisPath) IS NULL
-        ORDER BY
-            [Id] ASC
-    )
-    UPDATE
-        [CTE]
-    SET
-        [Data] = JSON_MODIFY(
-            [Data],
-            @UrisPath,
-            JSON_QUERY(
-                '[{"Uri":"' + CAST(JSON_VALUE([Data], @UriPath) AS NVARCHAR(MAX)) + '"}]',
-                '$'
-            )
-        )
-    OUTPUT INSERTED.[Id] INTO [CompletedIds]
-
-    SET @BatchSize = @@ROWCOUNT
-    RAISERROR('Updated %d ciphers with Uris', 0, 1, @BatchSize) WITH NOWAIT
-END
-GO
-
--- Reset
-TRUNCATE TABLE [CompletedIds]
-DECLARE @UriPath VARCHAR(50) = '$.Uri'
-DECLARE @UrisPath VARCHAR(50) = '$.Uris'
-DECLARE @BatchSize INT = 1000
-DECLARE @LastId UNIQUEIDENTIFIER = NULL
-
--- Step 2: Remove old Uri Property
-WHILE @BatchSize > 0
-BEGIN
-    SELECT TOP 1
-        @LastId = [Id]
-    FROM
-        [CompletedIds]
-    ORDER BY
-        [Id] DESC
-
-    ;WITH [CTE] AS (
-        SELECT TOP (@BatchSize)
-            *
-        FROM
-            [Cipher]
-        WHERE
-            (@LastId IS NULL OR [Id] > @LastId)
-            AND JSON_VALUE([Data], @UriPath) IS NOT NULL
-            AND JSON_QUERY([Data], @UrisPath) IS NOT NULL
-        ORDER BY
-            [Id] ASC
-    )
-    UPDATE
-        [CTE]
-    SET
-        [Data] = JSON_MODIFY([Data], @UriPath, NULL)
-    OUTPUT INSERTED.[Id] INTO [CompletedIds]
-
-    SET @BatchSize = @@ROWCOUNT
-    RAISERROR('Updated %d ciphers with Uri removal', 0, 1, @BatchSize) WITH NOWAIT
-END
-GO
-
-IF EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'CompletedIds')
-BEGIN
-    DROP TABLE [CompletedIds]
-END
-GO

util/Setup/DbScripts/2018-03-12_00_FixLoginUris.sql

@@ -1,69 +0,0 @@
-/*
-{
-    "Name":"2.xx",
-    "Username":"2.zz",
-    "Password":"2.aa",
-    "Uris":"[{\"Uri\":\"2.yy\"}]"
-}
-=>
-{
-    "Name":"2.xx",
-    "Username":"2.zz",
-    "Password":"2.aa",
-    "Uris":[{"Uri": "2.yy"}]
-}
-*/
-
-IF NOT EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'CompletedIds')
-BEGIN
-    CREATE TABLE [CompletedIds] ([Id] UNIQUEIDENTIFIER PRIMARY KEY)
-END
-GO
-
-DECLARE @UrisPath VARCHAR(50) = '$.Uris'
-DECLARE @BatchSize INT = 1000
-DECLARE @LastId UNIQUEIDENTIFIER = NULL
-
-WHILE @BatchSize > 0
-BEGIN
-    SELECT TOP 1
-        @LastId = [Id]
-    FROM
-        [CompletedIds]
-    ORDER BY
-        [Id] DESC
-
-    ;WITH [CTE] AS (
-        SELECT TOP (@BatchSize)
-            *
-        FROM
-            [Cipher]
-        WHERE
-            (@LastId IS NULL OR [Id] > @LastId)
-            AND LEFT(JSON_VALUE([Data], @UrisPath), 8) = '[{"Uri":'
-        ORDER BY
-            [Id] ASC
-    )
-    UPDATE
-        [CTE]
-    SET
-        [Data] = JSON_MODIFY(
-            [Data],
-            @UrisPath,
-            JSON_QUERY(
-                JSON_VALUE([Data], @UrisPath),
-                '$'
-            )
-        )
-    OUTPUT INSERTED.[Id] INTO [CompletedIds]
-
-    SET @BatchSize = @@ROWCOUNT
-    RAISERROR('Updated %d ciphers with Uris', 0, 1, @BatchSize) WITH NOWAIT
-END
-GO
-
-IF EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'CompletedIds')
-BEGIN
-    DROP TABLE [CompletedIds]
-END
-GO

util/Setup/DbScripts/2018-03-21_00_AdminPortal.sql

@@ -1,232 +0,0 @@
-IF OBJECT_ID('[dbo].[User_Search]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[User_Search]
-END
-GO
-
-CREATE PROCEDURE [dbo].[User_Search]
-    @Email NVARCHAR(50),
-    @Skip INT = 0,
-    @Take INT = 25
-WITH RECOMPILE
-AS
-BEGIN
-    SET NOCOUNT ON
-    DECLARE @EmailLikeSearch NVARCHAR(55) = @Email + '%'
-
-    SELECT
-        *
-    FROM
-        [dbo].[UserView]
-    WHERE
-        (@Email IS NULL OR [Email] LIKE @EmailLikeSearch)
-    ORDER BY [Email] ASC
-    OFFSET @Skip ROWS
-    FETCH NEXT @Take ROWS ONLY
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_Search]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_Search]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_Search]
-    @Name NVARCHAR(50),
-    @UserEmail NVARCHAR(50),
-    @Paid BIT,
-    @Skip INT = 0,
-    @Take INT = 25
-WITH RECOMPILE
-AS
-BEGIN
-    SET NOCOUNT ON
-    DECLARE @NameLikeSearch NVARCHAR(55) = '%' + @Name + '%'
-
-    IF @UserEmail IS NOT NULL
-    BEGIN
-        SELECT
-            O.*
-        FROM
-            [dbo].[OrganizationView] O
-        INNER JOIN
-            [dbo].[OrganizationUser] OU ON O.[Id] = OU.[OrganizationId]
-        INNER JOIN
-            [dbo].[User] U ON U.[Id] = OU.[UserId]
-        WHERE
-            (@Name IS NULL OR O.[Name] LIKE @NameLikeSearch)
-            AND (@UserEmail IS NULL OR U.[Email] = @UserEmail)
-            AND
-            (
-                @Paid IS NULL OR
-                (
-                    (@Paid = 1 AND O.[GatewaySubscriptionId] IS NOT NULL) OR
-                    (@Paid = 0 AND O.[GatewaySubscriptionId] IS NULL)
-                )
-            )
-        ORDER BY O.[CreationDate] DESC
-        OFFSET @Skip ROWS
-        FETCH NEXT @Take ROWS ONLY
-    END
-    ELSE
-    BEGIN
-        SELECT
-            O.*
-        FROM
-            [dbo].[OrganizationView] O
-        WHERE
-            (@Name IS NULL OR O.[Name] LIKE @NameLikeSearch)
-            AND
-            (
-                @Paid IS NULL OR
-                (
-                    (@Paid = 1 AND O.[GatewaySubscriptionId] IS NOT NULL) OR
-                    (@Paid = 0 AND O.[GatewaySubscriptionId] IS NULL)
-                )
-            )
-        ORDER BY O.[CreationDate] DESC
-        OFFSET @Skip ROWS
-        FETCH NEXT @Take ROWS ONLY
-    END
-END
-GO
-
-IF OBJECT_ID('[dbo].[Folder_DeleteById]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Folder_DeleteById]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Folder_DeleteById]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @UserId UNIQUEIDENTIFIER = (SELECT TOP 1 [UserId] FROM [dbo].[Folder] WHERE [Id] = @Id)
-    DECLARE @UserIdPath VARCHAR(50) = CONCAT('$."', @UserId, '"')
-
-    UPDATE
-        C
-    SET
-        C.[Folders] = JSON_MODIFY(C.[Folders], @UserIdPath, NULL)
-    FROM
-        [dbo].[Cipher] C
-    LEFT JOIN
-        [dbo].[Organization] O ON C.[UserId] IS NULL AND O.[Id] = C.[OrganizationId]
-    LEFT JOIN
-        [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
-    LEFT JOIN
-        [dbo].[CollectionCipher] CC ON C.[UserId] IS NULL AND OU.[AccessAll] = 0 AND CC.[CipherId] = C.[Id]
-    LEFT JOIN
-        [dbo].[CollectionUser] CU ON CU.[CollectionId] = CC.[CollectionId] AND CU.[OrganizationUserId] = OU.[Id]
-    WHERE
-        (
-            C.[UserId] = @UserId
-            OR (
-                C.[UserId] IS NULL
-                AND (OU.[AccessAll] = 1 OR CU.[CollectionId] IS NOT NULL)
-            )
-        )
-        AND JSON_VALUE(C.[Folders], @UserIdPath) = @Id
-
-    DELETE
-    FROM
-        [dbo].[Folder]
-    WHERE
-        [Id] = @Id
-
-    EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_UpdateStorage]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_UpdateStorage]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_UpdateStorage]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @Storage BIGINT
-
-    ;WITH [CTE] AS (
-        SELECT
-            [Id],
-            (
-                SELECT
-                    SUM(CAST(JSON_VALUE(value,'$.Size') AS BIGINT))
-                FROM
-                    OPENJSON([Attachments])
-            ) [Size]
-        FROM
-            [dbo].[Cipher]
-    )
-    SELECT
-        @Storage = SUM([CTE].[Size])
-    FROM
-        [dbo].[Cipher] C
-    LEFT JOIN
-        [CTE] ON C.[Id] = [CTE].[Id]
-    WHERE
-        C.[OrganizationId] = @Id
-
-    UPDATE
-        [dbo].[Organization]
-    SET
-        [Storage] = @Storage,
-        [RevisionDate] = GETUTCDATE()
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[User_UpdateStorage]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[User_UpdateStorage]
-END
-GO
-
-CREATE PROCEDURE [dbo].[User_UpdateStorage]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @Storage BIGINT
-
-    ;WITH [CTE] AS (
-        SELECT
-            [Id],
-            (
-                SELECT
-                    SUM(CAST(JSON_VALUE(value,'$.Size') AS BIGINT))
-                FROM
-                    OPENJSON([Attachments])
-            ) [Size]
-        FROM
-            [dbo].[Cipher]
-    )
-    SELECT
-        @Storage = SUM([CTE].[Size])
-    FROM
-        [dbo].[Cipher] C
-    LEFT JOIN
-        [CTE] ON C.[Id] = [CTE].[Id]
-    WHERE
-        C.[UserId] = @Id
-
-    UPDATE
-        [dbo].[User]
-    SET
-        [Storage] = @Storage,
-        [RevisionDate] = GETUTCDATE()
-    WHERE
-        [Id] = @Id
-END
-GO

util/Setup/DbScripts/2018-04-02_00_Org2fa.sql

@@ -1,295 +0,0 @@
-IF COL_LENGTH('[dbo].[Organization]', 'Use2fa') IS NULL
-BEGIN
-    ALTER TABLE
-        [dbo].[Organization]
-    ADD
-        [Use2fa] BIT NULL
-END
-GO
-
-UPDATE
-    [dbo].[Organization]
-SET
-    [Use2fa] = (CASE WHEN [PlanType] = 5 OR [PlanType] = 4 THEN 1 ELSE 0 END)
-GO
-
-ALTER TABLE
-    [dbo].[Organization]
-ALTER COLUMN
-    [Use2fa] BIT NOT NULL
-GO
-
-IF COL_LENGTH('[dbo].[Organization]', 'TwoFactorProviders') IS NULL
-BEGIN
-    ALTER TABLE
-        [dbo].[Organization]
-    ADD
-        [TwoFactorProviders] NVARCHAR(MAX) NULL
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_Create]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_Create]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_Create]
-    @Id UNIQUEIDENTIFIER,
-    @Name NVARCHAR(50),
-    @BusinessName NVARCHAR(50),
-    @BusinessAddress1 NVARCHAR(50),
-    @BusinessAddress2 NVARCHAR(50),
-    @BusinessAddress3 NVARCHAR(50),
-    @BusinessCountry VARCHAR(2),
-    @BusinessTaxNumber NVARCHAR(30),
-    @BillingEmail NVARCHAR(50),
-    @Plan NVARCHAR(50),
-    @PlanType TINYINT,
-    @Seats SMALLINT,
-    @MaxCollections SMALLINT,
-    @UseGroups BIT,
-    @UseDirectory BIT,
-    @UseEvents BIT,
-    @UseTotp BIT,
-    @Use2fa BIT,
-    @SelfHost BIT,
-    @UsersGetPremium BIT,
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @Enabled BIT,
-    @LicenseKey VARCHAR(100),
-    @TwoFactorProviders NVARCHAR(MAX),
-    @ExpirationDate DATETIME2(7),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    INSERT INTO [dbo].[Organization]
-    (
-        [Id],
-        [Name],
-        [BusinessName],
-        [BusinessAddress1],
-        [BusinessAddress2],
-        [BusinessAddress3],
-        [BusinessCountry],
-        [BusinessTaxNumber],
-        [BillingEmail],
-        [Plan],
-        [PlanType],
-        [Seats],
-        [MaxCollections],
-        [UseGroups],
-        [UseDirectory],
-        [UseEvents],
-        [UseTotp],
-        [Use2fa],
-        [SelfHost],
-        [UsersGetPremium],
-        [Storage],
-        [MaxStorageGb],
-        [Gateway],
-        [GatewayCustomerId],
-        [GatewaySubscriptionId],
-        [Enabled],
-        [LicenseKey],
-        [TwoFactorProviders],
-        [ExpirationDate],
-        [CreationDate],
-        [RevisionDate]
-    )
-    VALUES
-    (
-        @Id,
-        @Name,
-        @BusinessName,
-        @BusinessAddress1,
-        @BusinessAddress2,
-        @BusinessAddress3,
-        @BusinessCountry,
-        @BusinessTaxNumber,
-        @BillingEmail,
-        @Plan,
-        @PlanType,
-        @Seats,
-        @MaxCollections,
-        @UseGroups,
-        @UseDirectory,
-        @UseEvents,
-        @UseTotp,
-        @Use2fa,
-        @SelfHost,
-        @UsersGetPremium,
-        @Storage,
-        @MaxStorageGb,
-        @Gateway,
-        @GatewayCustomerId,
-        @GatewaySubscriptionId,
-        @Enabled,
-        @LicenseKey,
-        @TwoFactorProviders,
-        @ExpirationDate,
-        @CreationDate,
-        @RevisionDate
-    )
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_Update]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_Update]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_Update]
-    @Id UNIQUEIDENTIFIER,
-    @Name NVARCHAR(50),
-    @BusinessName NVARCHAR(50),
-    @BusinessAddress1 NVARCHAR(50),
-    @BusinessAddress2 NVARCHAR(50),
-    @BusinessAddress3 NVARCHAR(50),
-    @BusinessCountry VARCHAR(2),
-    @BusinessTaxNumber NVARCHAR(30),
-    @BillingEmail NVARCHAR(50),
-    @Plan NVARCHAR(50),
-    @PlanType TINYINT,
-    @Seats SMALLINT,
-    @MaxCollections SMALLINT,
-    @UseGroups BIT,
-    @UseDirectory BIT,
-    @UseEvents BIT,
-    @UseTotp BIT,
-    @Use2fa BIT,
-    @SelfHost BIT,
-    @UsersGetPremium BIT,
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @Enabled BIT,
-    @LicenseKey VARCHAR(100),
-    @TwoFactorProviders NVARCHAR(MAX),
-    @ExpirationDate DATETIME2(7),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    UPDATE
-        [dbo].[Organization]
-    SET
-        [Name] = @Name,
-        [BusinessName] = @BusinessName,
-        [BusinessAddress1] = @BusinessAddress1,
-        [BusinessAddress2] = @BusinessAddress2,
-        [BusinessAddress3] = @BusinessAddress3,
-        [BusinessCountry] = @BusinessCountry,
-        [BusinessTaxNumber] = @BusinessTaxNumber,
-        [BillingEmail] = @BillingEmail,
-        [Plan] = @Plan,
-        [PlanType] = @PlanType,
-        [Seats] = @Seats,
-        [MaxCollections] = @MaxCollections,
-        [UseGroups] = @UseGroups,
-        [UseDirectory] = @UseDirectory,
-        [UseEvents] = @UseEvents,
-        [UseTotp] = @UseTotp,
-        [Use2fa] = @Use2fa,
-        [SelfHost] = @SelfHost,
-        [UsersGetPremium] = @UsersGetPremium,
-        [Storage] = @Storage,
-        [MaxStorageGb] = @MaxStorageGb,
-        [Gateway] = @Gateway,
-        [GatewayCustomerId] = @GatewayCustomerId,
-        [GatewaySubscriptionId] = @GatewaySubscriptionId,
-        [Enabled] = @Enabled,
-        [LicenseKey] = @LicenseKey,
-        [TwoFactorProviders] = @TwoFactorProviders,
-        [ExpirationDate] = @ExpirationDate,
-        [CreationDate] = @CreationDate,
-        [RevisionDate] = @RevisionDate
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_ReadAbilities]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_ReadAbilities]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_ReadAbilities]
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        [Id],
-        [UseEvents],
-        [Use2fa],
-        CASE 
-        WHEN [Use2fa] = 1 AND [TwoFactorProviders] IS NOT NULL AND [TwoFactorProviders] != '{}' THEN
-            1
-        ELSE
-            0
-        END AS [Using2fa],
-        [Enabled]
-    FROM
-        [dbo].[Organization]
-END
-GO
-
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'OrganizationView')
-BEGIN
-    DROP VIEW [dbo].[OrganizationView]
-END
-GO
-
-CREATE VIEW [dbo].[OrganizationView]
-AS
-SELECT
-    *
-FROM
-    [dbo].[Organization]
-GO
-
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'OrganizationUserOrganizationDetailsView')
-BEGIN
-    DROP VIEW [dbo].[OrganizationUserOrganizationDetailsView]
-END
-GO
-
-CREATE VIEW [dbo].[OrganizationUserOrganizationDetailsView]
-AS
-SELECT
-    OU.[UserId],
-    OU.[OrganizationId],
-    O.[Name],
-    O.[Enabled],
-    O.[UseGroups],
-    O.[UseDirectory],
-    O.[UseEvents],
-    O.[UseTotp],
-    O.[Use2fa],
-    O.[SelfHost],
-    O.[UsersGetPremium],
-    O.[Seats],
-    O.[MaxCollections],
-    O.[MaxStorageGb],
-    OU.[Key],
-    OU.[Status],
-    OU.[Type]
-FROM
-    [dbo].[OrganizationUser] OU
-INNER JOIN
-    [dbo].[Organization] O ON O.[Id] = OU.[OrganizationId]
-GO

util/Setup/DbScripts/2018-04-24_00_CipherQueryTuning.sql

@@ -1,319 +0,0 @@
-IF OBJECT_ID('[dbo].[CipherDetails]') IS NOT NULL
-BEGIN
-    DROP FUNCTION [dbo].[CipherDetails]
-END
-GO
-
-CREATE FUNCTION [dbo].[CipherDetails](@UserId UNIQUEIDENTIFIER)
-RETURNS TABLE
-AS RETURN
-SELECT
-    C.[Id],
-    C.[UserId],
-    C.[OrganizationId],
-    C.[Type],
-    C.[Data],
-    C.[Attachments],
-    C.[CreationDate],
-    C.[RevisionDate],
-    CASE
-        WHEN
-            @UserId IS NULL
-            OR C.[Favorites] IS NULL
-            OR JSON_VALUE(C.[Favorites], CONCAT('$."', @UserId, '"')) IS NULL
-        THEN 0
-        ELSE 1
-    END [Favorite],
-    CASE
-        WHEN
-            @UserId IS NULL
-            OR C.[Folders] IS NULL
-        THEN NULL
-        ELSE TRY_CONVERT(UNIQUEIDENTIFIER, JSON_VALUE(C.[Folders], CONCAT('$."', @UserId, '"')))
-    END [FolderId]
-FROM
-    [dbo].[Cipher] C
-GO
-
-IF OBJECT_ID('[dbo].[UserCipherDetails]') IS NOT NULL
-BEGIN
-    DROP FUNCTION [dbo].[UserCipherDetails]
-END
-GO
-
-CREATE FUNCTION [dbo].[UserCipherDetails](@UserId UNIQUEIDENTIFIER)
-RETURNS TABLE
-AS RETURN
-WITH [CTE] AS (
-    SELECT
-        [Id],
-        [OrganizationId],
-        [AccessAll]
-    FROM
-        [OrganizationUser]
-    WHERE
-        [UserId] = @UserId
-        AND [Status] = 2 -- Confirmed
-)
-SELECT
-    C.*,
-    CASE
-        WHEN
-            OU.[AccessAll] = 1
-            OR CU.[ReadOnly] = 0
-            OR G.[AccessAll] = 1
-            OR CG.[ReadOnly] = 0
-        THEN 1
-        ELSE 0
-    END [Edit],
-    CASE
-        WHEN O.[UseTotp] = 1
-        THEN 1
-        ELSE 0
-    END [OrganizationUseTotp]
-FROM
-    [dbo].[CipherDetails](@UserId) C
-INNER JOIN
-    [CTE] OU ON C.[UserId] IS NULL AND C.[OrganizationId] IN (SELECT [OrganizationId] FROM [CTE])
-INNER JOIN
-    [dbo].[Organization] O ON O.[Id] = OU.OrganizationId AND O.[Id] = C.[OrganizationId] AND O.[Enabled] = 1
-LEFT JOIN
-    [dbo].[CollectionCipher] CC ON OU.[AccessAll] = 0 AND CC.[CipherId] = C.[Id]
-LEFT JOIN
-    [dbo].[CollectionUser] CU ON CU.[CollectionId] = CC.[CollectionId] AND CU.[OrganizationUserId] = OU.[Id]
-LEFT JOIN
-    [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-LEFT JOIN
-    [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-LEFT JOIN
-    [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId]
-WHERE
-    OU.[AccessAll] = 1
-    OR CU.[CollectionId] IS NOT NULL
-    OR G.[AccessAll] = 1
-    OR CG.[CollectionId] IS NOT NULL
-
-UNION ALL
-
-SELECT
-    *,
-    1 [Edit],
-    0 [OrganizationUseTotp]
-FROM
-    [dbo].[CipherDetails](@UserId)
-WHERE
-    [UserId] = @UserId
-GO
-
-IF EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_Cipher_OrganizationId_Type'
-    AND object_id = OBJECT_ID('[dbo].[Cipher]')
-)
-BEGIN
-    DROP INDEX [IX_Cipher_OrganizationId_Type] ON [dbo].[Cipher]
-END
-GO
-
-IF EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_Cipher_UserId_Type_IncludeAll'
-    AND object_id = OBJECT_ID('[dbo].[Cipher]')
-)
-BEGIN
-    DROP INDEX [IX_Cipher_UserId_Type_IncludeAll] ON [dbo].[Cipher]
-END
-GO
-
-IF NOT EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_Cipher_UserId_OrganizationId_IncludeAll'
-    AND object_id = OBJECT_ID('[dbo].[Cipher]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_Cipher_UserId_OrganizationId_IncludeAll]
-        ON [dbo].[Cipher]([UserId] ASC, [OrganizationId] ASC)
-        INCLUDE ([Type], [Data], [Favorites], [Folders], [Attachments], [CreationDate], [RevisionDate])
-END
-GO
-
-IF NOT EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_Cipher_OrganizationId'
-    AND object_id = OBJECT_ID('[dbo].[Cipher]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_Cipher_OrganizationId]
-        ON [dbo].[Cipher]([OrganizationId] ASC)
-END
-GO
-
-IF NOT EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_GroupUser_OrganizationUserId'
-    AND object_id = OBJECT_ID('[dbo].[GroupUser]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_GroupUser_OrganizationUserId]
-        ON [dbo].[GroupUser]([OrganizationUserId] ASC)
-END
-GO
-
-IF NOT EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_Organization_Enabled'
-    AND object_id = OBJECT_ID('[dbo].[Organization]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_Organization_Enabled]
-        ON [dbo].[Organization]([Id] ASC, [Enabled] ASC)
-        INCLUDE ([UseTotp])
-END
-GO
-
-IF NOT EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_Collection_OrganizationId_IncludeAll'
-    AND object_id = OBJECT_ID('[dbo].[Collection]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_Collection_OrganizationId_IncludeAll]
-        ON [dbo].[Collection]([OrganizationId] ASC)
-        INCLUDE([CreationDate], [Name], [RevisionDate])
-END
-GO
-
-IF OBJECT_ID('[dbo].[CipherDetails_ReadByTypeUserId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CipherDetails_ReadByTypeUserId]
-END
-GO
-
-IF OBJECT_ID('[dbo].[CipherDetails_ReadByUserIdHasCollection]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CipherDetails_ReadByUserIdHasCollection]
-END
-GO
-
-IF OBJECT_ID('[dbo].[CipherDetails_ReadWithoutOrganizationsByUserId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CipherDetails_ReadWithoutOrganizationsByUserId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[CipherDetails_ReadWithoutOrganizationsByUserId]
-    @UserId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *,
-        1 [Edit],
-        0 [OrganizationUseTotp]
-    FROM
-        [dbo].[CipherDetails](@UserId)
-    WHERE
-        [UserId] = @UserId
-END
-GO
-
-IF OBJECT_ID('[dbo].[Cipher_ReadByOrganizationId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Cipher_ReadByOrganizationId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Cipher_ReadByOrganizationId]
-    @OrganizationId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[CipherView]
-    WHERE
-        [UserId] IS NULL
-        AND [OrganizationId] = @OrganizationId
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_DeleteById]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_DeleteById]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_DeleteById]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @Id
-
-    DECLARE @BatchSize INT = 100
-    WHILE @BatchSize > 0
-    BEGIN
-        BEGIN TRANSACTION Organization_DeleteById_Ciphers
-
-        DELETE TOP(@BatchSize)
-        FROM
-            [dbo].[Cipher]
-        WHERE
-            [UserId] IS NULL
-            AND [OrganizationId] = @Id
-
-        SET @BatchSize = @@ROWCOUNT
-
-        COMMIT TRANSACTION Organization_DeleteById_Ciphers
-    END
-
-    DELETE
-    FROM
-        [dbo].[Organization]
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_UpdateStorage]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_UpdateStorage]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_UpdateStorage]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @Storage BIGINT
-
-    ;WITH [CTE] AS (
-        SELECT
-            [Id],
-            (
-                SELECT
-                    SUM(CAST(JSON_VALUE(value,'$.Size') AS BIGINT))
-                FROM
-                    OPENJSON([Attachments])
-            ) [Size]
-        FROM
-            [dbo].[Cipher]
-    )
-    SELECT
-        @Storage = SUM([CTE].[Size])
-    FROM
-        [dbo].[Cipher] C
-    LEFT JOIN
-        [CTE] ON C.[Id] = [CTE].[Id]
-    WHERE
-        C.[UserId] IS NULL
-        AND C.[OrganizationId] = @Id
-
-    UPDATE
-        [dbo].[Organization]
-    SET
-        [Storage] = @Storage,
-        [RevisionDate] = GETUTCDATE()
-    WHERE
-        [Id] = @Id
-END
-GO

util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql

@@ -1,719 +0,0 @@
-IF COL_LENGTH('[dbo].[User]', 'RenewalReminderDate') IS NULL
-BEGIN
-    ALTER TABLE
-        [dbo].[User]
-    ADD
-        [RenewalReminderDate] DATETIME2 (7) NULL
-END
-GO
-
-IF NOT EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_User_Premium_PremiumExpirationDate_RenewalReminderDate'
-    AND object_id = OBJECT_ID('[dbo].[User]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_User_Premium_PremiumExpirationDate_RenewalReminderDate]
-        ON [dbo].[User]([Premium] ASC, [PremiumExpirationDate] ASC, [RenewalReminderDate] ASC)
-END
-GO
-
-IF NOT EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_Grant_ExpirationDate'
-    AND object_id = OBJECT_ID('[dbo].[Grant]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_Grant_ExpirationDate]
-        ON [dbo].[Grant]([ExpirationDate] ASC)
-END
-GO
-
-IF NOT EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_U2f_CreationDate'
-    AND object_id = OBJECT_ID('[dbo].[U2f]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_U2f_CreationDate]
-        ON [dbo].[U2f]([CreationDate] ASC)
-END
-GO
-
-IF NOT EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_U2f_UserId'
-    AND object_id = OBJECT_ID('[dbo].[U2f]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_U2f_UserId]
-        ON [dbo].[U2f]([UserId] ASC)
-END
-GO
-
-IF NOT EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_Device_Identifier'
-    AND object_id = OBJECT_ID('[dbo].[Device]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_Device_Identifier]
-        ON [dbo].[Device]([Identifier] ASC)
-END
-GO
-
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'UserView')
-BEGIN
-    DROP VIEW [dbo].[UserView]
-END
-GO
-
-CREATE VIEW [dbo].[UserView]
-AS
-SELECT
-    *
-FROM
-    [dbo].[User]
-GO
-
-IF OBJECT_ID('[dbo].[U2f_DeleteOld]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[U2f_DeleteOld]
-END
-GO
-
-CREATE PROCEDURE [dbo].[U2f_DeleteOld]
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @BatchSize INT = 100
-    DECLARE @Threshold DATETIME2(7) = DATEADD (day, -7, GETUTCDATE())
-
-    WHILE @BatchSize > 0
-    BEGIN
-        DELETE TOP(@BatchSize)
-        FROM
-            [dbo].[U2f]
-        WHERE
-            [CreationDate] IS NULL
-            OR [CreationDate] < @Threshold
-
-        SET @BatchSize = @@ROWCOUNT
-    END
-END
-GO
-
-IF OBJECT_ID('[dbo].[Grant_DeleteExpired]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Grant_DeleteExpired]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Grant_DeleteExpired]
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @BatchSize INT = 100
-    DECLARE @Now DATETIME2(7) = GETUTCDATE()
-
-    WHILE @BatchSize > 0
-    BEGIN
-        DELETE TOP(@BatchSize)
-        FROM
-            [dbo].[Grant]
-        WHERE
-            [ExpirationDate] < @Now
-
-        SET @BatchSize = @@ROWCOUNT
-    END
-END
-GO
-
-IF OBJECT_ID('[dbo].[User_Create]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[User_Create]
-END
-GO
-
-CREATE PROCEDURE [dbo].[User_Create]
-    @Id UNIQUEIDENTIFIER,
-    @Name NVARCHAR(50),
-    @Email NVARCHAR(50),
-    @EmailVerified BIT,
-    @MasterPassword NVARCHAR(300),
-    @MasterPasswordHint NVARCHAR(50),
-    @Culture NVARCHAR(10),
-    @SecurityStamp NVARCHAR(50),
-    @TwoFactorProviders NVARCHAR(MAX),
-    @TwoFactorRecoveryCode NVARCHAR(32),
-    @EquivalentDomains NVARCHAR(MAX),
-    @ExcludedGlobalEquivalentDomains NVARCHAR(MAX),
-    @AccountRevisionDate DATETIME2(7),
-    @Key NVARCHAR(MAX),
-    @PublicKey NVARCHAR(MAX),
-    @PrivateKey NVARCHAR(MAX),
-    @Premium BIT,
-    @PremiumExpirationDate DATETIME2(7),
-    @RenewalReminderDate DATETIME2(7),
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @LicenseKey VARCHAR(100),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    INSERT INTO [dbo].[User]
-    (
-        [Id],
-        [Name],
-        [Email],
-        [EmailVerified],
-        [MasterPassword],
-        [MasterPasswordHint],
-        [Culture],
-        [SecurityStamp],
-        [TwoFactorProviders],
-        [TwoFactorRecoveryCode],
-        [EquivalentDomains],
-        [ExcludedGlobalEquivalentDomains],
-        [AccountRevisionDate],
-        [Key],
-        [PublicKey],
-        [PrivateKey],
-        [Premium],
-        [PremiumExpirationDate],
-        [RenewalReminderDate],
-        [Storage],
-        [MaxStorageGb],
-        [Gateway],
-        [GatewayCustomerId],
-        [GatewaySubscriptionId],
-        [LicenseKey],
-        [CreationDate],
-        [RevisionDate]
-    )
-    VALUES
-    (
-        @Id,
-        @Name,
-        @Email,
-        @EmailVerified,
-        @MasterPassword,
-        @MasterPasswordHint,
-        @Culture,
-        @SecurityStamp,
-        @TwoFactorProviders,
-        @TwoFactorRecoveryCode,
-        @EquivalentDomains,
-        @ExcludedGlobalEquivalentDomains,
-        @AccountRevisionDate,
-        @Key,
-        @PublicKey,
-        @PrivateKey,
-        @Premium,
-        @PremiumExpirationDate,
-        @RenewalReminderDate,
-        @Storage,
-        @MaxStorageGb,
-        @Gateway,
-        @GatewayCustomerId,
-        @GatewaySubscriptionId,
-        @LicenseKey,
-        @CreationDate,
-        @RevisionDate
-    )
-END
-GO
-
-IF OBJECT_ID('[dbo].[User_Update]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[User_Update]
-END
-GO
-
-CREATE PROCEDURE [dbo].[User_Update]
-    @Id UNIQUEIDENTIFIER,
-    @Name NVARCHAR(50),
-    @Email NVARCHAR(50),
-    @EmailVerified BIT,
-    @MasterPassword NVARCHAR(300),
-    @MasterPasswordHint NVARCHAR(50),
-    @Culture NVARCHAR(10),
-    @SecurityStamp NVARCHAR(50),
-    @TwoFactorProviders NVARCHAR(MAX),
-    @TwoFactorRecoveryCode NVARCHAR(32),
-    @EquivalentDomains NVARCHAR(MAX),
-    @ExcludedGlobalEquivalentDomains NVARCHAR(MAX),
-    @AccountRevisionDate DATETIME2(7),
-    @Key NVARCHAR(MAX),
-    @PublicKey NVARCHAR(MAX),
-    @PrivateKey NVARCHAR(MAX),
-    @Premium BIT,
-    @PremiumExpirationDate DATETIME2(7),
-    @RenewalReminderDate DATETIME2(7),
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @LicenseKey VARCHAR(100),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    UPDATE
-        [dbo].[User]
-    SET
-        [Name] = @Name,
-        [Email] = @Email,
-        [EmailVerified] = @EmailVerified,
-        [MasterPassword] = @MasterPassword,
-        [MasterPasswordHint] = @MasterPasswordHint,
-        [Culture] = @Culture,
-        [SecurityStamp] = @SecurityStamp,
-        [TwoFactorProviders] = @TwoFactorProviders,
-        [TwoFactorRecoveryCode] = @TwoFactorRecoveryCode,
-        [EquivalentDomains] = @EquivalentDomains,
-        [ExcludedGlobalEquivalentDomains] = @ExcludedGlobalEquivalentDomains,
-        [AccountRevisionDate] = @AccountRevisionDate,
-        [Key] = @Key,
-        [PublicKey] = @PublicKey,
-        [PrivateKey] = @PrivateKey,
-        [Premium] = @Premium,
-        [PremiumExpirationDate] = @PremiumExpirationDate,
-        [RenewalReminderDate] = @RenewalReminderDate,
-        [Storage] = @Storage,
-        [MaxStorageGb] = @MaxStorageGb,
-        [Gateway] = @Gateway,
-        [GatewayCustomerId] = @GatewayCustomerId,
-        [GatewaySubscriptionId] = @GatewaySubscriptionId,
-        [LicenseKey] = @LicenseKey,
-        [CreationDate] = @CreationDate,
-        [RevisionDate] = @RevisionDate
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[User_UpdateRenewalReminderDate]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[User_UpdateRenewalReminderDate]
-END
-GO
-
-CREATE PROCEDURE [dbo].[User_UpdateRenewalReminderDate]
-    @Id UNIQUEIDENTIFIER,
-    @RenewalReminderDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    UPDATE
-        [dbo].[User]
-    SET
-        [RenewalReminderDate] = @RenewalReminderDate
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[User_ReadByPremiumRenewal]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[User_ReadByPremiumRenewal]
-END
-GO
-
-CREATE PROCEDURE [dbo].[User_ReadByPremiumRenewal]
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @WindowRef DATETIME2(7) = GETUTCDATE()
-    DECLARE @WindowStart DATETIME2(7) = DATEADD (day, -15, @WindowRef)
-    DECLARE @WindowEnd DATETIME2(7) = DATEADD (day, 15, @WindowRef)
-
-    SELECT
-        *
-    FROM
-        [dbo].[UserView]
-    WHERE
-        [Premium] = 1
-        AND [PremiumExpirationDate] >= @WindowRef
-        AND [PremiumExpirationDate] < @WindowEnd
-        AND (
-            [RenewalReminderDate] IS NULL
-            OR [RenewalReminderDate] < @WindowStart
-        )
-        AND [Gateway] = 1 -- Braintree
-END
-GO
-
-IF OBJECT_ID('[dbo].[Collection_ReadByUserId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Collection_ReadByUserId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Collection_ReadByUserId]
-    @UserId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        C.*,
-        CASE
-            WHEN
-                OU.[AccessAll] = 1
-                OR G.[AccessAll] = 1
-                OR CU.[ReadOnly] = 0
-                OR CG.[ReadOnly] = 0
-            THEN 0
-            ELSE 1
-        END [ReadOnly]
-    FROM
-        [dbo].[CollectionView] C
-    INNER JOIN
-        [dbo].[OrganizationUser] OU ON C.[OrganizationId] = OU.[OrganizationId]
-    INNER JOIN
-        [dbo].[Organization] O ON O.[Id] = C.[OrganizationId]
-    LEFT JOIN
-        [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = [OU].[Id]
-    LEFT JOIN
-        [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-    LEFT JOIN
-        [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-    LEFT JOIN
-        [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
-    WHERE
-        OU.[UserId] = @UserId
-        AND OU.[Status] = 2 -- 2 = Confirmed
-        AND O.[Enabled] = 1
-        AND (
-            OU.[AccessAll] = 1
-            OR CU.[CollectionId] IS NOT NULL
-            OR G.[AccessAll] = 1
-            OR CG.[CollectionId] IS NOT NULL
-        )
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_UpdateStorage]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_UpdateStorage]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_UpdateStorage]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @Storage BIGINT
-
-    CREATE TABLE #OrgStorageUpdateTemp
-    ( 
-        [Id] UNIQUEIDENTIFIER NOT NULL,
-        [Attachments] VARCHAR(MAX) NULL
-    )
-
-    INSERT INTO #OrgStorageUpdateTemp
-    SELECT
-        [Id],
-        [Attachments]
-    FROM
-        [dbo].[Cipher]
-    WHERE
-        [UserId] IS NULL
-        AND [OrganizationId] = @Id
-
-    ;WITH [CTE] AS (
-        SELECT
-            [Id],
-            (
-                SELECT
-                    SUM(CAST(JSON_VALUE(value,'$.Size') AS BIGINT))
-                FROM
-                    OPENJSON([Attachments])
-            ) [Size]
-        FROM
-            #OrgStorageUpdateTemp
-    )
-    SELECT
-        @Storage = SUM([Size])
-    FROM
-        [CTE]
-
-    DROP TABLE #OrgStorageUpdateTemp
-
-    UPDATE
-        [dbo].[Organization]
-    SET
-        [Storage] = @Storage,
-        [RevisionDate] = GETUTCDATE()
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[User_UpdateStorage]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[User_UpdateStorage]
-END
-GO
-
-CREATE PROCEDURE [dbo].[User_UpdateStorage]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @Storage BIGINT
-
-    CREATE TABLE #UserStorageUpdateTemp
-    ( 
-        [Id] UNIQUEIDENTIFIER NOT NULL,
-        [Attachments] VARCHAR(MAX) NULL
-    )
-
-    INSERT INTO #UserStorageUpdateTemp
-    SELECT
-        [Id],
-        [Attachments]
-    FROM
-        [dbo].[Cipher]
-    WHERE
-        [UserId] = @Id
-
-    ;WITH [CTE] AS (
-        SELECT
-            [Id],
-            (
-                SELECT
-                    SUM(CAST(JSON_VALUE(value,'$.Size') AS BIGINT))
-                FROM
-                    OPENJSON([Attachments])
-            ) [Size]
-        FROM
-            #UserStorageUpdateTemp
-    )
-    SELECT
-        @Storage = SUM([CTE].[Size])
-    FROM
-        [CTE]
-
-    DROP TABLE #UserStorageUpdateTemp
-
-    UPDATE
-        [dbo].[User]
-    SET
-        [Storage] = @Storage,
-        [RevisionDate] = GETUTCDATE()
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[CollectionCipher_UpdateCollectionsForCiphers]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CollectionCipher_UpdateCollectionsForCiphers]
-END
-GO
-
-CREATE PROCEDURE [dbo].[CollectionCipher_UpdateCollectionsForCiphers]
-    @CipherIds AS [dbo].[GuidIdArray] READONLY,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @CollectionIds AS [dbo].[GuidIdArray] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    CREATE TABLE #AvailableCollections (
-        [Id] UNIQUEIDENTIFIER
-    )
-
-    INSERT INTO #AvailableCollections
-        SELECT
-            C.[Id]
-        FROM
-            [dbo].[Collection] C
-        INNER JOIN
-            [Organization] O ON O.[Id] = C.[OrganizationId]
-        INNER JOIN
-            [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
-        LEFT JOIN
-            [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = OU.[Id]
-        LEFT JOIN
-            [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-        LEFT JOIN
-            [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-        LEFT JOIN
-            [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[GroupId] = GU.[GroupId]
-        WHERE
-            O.[Id] = @OrganizationId
-            AND O.[Enabled] = 1
-            AND OU.[Status] = 2 -- Confirmed
-            AND (
-                OU.[AccessAll] = 1
-                OR CU.[ReadOnly] = 0
-                OR G.[AccessAll] = 1
-                OR CG.[ReadOnly] = 0
-            )
-
-    IF (SELECT COUNT(1) FROM #AvailableCollections) < 1
-    BEGIN
-        -- No writable collections available to share with in this organization.
-        RETURN
-    END
-
-    INSERT INTO [dbo].[CollectionCipher]
-    (
-        [CollectionId],
-        [CipherId]
-    )
-    SELECT 
-        [Collection].[Id],
-        [Cipher].[Id]
-    FROM
-        @CollectionIds [Collection]
-    INNER JOIN
-        @CipherIds [Cipher] ON 1 = 1
-    WHERE
-        [Collection].[Id] IN (SELECT [Id] FROM #AvailableCollections)
-
-    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
-END
-GO
-
-IF OBJECT_ID('[dbo].[Folder_DeleteById]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Folder_DeleteById]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Folder_DeleteById]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @UserId UNIQUEIDENTIFIER = (SELECT TOP 1 [UserId] FROM [dbo].[Folder] WHERE [Id] = @Id)
-    DECLARE @UserIdPath VARCHAR(50) = CONCAT('$."', @UserId, '"')
-
-    ;WITH [CTE] AS (
-        SELECT
-            [Id],
-            [OrganizationId],
-            [AccessAll]
-        FROM
-            [OrganizationUser]
-        WHERE
-            [UserId] = @UserId
-            AND [Status] = 2 -- Confirmed
-    )
-    UPDATE
-        C
-    SET
-        C.[Folders] = JSON_MODIFY(C.[Folders], @UserIdPath, NULL)
-    FROM
-        [dbo].[Cipher] C
-    INNER JOIN
-        [CTE] OU ON C.[UserId] IS NULL AND C.[OrganizationId] IN (SELECT [OrganizationId] FROM [CTE])
-    INNER JOIN
-        [dbo].[Organization] O ON O.[Id] = OU.[OrganizationId] AND O.[Id] = C.[OrganizationId] AND O.[Enabled] = 1
-    LEFT JOIN
-        [dbo].[CollectionCipher] CC ON OU.[AccessAll] = 0 AND CC.[CipherId] = C.[Id]
-    LEFT JOIN
-        [dbo].[CollectionUser] CU ON CU.[CollectionId] = CC.[CollectionId] AND CU.[OrganizationUserId] = OU.[Id]
-    LEFT JOIN
-        [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-    LEFT JOIN
-        [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-    LEFT JOIN
-        [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = CC.[CollectionId] AND CG.[GroupId] = GU.[GroupId]
-    WHERE
-        (
-            OU.[AccessAll] = 1
-            OR CU.[CollectionId] IS NOT NULL
-            OR G.[AccessAll] = 1
-            OR CG.[CollectionId] IS NOT NULL
-        )
-        AND JSON_VALUE(C.[Folders], @UserIdPath) = @Id
-
-    UPDATE
-        C
-    SET
-        C.[Folders] = JSON_MODIFY(C.[Folders], @UserIdPath, NULL)
-    FROM
-        [dbo].[Cipher] C
-    WHERE
-        [UserId] = @UserId
-        AND JSON_VALUE([Folders], @UserIdPath) = @Id
-
-    DELETE
-    FROM
-        [dbo].[Folder]
-    WHERE
-        [Id] = @Id
-
-    EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
-END
-GO
-
-IF OBJECT_ID('[dbo].[CollectionUserDetails_ReadByCollectionId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CollectionUserDetails_ReadByCollectionId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[CollectionUserDetails_ReadByCollectionId]
-    @CollectionId UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        OU.[Id] AS [OrganizationUserId],
-        CASE
-            WHEN OU.[AccessAll] = 1 OR G.[AccessAll] = 1 THEN 1
-            ELSE 0
-        END [AccessAll],
-        U.[Name],
-        ISNULL(U.[Email], OU.[Email]) Email,
-        OU.[Status],
-        OU.[Type],
-        CASE
-            WHEN OU.[AccessAll] = 1 OR CU.[ReadOnly] = 0 OR G.[AccessAll] = 1 OR CG.[ReadOnly] = 0 THEN 0
-            ELSE 1
-        END [ReadOnly]
-    FROM
-        [dbo].[OrganizationUser] OU
-    LEFT JOIN
-        [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[OrganizationUserId] = OU.[Id] AND CU.[CollectionId] = @CollectionId
-    LEFT JOIN
-        [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-    LEFT JOIN
-        [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-    LEFT JOIN
-        [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[GroupId] = GU.[GroupId] AND CG.[CollectionId] = @CollectionId
-    LEFT JOIN
-        [dbo].[User] U ON U.[Id] = OU.[UserId]
-    WHERE
-        CU.[CollectionId] IS NOT NULL
-        OR CG.[CollectionId] IS NOT NULL
-        OR (
-            OU.[OrganizationId] = @OrganizationId
-            AND (
-                OU.[AccessAll] = 1
-                OR G.[AccessAll] = 1
-            )
-        )
-END
-GO

util/Setup/DbScripts/2018-07-28_00_DbTuning.sql

@@ -1,59 +0,0 @@
-IF NOT EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_OrganizationUser_OrganizationId'
-    AND object_id = OBJECT_ID('[dbo].[OrganizationUser]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_OrganizationUser_OrganizationId]
-        ON [dbo].[OrganizationUser]([OrganizationId] ASC)
-END
-GO
-
-IF OBJECT_ID('[dbo].[CollectionUserDetails_ReadByCollectionId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CollectionUserDetails_ReadByCollectionId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[CollectionUserDetails_ReadByCollectionId]
-    @CollectionId UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        OU.[Id] AS [OrganizationUserId],
-        CASE
-            WHEN OU.[AccessAll] = 1 OR G.[AccessAll] = 1 THEN 1
-            ELSE 0
-        END [AccessAll],
-        U.[Name],
-        ISNULL(U.[Email], OU.[Email]) Email,
-        OU.[Status],
-        OU.[Type],
-        CASE
-            WHEN OU.[AccessAll] = 1 OR CU.[ReadOnly] = 0 OR G.[AccessAll] = 1 OR CG.[ReadOnly] = 0 THEN 0
-            ELSE 1
-        END [ReadOnly]
-    FROM
-        [dbo].[OrganizationUser] OU
-    LEFT JOIN
-        [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[OrganizationUserId] = OU.[Id] AND CU.[CollectionId] = @CollectionId
-    LEFT JOIN
-        [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-    LEFT JOIN
-        [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-    LEFT JOIN
-        [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[GroupId] = GU.[GroupId] AND CG.[CollectionId] = @CollectionId
-    LEFT JOIN
-        [dbo].[User] U ON U.[Id] = OU.[UserId]
-    WHERE
-        OU.[OrganizationId] = @OrganizationId
-        AND (
-            CU.[CollectionId] IS NOT NULL
-            OR CG.[CollectionId] IS NOT NULL
-            OR OU.[AccessAll] = 1
-            OR G.[AccessAll] = 1
-        )
-END
-GO

util/Setup/DbScripts/2018-08-14_00_UserKdf.sql

@@ -1,495 +0,0 @@
-IF COL_LENGTH('[dbo].[User]', 'Kdf') IS NULL
-BEGIN
-    ALTER TABLE
-        [dbo].[User]
-    ADD
-        [Kdf] TINYINT NULL,
-        [KdfIterations] INT NULL
-END
-GO
-
-UPDATE
-    [dbo].[User]
-SET
-    [Kdf] = 0,
-    [KdfIterations] = 5000
-GO
-
-ALTER TABLE
-    [dbo].[User]
-ALTER COLUMN
-    [Kdf] TINYINT NOT NULL
-GO
-
-ALTER TABLE
-    [dbo].[User]
-ALTER COLUMN
-    [KdfIterations] INT NOT NULL
-GO
-
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'UserView')
-BEGIN
-    DROP VIEW [dbo].[UserView]
-END
-GO
-
-CREATE VIEW [dbo].[UserView]
-AS
-SELECT
-    *
-FROM
-    [dbo].[User]
-GO
-
-IF OBJECT_ID('[dbo].[User_Create]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[User_Create]
-END
-GO
-
-CREATE PROCEDURE [dbo].[User_Create]
-    @Id UNIQUEIDENTIFIER,
-    @Name NVARCHAR(50),
-    @Email NVARCHAR(50),
-    @EmailVerified BIT,
-    @MasterPassword NVARCHAR(300),
-    @MasterPasswordHint NVARCHAR(50),
-    @Culture NVARCHAR(10),
-    @SecurityStamp NVARCHAR(50),
-    @TwoFactorProviders NVARCHAR(MAX),
-    @TwoFactorRecoveryCode NVARCHAR(32),
-    @EquivalentDomains NVARCHAR(MAX),
-    @ExcludedGlobalEquivalentDomains NVARCHAR(MAX),
-    @AccountRevisionDate DATETIME2(7),
-    @Key NVARCHAR(MAX),
-    @PublicKey NVARCHAR(MAX),
-    @PrivateKey NVARCHAR(MAX),
-    @Premium BIT,
-    @PremiumExpirationDate DATETIME2(7),
-    @RenewalReminderDate DATETIME2(7),
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @LicenseKey VARCHAR(100),
-    @Kdf TINYINT,
-    @KdfIterations INT,
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    INSERT INTO [dbo].[User]
-    (
-        [Id],
-        [Name],
-        [Email],
-        [EmailVerified],
-        [MasterPassword],
-        [MasterPasswordHint],
-        [Culture],
-        [SecurityStamp],
-        [TwoFactorProviders],
-        [TwoFactorRecoveryCode],
-        [EquivalentDomains],
-        [ExcludedGlobalEquivalentDomains],
-        [AccountRevisionDate],
-        [Key],
-        [PublicKey],
-        [PrivateKey],
-        [Premium],
-        [PremiumExpirationDate],
-        [RenewalReminderDate],
-        [Storage],
-        [MaxStorageGb],
-        [Gateway],
-        [GatewayCustomerId],
-        [GatewaySubscriptionId],
-        [LicenseKey],
-        [Kdf],
-        [KdfIterations],
-        [CreationDate],
-        [RevisionDate]
-    )
-    VALUES
-    (
-        @Id,
-        @Name,
-        @Email,
-        @EmailVerified,
-        @MasterPassword,
-        @MasterPasswordHint,
-        @Culture,
-        @SecurityStamp,
-        @TwoFactorProviders,
-        @TwoFactorRecoveryCode,
-        @EquivalentDomains,
-        @ExcludedGlobalEquivalentDomains,
-        @AccountRevisionDate,
-        @Key,
-        @PublicKey,
-        @PrivateKey,
-        @Premium,
-        @PremiumExpirationDate,
-        @RenewalReminderDate,
-        @Storage,
-        @MaxStorageGb,
-        @Gateway,
-        @GatewayCustomerId,
-        @GatewaySubscriptionId,
-        @LicenseKey,
-        @Kdf,
-        @KdfIterations,
-        @CreationDate,
-        @RevisionDate
-    )
-END
-GO
-
-IF OBJECT_ID('[dbo].[User_Update]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[User_Update]
-END
-GO
-
-CREATE PROCEDURE [dbo].[User_Update]
-    @Id UNIQUEIDENTIFIER,
-    @Name NVARCHAR(50),
-    @Email NVARCHAR(50),
-    @EmailVerified BIT,
-    @MasterPassword NVARCHAR(300),
-    @MasterPasswordHint NVARCHAR(50),
-    @Culture NVARCHAR(10),
-    @SecurityStamp NVARCHAR(50),
-    @TwoFactorProviders NVARCHAR(MAX),
-    @TwoFactorRecoveryCode NVARCHAR(32),
-    @EquivalentDomains NVARCHAR(MAX),
-    @ExcludedGlobalEquivalentDomains NVARCHAR(MAX),
-    @AccountRevisionDate DATETIME2(7),
-    @Key NVARCHAR(MAX),
-    @PublicKey NVARCHAR(MAX),
-    @PrivateKey NVARCHAR(MAX),
-    @Premium BIT,
-    @PremiumExpirationDate DATETIME2(7),
-    @RenewalReminderDate DATETIME2(7),
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @LicenseKey VARCHAR(100),
-    @Kdf TINYINT,
-    @KdfIterations INT,
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    UPDATE
-        [dbo].[User]
-    SET
-        [Name] = @Name,
-        [Email] = @Email,
-        [EmailVerified] = @EmailVerified,
-        [MasterPassword] = @MasterPassword,
-        [MasterPasswordHint] = @MasterPasswordHint,
-        [Culture] = @Culture,
-        [SecurityStamp] = @SecurityStamp,
-        [TwoFactorProviders] = @TwoFactorProviders,
-        [TwoFactorRecoveryCode] = @TwoFactorRecoveryCode,
-        [EquivalentDomains] = @EquivalentDomains,
-        [ExcludedGlobalEquivalentDomains] = @ExcludedGlobalEquivalentDomains,
-        [AccountRevisionDate] = @AccountRevisionDate,
-        [Key] = @Key,
-        [PublicKey] = @PublicKey,
-        [PrivateKey] = @PrivateKey,
-        [Premium] = @Premium,
-        [PremiumExpirationDate] = @PremiumExpirationDate,
-        [RenewalReminderDate] = @RenewalReminderDate,
-        [Storage] = @Storage,
-        [MaxStorageGb] = @MaxStorageGb,
-        [Gateway] = @Gateway,
-        [GatewayCustomerId] = @GatewayCustomerId,
-        [GatewaySubscriptionId] = @GatewaySubscriptionId,
-        [LicenseKey] = @LicenseKey,
-        [Kdf] = @Kdf,
-        [KdfIterations] = @KdfIterations,
-        [CreationDate] = @CreationDate,
-        [RevisionDate] = @RevisionDate
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[User_ReadKdfByEmail]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[User_ReadKdfByEmail]
-END
-GO
-
-CREATE PROCEDURE [dbo].[User_ReadKdfByEmail]
-    @Email NVARCHAR(50)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        [Kdf],
-        [KdfIterations]
-    FROM
-        [dbo].[User]
-    WHERE
-        [Email] = @Email
-END
-GO
-
-IF OBJECT_ID('[dbo].[Cipher_UpdateWithCollections]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Cipher_UpdateWithCollections]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Cipher_UpdateWithCollections]
-    @Id UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @Type TINYINT,
-    @Data NVARCHAR(MAX),
-    @Favorites NVARCHAR(MAX),
-    @Folders NVARCHAR(MAX),
-    @Attachments NVARCHAR(MAX),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7),
-    @CollectionIds AS [dbo].[GuidIdArray] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    CREATE TABLE #AvailableCollections (
-        [Id] UNIQUEIDENTIFIER
-    )
-
-    INSERT INTO #AvailableCollections
-        SELECT
-            C.[Id]
-        FROM
-            [dbo].[Collection] C
-        INNER JOIN
-            [Organization] O ON O.[Id] = C.[OrganizationId]
-        INNER JOIN
-            [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
-        LEFT JOIN
-            [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = OU.[Id]
-        LEFT JOIN
-            [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-        LEFT JOIN
-            [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-        LEFT JOIN
-            [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
-        WHERE
-            O.[Id] = @OrganizationId
-            AND O.[Enabled] = 1
-            AND OU.[Status] = 2 -- Confirmed
-            AND (
-                OU.[AccessAll] = 1
-                OR CU.[ReadOnly] = 0
-                OR G.[AccessAll] = 1
-                OR CG.[ReadOnly] = 0
-            )
-
-    IF (SELECT COUNT(1) FROM #AvailableCollections) < 1
-    BEGIN
-        -- No writable collections available to share with in this organization.
-        SELECT -1 -- -1 = Failure
-        RETURN
-    END
-
-    UPDATE
-        [dbo].[Cipher]
-    SET
-        [UserId] = NULL,
-        [OrganizationId] = @OrganizationId,
-        [Data] = @Data,
-        [Attachments] = @Attachments,
-        [RevisionDate] = @RevisionDate
-        -- No need to update CreationDate, Favorites, Folders, or Type since that data will not change
-    WHERE
-        [Id] = @Id
-
-    INSERT INTO [dbo].[CollectionCipher]
-    (
-        [CollectionId],
-        [CipherId]
-    )
-    SELECT
-        [Id],
-        @Id
-    FROM
-        @CollectionIds
-    WHERE
-        [Id] IN (SELECT [Id] FROM #AvailableCollections)
-
-    IF @Attachments IS NOT NULL
-    BEGIN
-        EXEC [dbo].[Organization_UpdateStorage] @OrganizationId
-        EXEC [dbo].[User_UpdateStorage] @UserId
-    END
-
-    EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
-
-    SELECT 0 -- 0 = Success
-END
-GO
-
-IF OBJECT_ID('[dbo].[CollectionCipher_UpdateCollections]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CollectionCipher_UpdateCollections]
-END
-GO
-
-CREATE PROCEDURE [dbo].[CollectionCipher_UpdateCollections]
-    @CipherId UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @CollectionIds AS [dbo].[GuidIdArray] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @OrgId UNIQUEIDENTIFIER = (
-        SELECT TOP 1
-            [OrganizationId]
-        FROM
-            [dbo].[Cipher]
-        WHERE
-            [Id] = @CipherId
-    )
-
-    ;WITH [AvailableCollectionsCTE] AS(
-        SELECT
-            C.[Id]
-        FROM
-            [dbo].[Collection] C
-        INNER JOIN
-            [Organization] O ON O.[Id] = C.[OrganizationId]
-        INNER JOIN
-            [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
-        LEFT JOIN
-            [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = OU.[Id]
-        LEFT JOIN
-            [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-        LEFT JOIN
-            [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-        LEFT JOIN
-            [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
-        WHERE
-            O.[Id] = @OrgId
-            AND O.[Enabled] = 1
-            AND OU.[Status] = 2 -- Confirmed
-            AND (
-                OU.[AccessAll] = 1
-                OR CU.[ReadOnly] = 0
-                OR G.[AccessAll] = 1
-                OR CG.[ReadOnly] = 0
-            )
-    )
-    MERGE
-        [dbo].[CollectionCipher] AS [Target]
-    USING 
-        @CollectionIds AS [Source]
-    ON
-        [Target].[CollectionId] = [Source].[Id]
-        AND [Target].[CipherId] = @CipherId
-    WHEN NOT MATCHED BY TARGET
-    AND [Source].[Id] IN (SELECT [Id] FROM [AvailableCollectionsCTE]) THEN
-        INSERT VALUES
-        (
-            [Source].[Id],
-            @CipherId
-        )
-    WHEN NOT MATCHED BY SOURCE
-    AND [Target].[CipherId] = @CipherId
-    AND [Target].[CollectionId] IN (SELECT [Id] FROM [AvailableCollectionsCTE]) THEN
-        DELETE
-    ;
-
-    IF @OrgId IS NOT NULL
-    BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrgId
-    END
-END
-GO
-
-IF OBJECT_ID('[dbo].[CollectionCipher_UpdateCollectionsForCiphers]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CollectionCipher_UpdateCollectionsForCiphers]
-END
-GO
-
-CREATE PROCEDURE [dbo].[CollectionCipher_UpdateCollectionsForCiphers]
-    @CipherIds AS [dbo].[GuidIdArray] READONLY,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @CollectionIds AS [dbo].[GuidIdArray] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    CREATE TABLE #AvailableCollections (
-        [Id] UNIQUEIDENTIFIER
-    )
-
-    INSERT INTO #AvailableCollections
-        SELECT
-            C.[Id]
-        FROM
-            [dbo].[Collection] C
-        INNER JOIN
-            [Organization] O ON O.[Id] = C.[OrganizationId]
-        INNER JOIN
-            [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
-        LEFT JOIN
-            [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = OU.[Id]
-        LEFT JOIN
-            [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-        LEFT JOIN
-            [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-        LEFT JOIN
-            [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
-        WHERE
-            O.[Id] = @OrganizationId
-            AND O.[Enabled] = 1
-            AND OU.[Status] = 2 -- Confirmed
-            AND (
-                OU.[AccessAll] = 1
-                OR CU.[ReadOnly] = 0
-                OR G.[AccessAll] = 1
-                OR CG.[ReadOnly] = 0
-            )
-
-    IF (SELECT COUNT(1) FROM #AvailableCollections) < 1
-    BEGIN
-        -- No writable collections available to share with in this organization.
-        RETURN
-    END
-
-    INSERT INTO [dbo].[CollectionCipher]
-    (
-        [CollectionId],
-        [CipherId]
-    )
-    SELECT 
-        [Collection].[Id],
-        [Cipher].[Id]
-    FROM
-        @CollectionIds [Collection]
-    INNER JOIN
-        @CipherIds [Cipher] ON 1 = 1
-    WHERE
-        [Collection].[Id] IN (SELECT [Id] FROM #AvailableCollections)
-
-    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
-END
-GO

util/Setup/DbScripts/2018-08-28_00_PremiumOrgAbilities.sql

@@ -1,27 +0,0 @@
-IF OBJECT_ID('[dbo].[Organization_ReadAbilities]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_ReadAbilities]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_ReadAbilities]
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        [Id],
-        [UseEvents],
-        [Use2fa],
-        CASE 
-        WHEN [Use2fa] = 1 AND [TwoFactorProviders] IS NOT NULL AND [TwoFactorProviders] != '{}' THEN
-            1
-        ELSE
-            0
-        END AS [Using2fa],
-        [UsersGetPremium],
-        [Enabled]
-    FROM
-        [dbo].[Organization]
-END
-GO

util/Setup/DbScripts/2018-09-25_00_OrgPurge.sql

@@ -1,292 +0,0 @@
-IF OBJECT_ID('[dbo].[Cipher_DeleteByOrganizationId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Cipher_DeleteByOrganizationId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Cipher_DeleteByOrganizationId]
-    @OrganizationId AS UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @BatchSize INT = 100
-
-    -- Delete collection ciphers
-    WHILE @BatchSize > 0
-    BEGIN
-        BEGIN TRANSACTION Cipher_DeleteByOrganizationId_CC
-
-        DELETE TOP(@BatchSize) CC
-        FROM
-            [dbo].[CollectionCipher] CC
-        INNER JOIN
-            [dbo].[Collection] C ON C.[Id] = CC.[CollectionId]
-        WHERE
-            C.[OrganizationId] = @OrganizationId
-
-        SET @BatchSize = @@ROWCOUNT
-
-        COMMIT TRANSACTION Cipher_DeleteByOrganizationId_CC
-    END
-
-    -- Reset batch size
-    SET @BatchSize = 100
-
-    -- Delete ciphers
-    WHILE @BatchSize > 0
-    BEGIN
-        BEGIN TRANSACTION Cipher_DeleteByOrganizationId
-
-        DELETE TOP(@BatchSize)
-        FROM
-            [dbo].[Cipher]
-        WHERE
-            [OrganizationId] = @OrganizationId
-
-        SET @BatchSize = @@ROWCOUNT
-
-        COMMIT TRANSACTION Cipher_DeleteByOrganizationId
-    END
-
-    -- Cleanup organization
-    EXEC [dbo].[Organization_UpdateStorage] @OrganizationId
-    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
-END
-GO
-
-IF OBJECT_ID('[dbo].[AzureSQLMaintenance]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[AzureSQLMaintenance]
-END
-GO
-
-CREATE Procedure [dbo].[AzureSQLMaintenance]
-    (
-        @operation nvarchar(10) = null,
-        @mode nvarchar(10) = 'smart',
-        @LogToTable bit = 0
-    )
-as
-begin
-    set nocount on
-    declare @msg nvarchar(max);
-    declare @minPageCountForIndex int = 40;
-    declare @OperationTime datetime2 = sysdatetime();
-    declare @KeepXOperationInLog int =3;
-
-    /* make sure parameters selected correctly */
-    set @operation = lower(@operation)
-    set @mode = lower(@mode)
-    
-    if @mode not in ('smart','dummy')
-        set @mode = 'smart'
-
-    if @operation not in ('index','statistics','all') or @operation is null
-    begin
-        raiserror('@operation (varchar(10)) [mandatory]',0,0)
-        raiserror(' Select operation to perform:',0,0)
-        raiserror('     "index" to perform index maintenance',0,0)
-        raiserror('     "statistics" to perform statistics maintenance',0,0)
-        raiserror('     "all" to perform indexes and statistics maintenance',0,0)
-        raiserror(' ',0,0)
-        raiserror('@mode(varchar(10)) [optional]',0,0)
-        raiserror(' optionaly you can supply second parameter for operation mode: ',0,0)
-        raiserror('     "smart" (Default) using smart decition about what index or stats should be touched.',0,0)
-        raiserror('     "dummy" going through all indexes and statistics regardless thier modifications or fragmentation.',0,0)
-        raiserror(' ',0,0)
-        raiserror('@LogToTable(bit) [optional]',0,0)
-        raiserror(' Logging option: @LogToTable(bit)',0,0)
-        raiserror('     0 - (Default) do not log operation to table',0,0)
-        raiserror('     1 - log operation to table',0,0)
-        raiserror('		for logging option only 3 last execution will be kept by default. this can be changed by easily in the procedure body.',0,0)
-        raiserror('		Log table will be created automatically if not exists.',0,0)
-    end
-    else 
-    begin
-        /*Write operation parameters*/
-        raiserror('-----------------------',0,0)
-        set @msg = 'set operation = ' + @operation;
-        raiserror(@msg,0,0)
-        set @msg = 'set mode = ' + @mode;
-        raiserror(@msg,0,0)
-        set @msg = 'set LogToTable = ' + cast(@LogToTable as varchar(1));
-        raiserror(@msg,0,0)
-        raiserror('-----------------------',0,0)
-    end
-    
-    /* Prepare Log Table */
-        if object_id('AzureSQLMaintenanceLog') is null 
-        begin
-            create table AzureSQLMaintenanceLog (id bigint primary key identity(1,1), OperationTime datetime2, command varchar(4000),ExtraInfo varchar(4000), StartTime datetime2, EndTime datetime2, StatusMessage varchar(1000));
-        end
-
-    if @LogToTable=1 insert into AzureSQLMaintenanceLog values(@OperationTime,null,null,sysdatetime(),sysdatetime(),'Starting operation: Operation=' +@operation + ' Mode=' + @mode + ' Keep log for last ' + cast(@KeepXOperationInLog as varchar(10)) + ' operations' )	
-
-    create table #cmdQueue (txtCMD nvarchar(max),ExtraInfo varchar(max))
-
-
-    if @operation in('index','all')
-    begin
-        raiserror('Get index information...(wait)',0,0) with nowait;
-        /* Get Index Information */
-        select 
-            i.[object_id]
-            ,ObjectSchema = OBJECT_SCHEMA_NAME(i.object_id)
-            ,ObjectName = object_name(i.object_id) 
-            ,IndexName = idxs.name
-            ,i.avg_fragmentation_in_percent
-            ,i.page_count
-            ,i.index_id
-            ,i.partition_number
-            ,i.index_type_desc
-            ,i.avg_page_space_used_in_percent
-            ,i.record_count
-            ,i.ghost_record_count
-            ,i.forwarded_record_count
-            ,null as OnlineOpIsNotSupported
-        into #idxBefore
-        from sys.dm_db_index_physical_stats(DB_ID(),NULL, NULL, NULL ,'limited') i
-        left join sys.indexes idxs on i.object_id = idxs.object_id and i.index_id = idxs.index_id
-        where idxs.type in (1/*Clustered index*/,2/*NonClustered index*/) /*Avoid HEAPS*/
-        order by i.avg_fragmentation_in_percent desc, page_count desc
-
-
-        -- mark indexes XML,spatial and columnstore not to run online update 
-        update #idxBefore set OnlineOpIsNotSupported=1 where [object_id] in (select [object_id] from #idxBefore where index_id >=1000)
-        
-        
-        raiserror('---------------------------------------',0,0) with nowait
-        raiserror('Index Information:',0,0) with nowait
-        raiserror('---------------------------------------',0,0) with nowait
-
-        select @msg = count(*) from #idxBefore where index_id in (1,2)
-        set @msg = 'Total Indexes: ' + @msg
-        raiserror(@msg,0,0) with nowait
-
-        select @msg = avg(avg_fragmentation_in_percent) from #idxBefore where index_id in (1,2) and page_count>@minPageCountForIndex
-        set @msg = 'Average Fragmentation: ' + @msg
-        raiserror(@msg,0,0) with nowait
-
-        select @msg = sum(iif(avg_fragmentation_in_percent>=5 and page_count>@minPageCountForIndex,1,0)) from #idxBefore where index_id in (1,2)
-        set @msg = 'Fragmented Indexes: ' + @msg
-        raiserror(@msg,0,0) with nowait
-
-                
-        raiserror('---------------------------------------',0,0) with nowait
-
-            
-            
-            
-        /* create queue for update indexes */
-        insert into #cmdQueue
-        select 
-        txtCMD = 
-        case when avg_fragmentation_in_percent>5 and avg_fragmentation_in_percent<30 and @mode = 'smart' then
-            'ALTER INDEX [' + IndexName + '] ON [' + ObjectSchema + '].[' + ObjectName + '] REORGANIZE;'
-            when OnlineOpIsNotSupported=1 then
-            'ALTER INDEX [' + IndexName + '] ON [' + ObjectSchema + '].[' + ObjectName + '] REBUILD WITH(ONLINE=OFF,MAXDOP=1);'
-            else
-            'ALTER INDEX [' + IndexName + '] ON [' + ObjectSchema + '].[' + ObjectName + '] REBUILD WITH(ONLINE=ON,MAXDOP=1);'
-        end
-        , ExtraInfo = 'Current fragmentation: ' + format(avg_fragmentation_in_percent/100,'p')
-        from #idxBefore
-        where 
-            index_id>0 /*disable heaps*/ 
-            and index_id < 1000 /* disable XML indexes */
-            --
-            and 
-                (
-                    page_count> @minPageCountForIndex and /* not small tables */
-                    avg_fragmentation_in_percent>=5
-                )
-            or
-                (
-                    @mode ='dummy'
-                )
-    end
-
-    if @operation in('statistics','all')
-    begin 
-        /*Gets Stats for database*/
-        raiserror('Get statistics information...',0,0) with nowait;
-        select 
-            ObjectSchema = OBJECT_SCHEMA_NAME(s.object_id)
-            ,ObjectName = object_name(s.object_id) 
-            ,StatsName = s.name
-            ,sp.last_updated
-            ,sp.rows
-            ,sp.rows_sampled
-            ,sp.modification_counter
-        into #statsBefore
-        from sys.stats s cross apply sys.dm_db_stats_properties(s.object_id,s.stats_id) sp 
-        where OBJECT_SCHEMA_NAME(s.object_id) != 'sys' and (sp.modification_counter>0 or @mode='dummy')
-        order by sp.last_updated asc
-
-        
-        raiserror('---------------------------------------',0,0) with nowait
-        raiserror('Statistics Information:',0,0) with nowait
-        raiserror('---------------------------------------',0,0) with nowait
-
-        select @msg = sum(modification_counter) from #statsBefore
-        set @msg = 'Total Modifications: ' + @msg
-        raiserror(@msg,0,0) with nowait
-        
-        select @msg = sum(iif(modification_counter>0,1,0)) from #statsBefore
-        set @msg = 'Modified Statistics: ' + @msg
-        raiserror(@msg,0,0) with nowait
-                
-        raiserror('---------------------------------------',0,0) with nowait
-
-
-
-
-        /* create queue for update stats */
-        insert into #cmdQueue
-        select 
-        txtCMD = 'UPDATE STATISTICS [' + ObjectSchema + '].[' + ObjectName + '] (['+ StatsName +']) WITH FULLSCAN;'
-        , ExtraInfo = '#rows:' + cast([rows] as varchar(100)) + ' #modifications:' + cast(modification_counter as varchar(100)) + ' modification percent: ' + format((1.0 * modification_counter/ rows ),'p')
-        from #statsBefore
-    end
-
-
-    if @operation in('statistics','index','all')
-    begin 
-        /* iterate through all stats */
-        raiserror('Start executing commands...',0,0) with nowait
-        declare @SQLCMD nvarchar(max);
-        declare @ExtraInfo nvarchar(max);
-        declare @T table(txtCMD nvarchar(max),ExtraInfo nvarchar(max));
-        while exists(select * from #cmdQueue)
-        begin
-            delete top (1) from #cmdQueue output deleted.* into @T;
-            select top (1) @SQLCMD = txtCMD, @ExtraInfo=ExtraInfo from @T
-            raiserror(@SQLCMD,0,0) with nowait
-            if @LogToTable=1 insert into AzureSQLMaintenanceLog values(@OperationTime,@SQLCMD,@ExtraInfo,sysdatetime(),null,'Started')
-            begin try
-                exec(@SQLCMD)	
-                if @LogToTable=1 update AzureSQLMaintenanceLog set EndTime = sysdatetime(), StatusMessage = 'Succeeded' where id=SCOPE_IDENTITY()
-            end try
-            begin catch
-                raiserror('cached',0,0) with nowait
-                if @LogToTable=1 update AzureSQLMaintenanceLog set EndTime = sysdatetime(), StatusMessage = 'FAILED : ' + CAST(ERROR_NUMBER() AS VARCHAR(50)) + ERROR_MESSAGE() where id=SCOPE_IDENTITY()
-            end catch
-            delete from @T
-        end
-    end
-    
-    /* Clean old records from log table */
-    if @LogToTable=1
-    begin
-        delete from AzureSQLMaintenanceLog 
-        from 
-            AzureSQLMaintenanceLog L join 
-            (select distinct OperationTime from AzureSQLMaintenanceLog order by OperationTime desc offset @KeepXOperationInLog rows) F
-                ON L.OperationTime = F.OperationTime
-        insert into AzureSQLMaintenanceLog values(@OperationTime,null,cast(@@rowcount as varchar(100))+ ' rows purged from log table because number of operations to keep is set to: ' + cast( @KeepXOperationInLog as varchar(100)),sysdatetime(),sysdatetime(),'Cleanup Log Table')
-    end
-
-    raiserror('Done',0,0)
-    if @LogToTable=1 insert into AzureSQLMaintenanceLog values(@OperationTime,null,null,sysdatetime(),sysdatetime(),'End of operation')
-end
-GO

util/Setup/DbScripts/2018-10-17_00_ManagerRole.sql

@@ -1,550 +0,0 @@
-ALTER TABLE [dbo].[Group] ALTER COLUMN [Name] NVARCHAR (100) NOT NULL
-GO
-
-IF OBJECT_ID('[dbo].[UserCollectionDetails]') IS NOT NULL
-BEGIN
-    DROP FUNCTION [dbo].[UserCollectionDetails]
-END
-GO
-
-CREATE FUNCTION [dbo].[UserCollectionDetails](@UserId UNIQUEIDENTIFIER)
-RETURNS TABLE
-AS RETURN
-SELECT
-    C.*,
-    CASE
-        WHEN
-            OU.[AccessAll] = 1
-            OR G.[AccessAll] = 1
-            OR CU.[ReadOnly] = 0
-            OR CG.[ReadOnly] = 0
-        THEN 0
-        ELSE 1
-    END [ReadOnly]
-FROM
-    [dbo].[CollectionView] C
-INNER JOIN
-    [dbo].[OrganizationUser] OU ON C.[OrganizationId] = OU.[OrganizationId]
-INNER JOIN
-    [dbo].[Organization] O ON O.[Id] = C.[OrganizationId]
-LEFT JOIN
-    [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = [OU].[Id]
-LEFT JOIN
-    [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-LEFT JOIN
-    [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-LEFT JOIN
-    [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
-WHERE
-    OU.[UserId] = @UserId
-    AND OU.[Status] = 2 -- 2 = Confirmed
-    AND O.[Enabled] = 1
-    AND (
-        OU.[AccessAll] = 1
-        OR CU.[CollectionId] IS NOT NULL
-        OR G.[AccessAll] = 1
-        OR CG.[CollectionId] IS NOT NULL
-    )
-GO
-
-IF OBJECT_ID('[dbo].[Collection_ReadByIdUserId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Collection_ReadByIdUserId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Collection_ReadByIdUserId]
-    @Id UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-    SELECT TOP 1
-        *
-    FROM
-        [dbo].[UserCollectionDetails](@UserId)
-    WHERE
-        [Id] = @Id
-    ORDER BY
-        [ReadOnly] ASC
-END
-GO
-
-IF OBJECT_ID('[dbo].[Collection_ReadByUserId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Collection_ReadByUserId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Collection_ReadByUserId]
-    @UserId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[UserCollectionDetails](@UserId)
-END
-GO
-
-IF OBJECT_ID('[dbo].[Collection_ReadWithGroupsByIdUserId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Collection_ReadWithGroupsByIdUserId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Collection_ReadWithGroupsByIdUserId]
-    @Id UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    EXEC [dbo].[Collection_ReadByIdUserId] @Id, @UserId
-
-    SELECT
-        [GroupId] [Id],
-        [ReadOnly]
-    FROM
-        [dbo].[CollectionGroup]
-    WHERE
-        [CollectionId] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[Collection_UpdateUsers]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Collection_UpdateUsers]
-END
-GO
-
-IF OBJECT_ID('[dbo].[CollectionUser_UpdateUsers]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CollectionUser_UpdateUsers]
-END
-GO
-
-CREATE PROCEDURE [dbo].[CollectionUser_UpdateUsers]
-    @CollectionId UNIQUEIDENTIFIER,
-    @Users AS [dbo].[SelectionReadOnlyArray] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @OrgId UNIQUEIDENTIFIER = (
-        SELECT TOP 1
-            [OrganizationId]
-        FROM
-            [dbo].[Collection]
-        WHERE
-            [Id] = @CollectionId
-    )
-
-    ;WITH [AvailableUsersCTE] AS(
-        SELECT
-            Id
-        FROM
-            [dbo].[OrganizationUser]
-        WHERE
-            OrganizationId = @OrgId
-    )
-    MERGE
-        [dbo].[CollectionUser] AS [Target]
-    USING 
-        @Users AS [Source]
-    ON
-        [Target].[CollectionId] = @CollectionId
-        AND [Target].[OrganizationUserId] = [Source].[Id]
-    WHEN NOT MATCHED BY TARGET
-    AND [Source].[Id] IN (SELECT [Id] FROM [AvailableUsersCTE]) THEN
-        INSERT VALUES
-        (
-            @CollectionId,
-            [Source].[Id],
-            [Source].[ReadOnly]
-        )
-    WHEN MATCHED AND [Target].[ReadOnly] != [Source].[ReadOnly] THEN
-        UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly]
-    WHEN NOT MATCHED BY SOURCE
-    AND [Target].[CollectionId] = @CollectionId THEN
-        DELETE
-    ;
-
-    EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @CollectionId, @OrgId
-END
-GO
-
-IF OBJECT_ID('[dbo].[CollectionUserDetails_ReadByCollectionId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CollectionUserDetails_ReadByCollectionId]
-END
-GO
-
-IF OBJECT_ID('[dbo].[CollectionUser_ReadByCollectionId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CollectionUser_ReadByCollectionId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[CollectionUser_ReadByCollectionId]
-    @CollectionId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        [OrganizationUserId] [Id],
-        [ReadOnly]
-    FROM
-        [dbo].[CollectionUser]
-    WHERE
-        [CollectionId] = @CollectionId
-END
-GO
-
-IF OBJECT_ID('[dbo].[GroupUserDetails_ReadByGroupId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[GroupUserDetails_ReadByGroupId]
-END
-GO
-
-IF OBJECT_ID('[dbo].[GroupUser_ReadOrganizationUserIdsByGroupId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[GroupUser_ReadOrganizationUserIdsByGroupId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[GroupUser_ReadOrganizationUserIdsByGroupId]
-    @GroupId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        [OrganizationUserId]
-    FROM
-        [dbo].[GroupUser]
-    WHERE
-        [GroupId] = @GroupId
-END
-GO
-
-IF OBJECT_ID('[dbo].[Cipher_UpdateCollections]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Cipher_UpdateCollections]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Cipher_UpdateCollections]
-    @Id UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @CollectionIds AS [dbo].[GuidIdArray] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    IF @OrganizationId IS NULL OR (SELECT COUNT(1) FROM @CollectionIds) < 1
-    BEGIN
-        RETURN(-1)
-    END
-
-    CREATE TABLE #AvailableCollections (
-        [Id] UNIQUEIDENTIFIER
-    )
-
-    IF @UserId IS NULL
-    BEGIN
-        INSERT INTO #AvailableCollections
-            SELECT
-                [Id]
-            FROM
-                [dbo].[Collection]
-            WHERE
-                [OrganizationId] = @OrganizationId
-    END
-    ELSE
-    BEGIN
-        INSERT INTO #AvailableCollections
-            SELECT
-                C.[Id]
-            FROM
-                [dbo].[Collection] C
-            INNER JOIN
-                [Organization] O ON O.[Id] = C.[OrganizationId]
-            INNER JOIN
-                [dbo].[OrganizationUser] OU ON OU.[OrganizationId] = O.[Id] AND OU.[UserId] = @UserId
-            LEFT JOIN
-                [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = OU.[Id]
-            LEFT JOIN
-                [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-            LEFT JOIN
-                [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-            LEFT JOIN
-                [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
-            WHERE
-                O.[Id] = @OrganizationId
-                AND O.[Enabled] = 1
-                AND OU.[Status] = 2 -- Confirmed
-                AND (
-                    OU.[AccessAll] = 1
-                    OR CU.[ReadOnly] = 0
-                    OR G.[AccessAll] = 1
-                    OR CG.[ReadOnly] = 0
-                )
-    END
-
-    IF (SELECT COUNT(1) FROM #AvailableCollections) < 1
-    BEGIN
-        -- No writable collections available to share with in this organization.
-        RETURN(-1)
-    END
-
-    INSERT INTO [dbo].[CollectionCipher]
-    (
-        [CollectionId],
-        [CipherId]
-    )
-    SELECT
-        [Id],
-        @Id
-    FROM
-        @CollectionIds
-    WHERE
-        [Id] IN (SELECT [Id] FROM #AvailableCollections)
-
-    RETURN(0)
-END
-GO
-
-IF OBJECT_ID('[dbo].[CipherDetails_CreateWithCollections]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[CipherDetails_CreateWithCollections]
-END
-GO
-
-CREATE PROCEDURE [dbo].[CipherDetails_CreateWithCollections]
-    @Id UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @Type TINYINT,
-    @Data NVARCHAR(MAX),
-    @Favorites NVARCHAR(MAX), -- not used
-    @Folders NVARCHAR(MAX), -- not used
-    @Attachments NVARCHAR(MAX), -- not used
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7),
-    @FolderId UNIQUEIDENTIFIER,
-    @Favorite BIT,
-    @Edit BIT, -- not used
-    @OrganizationUseTotp BIT, -- not used
-    @CollectionIds AS [dbo].[GuidIdArray] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    EXEC [dbo].[CipherDetails_Create] @Id, @UserId, @OrganizationId, @Type, @Data, @Favorites, @Folders,
-        @Attachments, @CreationDate, @RevisionDate, @FolderId, @Favorite, @Edit, @OrganizationUseTotp
-
-    DECLARE @UpdateCollectionsSuccess INT
-    EXEC @UpdateCollectionsSuccess = [dbo].[Cipher_UpdateCollections] @Id, @UserId, @OrganizationId, @CollectionIds
-END
-GO
-
-IF OBJECT_ID('[dbo].[Cipher_CreateWithCollections]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Cipher_CreateWithCollections]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Cipher_CreateWithCollections]
-    @Id UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @Type TINYINT,
-    @Data NVARCHAR(MAX),
-    @Favorites NVARCHAR(MAX),
-    @Folders NVARCHAR(MAX),
-    @Attachments NVARCHAR(MAX),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7),
-    @CollectionIds AS [dbo].[GuidIdArray] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    EXEC [dbo].[Cipher_Create] @Id, @UserId, @OrganizationId, @Type, @Data, @Favorites, @Folders,
-        @Attachments, @CreationDate, @RevisionDate
-
-    DECLARE @UpdateCollectionsSuccess INT
-    EXEC @UpdateCollectionsSuccess = [dbo].[Cipher_UpdateCollections] @Id, @UserId, @OrganizationId, @CollectionIds
-END
-GO
-
-IF OBJECT_ID('[dbo].[Cipher_UpdateWithCollections]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Cipher_UpdateWithCollections]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Cipher_UpdateWithCollections]
-    @Id UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @Type TINYINT,
-    @Data NVARCHAR(MAX),
-    @Favorites NVARCHAR(MAX),
-    @Folders NVARCHAR(MAX),
-    @Attachments NVARCHAR(MAX),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7),
-    @CollectionIds AS [dbo].[GuidIdArray] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    BEGIN TRANSACTION Cipher_UpdateWithCollections
-
-    DECLARE @UpdateCollectionsSuccess INT
-    EXEC @UpdateCollectionsSuccess = [dbo].[Cipher_UpdateCollections] @Id, @UserId, @OrganizationId, @CollectionIds
-
-    IF @UpdateCollectionsSuccess < 0
-    BEGIN
-        COMMIT TRANSACTION Cipher_UpdateWithCollections
-        SELECT -1 -- -1 = Failure
-        RETURN
-    END
-
-    UPDATE
-        [dbo].[Cipher]
-    SET
-        [UserId] = NULL,
-        [OrganizationId] = @OrganizationId,
-        [Data] = @Data,
-        [Attachments] = @Attachments,
-        [RevisionDate] = @RevisionDate
-        -- No need to update CreationDate, Favorites, Folders, or Type since that data will not change
-    WHERE
-        [Id] = @Id
-
-    COMMIT TRANSACTION Cipher_UpdateWithCollections
-
-    IF @Attachments IS NOT NULL
-    BEGIN
-        EXEC [dbo].[Organization_UpdateStorage] @OrganizationId
-        EXEC [dbo].[User_UpdateStorage] @UserId
-    END
-
-    EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
-
-    SELECT 0 -- 0 = Success
-END
-GO
-
-IF OBJECT_ID('[dbo].[Cipher_Create]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Cipher_Create]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Cipher_Create]
-    @Id UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @Type TINYINT,
-    @Data NVARCHAR(MAX),
-    @Favorites NVARCHAR(MAX),
-    @Folders NVARCHAR(MAX),
-    @Attachments NVARCHAR(MAX),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    INSERT INTO [dbo].[Cipher]
-    (
-        [Id],
-        [UserId],
-        [OrganizationId],
-        [Type],
-        [Data],
-        [Favorites],
-        [Folders],
-        [Attachments],
-        [CreationDate],
-        [RevisionDate]
-    )
-    VALUES
-    (
-        @Id,
-        CASE WHEN @OrganizationId IS NULL THEN @UserId ELSE NULL END,
-        @OrganizationId,
-        @Type,
-        @Data,
-        @Favorites,
-        @Folders,
-        @Attachments,
-        @CreationDate,
-        @RevisionDate
-    )
-
-    IF @OrganizationId IS NOT NULL
-    BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
-    END
-    ELSE IF @UserId IS NOT NULL
-    BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
-    END
-END
-GO
-
-IF OBJECT_ID('[dbo].[Cipher_Update]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Cipher_Update]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Cipher_Update]
-    @Id UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @Type TINYINT,
-    @Data NVARCHAR(MAX),
-    @Favorites NVARCHAR(MAX),
-    @Folders NVARCHAR(MAX),
-    @Attachments NVARCHAR(MAX),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    UPDATE
-        [dbo].[Cipher]
-    SET
-        [UserId] = CASE WHEN @OrganizationId IS NULL THEN @UserId ELSE NULL END,
-        [OrganizationId] = @OrganizationId,
-        [Type] = @Type,
-        [Data] = @Data,
-        [Favorites] = @Favorites,
-        [Folders] = @Folders,
-        [Attachments] = @Attachments,
-        [CreationDate] = @CreationDate,
-        [RevisionDate] = @RevisionDate
-    WHERE
-        [Id] = @Id
-
-    IF @OrganizationId IS NOT NULL
-    BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
-    END
-    ELSE IF @UserId IS NOT NULL
-    BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
-    END
-END
-GO

util/Setup/DbScripts/2018-12-19_00_OrgUserTwoFactorEnabled.sql

@@ -1,25 +0,0 @@
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'OrganizationUserUserDetailsView')
-BEGIN
-    DROP VIEW [dbo].[OrganizationUserUserDetailsView]
-END
-GO
-
-CREATE VIEW [dbo].[OrganizationUserUserDetailsView]
-AS
-SELECT
-    OU.[Id],
-    OU.[UserId],
-    OU.[OrganizationId],
-    U.[Name],
-    ISNULL(U.[Email], OU.[Email]) Email,
-    U.[TwoFactorProviders],
-    U.[Premium],
-    OU.[Status],
-    OU.[Type],
-    OU.[AccessAll],
-    OU.[ExternalId]
-FROM
-    [dbo].[OrganizationUser] OU
-LEFT JOIN
-    [dbo].[User] U ON U.[Id] = OU.[UserId]
-GO

util/Setup/DbScripts/2019-01-31_00_Transactions.sql

@@ -1,253 +0,0 @@
-IF OBJECT_ID('[dbo].[Transaction]') IS NULL
-BEGIN
-    CREATE TABLE [dbo].[Transaction] (
-        [Id]                    UNIQUEIDENTIFIER    NOT NULL,
-        [UserId]                UNIQUEIDENTIFIER    NULL,
-        [OrganizationId]        UNIQUEIDENTIFIER    NULL,
-        [Type]                  TINYINT             NOT NULL,
-        [Amount]                MONEY               NOT NULL,
-        [Refunded]              BIT                 NULL,
-        [RefundedAmount]        MONEY               NULL,
-        [Details]               NVARCHAR(100)       NULL,
-        [PaymentMethodType]     TINYINT             NULL,
-        [Gateway]               TINYINT             NULL,
-        [GatewayId]             VARCHAR(50)         NULL,
-        [CreationDate]          DATETIME2 (7)       NOT NULL,
-        CONSTRAINT [PK_Transaction] PRIMARY KEY CLUSTERED ([Id] ASC),
-        CONSTRAINT [FK_Transaction_User] FOREIGN KEY ([UserId]) REFERENCES [dbo].[User] ([Id]) ON DELETE CASCADE,
-        CONSTRAINT [FK_Transaction_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id]) ON DELETE CASCADE
-    );
-
-    CREATE UNIQUE NONCLUSTERED INDEX [IX_Transaction_Gateway_GatewayId]
-        ON [dbo].[Transaction]([Gateway] ASC, [GatewayId] ASC)
-        WHERE [Gateway] IS NOT NULL AND [GatewayId] IS NOT NULL;
-
-    CREATE NONCLUSTERED INDEX [IX_Transaction_UserId_OrganizationId_CreationDate]
-        ON [dbo].[Transaction]([UserId] ASC, [OrganizationId] ASC, [CreationDate] ASC);
-END
-GO
-
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'TransactionView')
-BEGIN
-    DROP VIEW [dbo].[TransactionView]
-END
-GO
-
-CREATE VIEW [dbo].[TransactionView]
-AS
-SELECT
-    *
-FROM
-    [dbo].[Transaction]
-GO
-
-IF OBJECT_ID('[dbo].[Transaction_Create]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Transaction_Create]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Transaction_Create]
-    @Id UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @Type TINYINT,
-    @Amount MONEY,
-    @Refunded BIT,
-    @RefundedAmount MONEY,
-    @Details NVARCHAR(100),
-    @PaymentMethodType TINYINT,
-    @Gateway TINYINT,
-    @GatewayId VARCHAR(50),
-    @CreationDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    INSERT INTO [dbo].[Transaction]
-    (
-        [Id],
-        [UserId],
-        [OrganizationId],
-        [Type],
-        [Amount],
-        [Refunded],
-        [RefundedAmount],
-        [Details],
-        [PaymentMethodType],
-        [Gateway],
-        [GatewayId],
-        [CreationDate]
-    )
-    VALUES
-    (
-        @Id,
-        @UserId,
-        @OrganizationId,
-        @Type,
-        @Amount,
-        @Refunded,
-        @RefundedAmount,
-        @Details,
-        @PaymentMethodType,
-        @Gateway,
-        @GatewayId,
-        @CreationDate
-    )
-END
-GO
-
-IF OBJECT_ID('[dbo].[Transaction_DeleteById]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Transaction_DeleteById]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Transaction_DeleteById]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DELETE
-    FROM
-        [dbo].[Transaction]
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[Transaction_ReadById]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Transaction_ReadById]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Transaction_ReadById]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[TransactionView]
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[Transaction_ReadByOrganizationId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Transaction_ReadByOrganizationId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Transaction_ReadByOrganizationId]
-    @OrganizationId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[TransactionView]
-    WHERE
-        [UserId] IS NULL
-        AND [OrganizationId] = @OrganizationId
-END
-GO
-
-IF OBJECT_ID('[dbo].[Transaction_ReadByUserId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Transaction_ReadByUserId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Transaction_ReadByUserId]
-    @UserId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[TransactionView]
-    WHERE
-        [UserId] = @UserId
-END
-GO
-
-IF OBJECT_ID('[dbo].[Transaction_Update]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Transaction_Update]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Transaction_Update]
-    @Id UNIQUEIDENTIFIER,
-    @UserId UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @Type TINYINT,
-    @Amount MONEY,
-    @Refunded BIT,
-    @RefundedAmount MONEY,
-    @Details NVARCHAR(100),
-    @PaymentMethodType TINYINT,
-    @Gateway TINYINT,
-    @GatewayId VARCHAR(50),
-    @CreationDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    UPDATE
-        [dbo].[Transaction]
-    SET
-        [UserId] = @UserId,
-        [OrganizationId] = @OrganizationId,
-        [Type] = @Type,
-        [Amount] = @Amount,
-        [Refunded] = @Refunded,
-        [RefundedAmount] = @RefundedAmount,
-        [Details] = @Details,
-        [PaymentMethodType] = @PaymentMethodType,
-        [Gateway] = @Gateway,
-        [GatewayId] = @GatewayId,
-        [CreationDate] = @CreationDate
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[Transaction_ReadByGatewayId]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Transaction_ReadByGatewayId]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Transaction_ReadByGatewayId]
-    @Gateway TINYINT,
-    @GatewayId VARCHAR(50)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[TransactionView]
-    WHERE
-        [Gateway] = @Gateway
-        AND [GatewayId] = @GatewayId
-END
-GO
-
-IF OBJECT_ID('[dbo].[User_ReadByPremiumRenewal]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[User_ReadByPremiumRenewal]
-END
-GO

util/Setup/DbScripts/2019-03-01_00_OrgApi.sql

@@ -1,628 +0,0 @@
--- Setup for random string generation
-
-CREATE VIEW [dbo].[SecureRandomBytes]
-AS
-SELECT [RandBytes] = CRYPT_GEN_RANDOM(2)
-GO
-
-CREATE FUNCTION [dbo].[SecureRandomString]()
-RETURNS varchar(30)
-AS
-BEGIN
-    declare @sLength tinyint
-    declare @randomString varchar(30)
-    declare @counter tinyint
-    declare @nextChar char(1)
-    declare @rnd as float
-    declare @bytes binary(2)
-
-    set @sLength = 30
-    set @counter = 1
-    set @randomString = ''
-
-    while @counter <= @sLength
-    begin
-        select @bytes = [RandBytes] from [dbo].[SecureRandomBytes]
-        select @rnd = cast(cast(cast(@bytes as int) as float) / 65535 as float)
-        select @nextChar = char(48 + convert(int, (122-48+1) * @rnd))
-        if ascii(@nextChar) not in (58,59,60,61,62,63,64,91,92,93,94,95,96)
-        begin
-            select @randomString = @randomString + @nextChar
-            set @counter = @counter + 1
-        end
-     end
-     return @randomString 
-END
-GO
-
--- End setup
-
-IF COL_LENGTH('[dbo].[Organization]', 'UseApi') IS NULL
-BEGIN
-    ALTER TABLE
-        [dbo].[Organization]
-    ADD
-        [UseApi] BIT NULL
-END
-GO
-
-UPDATE
-    [dbo].[Organization]
-SET
-    [UseApi] = (CASE WHEN [PlanType] = 5 OR [PlanType] = 4 THEN 1 ELSE 0 END)
-GO
-
-ALTER TABLE
-    [dbo].[Organization]
-ALTER COLUMN
-    [UseApi] BIT NOT NULL
-GO
-
-IF COL_LENGTH('[dbo].[Organization]', 'ApiKey') IS NULL
-BEGIN
-    ALTER TABLE
-        [dbo].[Organization]
-    ADD
-        [ApiKey] VARCHAR(30) NULL
-END
-GO
-
-UPDATE
-    [dbo].[Organization]
-SET
-    [ApiKey] = (SELECT [dbo].[SecureRandomString]())
-GO
-
-ALTER TABLE
-    [dbo].[Organization]
-ALTER COLUMN
-    [ApiKey] VARCHAR(30) NOT NULL
-GO
-
--- Cleanup random string generation
-
-DROP VIEW [dbo].[SecureRandomBytes]
-GO
-DROP FUNCTION [dbo].[SecureRandomString]
-GO
-
--- End
-
-IF OBJECT_ID('[dbo].[Organization_Create]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_Create]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_Create]
-    @Id UNIQUEIDENTIFIER,
-    @Name NVARCHAR(50),
-    @BusinessName NVARCHAR(50),
-    @BusinessAddress1 NVARCHAR(50),
-    @BusinessAddress2 NVARCHAR(50),
-    @BusinessAddress3 NVARCHAR(50),
-    @BusinessCountry VARCHAR(2),
-    @BusinessTaxNumber NVARCHAR(30),
-    @BillingEmail NVARCHAR(50),
-    @Plan NVARCHAR(50),
-    @PlanType TINYINT,
-    @Seats SMALLINT,
-    @MaxCollections SMALLINT,
-    @UseGroups BIT,
-    @UseDirectory BIT,
-    @UseEvents BIT,
-    @UseTotp BIT,
-    @Use2fa BIT,
-    @UseApi BIT,
-    @SelfHost BIT,
-    @UsersGetPremium BIT,
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @Enabled BIT,
-    @LicenseKey VARCHAR(100),
-    @ApiKey VARCHAR(30),
-    @TwoFactorProviders NVARCHAR(MAX),
-    @ExpirationDate DATETIME2(7),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    INSERT INTO [dbo].[Organization]
-    (
-        [Id],
-        [Name],
-        [BusinessName],
-        [BusinessAddress1],
-        [BusinessAddress2],
-        [BusinessAddress3],
-        [BusinessCountry],
-        [BusinessTaxNumber],
-        [BillingEmail],
-        [Plan],
-        [PlanType],
-        [Seats],
-        [MaxCollections],
-        [UseGroups],
-        [UseDirectory],
-        [UseEvents],
-        [UseTotp],
-        [Use2fa],
-        [UseApi],
-        [SelfHost],
-        [UsersGetPremium],
-        [Storage],
-        [MaxStorageGb],
-        [Gateway],
-        [GatewayCustomerId],
-        [GatewaySubscriptionId],
-        [Enabled],
-        [LicenseKey],
-        [ApiKey],
-        [TwoFactorProviders],
-        [ExpirationDate],
-        [CreationDate],
-        [RevisionDate]
-    )
-    VALUES
-    (
-        @Id,
-        @Name,
-        @BusinessName,
-        @BusinessAddress1,
-        @BusinessAddress2,
-        @BusinessAddress3,
-        @BusinessCountry,
-        @BusinessTaxNumber,
-        @BillingEmail,
-        @Plan,
-        @PlanType,
-        @Seats,
-        @MaxCollections,
-        @UseGroups,
-        @UseDirectory,
-        @UseEvents,
-        @UseTotp,
-        @Use2fa,
-        @UseApi,
-        @SelfHost,
-        @UsersGetPremium,
-        @Storage,
-        @MaxStorageGb,
-        @Gateway,
-        @GatewayCustomerId,
-        @GatewaySubscriptionId,
-        @Enabled,
-        @LicenseKey,
-        @ApiKey,
-        @TwoFactorProviders,
-        @ExpirationDate,
-        @CreationDate,
-        @RevisionDate
-    )
-END
-GO
-
-IF OBJECT_ID('[dbo].[Organization_Update]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Organization_Update]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Organization_Update]
-    @Id UNIQUEIDENTIFIER,
-    @Name NVARCHAR(50),
-    @BusinessName NVARCHAR(50),
-    @BusinessAddress1 NVARCHAR(50),
-    @BusinessAddress2 NVARCHAR(50),
-    @BusinessAddress3 NVARCHAR(50),
-    @BusinessCountry VARCHAR(2),
-    @BusinessTaxNumber NVARCHAR(30),
-    @BillingEmail NVARCHAR(50),
-    @Plan NVARCHAR(50),
-    @PlanType TINYINT,
-    @Seats SMALLINT,
-    @MaxCollections SMALLINT,
-    @UseGroups BIT,
-    @UseDirectory BIT,
-    @UseEvents BIT,
-    @UseTotp BIT,
-    @Use2fa BIT,
-    @UseApi BIT,
-    @SelfHost BIT,
-    @UsersGetPremium BIT,
-    @Storage BIGINT,
-    @MaxStorageGb SMALLINT,
-    @Gateway TINYINT,
-    @GatewayCustomerId VARCHAR(50),
-    @GatewaySubscriptionId VARCHAR(50),
-    @Enabled BIT,
-    @LicenseKey VARCHAR(100),
-    @ApiKey VARCHAR(30),
-    @TwoFactorProviders NVARCHAR(MAX),
-    @ExpirationDate DATETIME2(7),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    UPDATE
-        [dbo].[Organization]
-    SET
-        [Name] = @Name,
-        [BusinessName] = @BusinessName,
-        [BusinessAddress1] = @BusinessAddress1,
-        [BusinessAddress2] = @BusinessAddress2,
-        [BusinessAddress3] = @BusinessAddress3,
-        [BusinessCountry] = @BusinessCountry,
-        [BusinessTaxNumber] = @BusinessTaxNumber,
-        [BillingEmail] = @BillingEmail,
-        [Plan] = @Plan,
-        [PlanType] = @PlanType,
-        [Seats] = @Seats,
-        [MaxCollections] = @MaxCollections,
-        [UseGroups] = @UseGroups,
-        [UseDirectory] = @UseDirectory,
-        [UseEvents] = @UseEvents,
-        [UseTotp] = @UseTotp,
-        [Use2fa] = @Use2fa,
-        [UseApi] = @UseApi,
-        [SelfHost] = @SelfHost,
-        [UsersGetPremium] = @UsersGetPremium,
-        [Storage] = @Storage,
-        [MaxStorageGb] = @MaxStorageGb,
-        [Gateway] = @Gateway,
-        [GatewayCustomerId] = @GatewayCustomerId,
-        [GatewaySubscriptionId] = @GatewaySubscriptionId,
-        [Enabled] = @Enabled,
-        [LicenseKey] = @LicenseKey,
-        [ApiKey] = @ApiKey,
-        [TwoFactorProviders] = @TwoFactorProviders,
-        [ExpirationDate] = @ExpirationDate,
-        [CreationDate] = @CreationDate,
-        [RevisionDate] = @RevisionDate
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'OrganizationView')
-BEGIN
-    DROP VIEW [dbo].[OrganizationView]
-END
-GO
-
-CREATE VIEW [dbo].[OrganizationView]
-AS
-SELECT
-    *
-FROM
-    [dbo].[Organization]
-GO
-
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'OrganizationUserOrganizationDetailsView')
-BEGIN
-    DROP VIEW [dbo].[OrganizationUserOrganizationDetailsView]
-END
-GO
-
-CREATE VIEW [dbo].[OrganizationUserOrganizationDetailsView]
-AS
-SELECT
-    OU.[UserId],
-    OU.[OrganizationId],
-    O.[Name],
-    O.[Enabled],
-    O.[UseGroups],
-    O.[UseDirectory],
-    O.[UseEvents],
-    O.[UseTotp],
-    O.[Use2fa],
-    O.[UseApi],
-    O.[SelfHost],
-    O.[UsersGetPremium],
-    O.[Seats],
-    O.[MaxCollections],
-    O.[MaxStorageGb],
-    OU.[Key],
-    OU.[Status],
-    OU.[Type]
-FROM
-    [dbo].[OrganizationUser] OU
-INNER JOIN
-    [dbo].[Organization] O ON O.[Id] = OU.[OrganizationId]
-GO
-
-IF OBJECT_ID('[dbo].[OrganizationUserUserDetails_ReadById]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[OrganizationUserUserDetails_ReadById]
-END
-GO
-
-CREATE PROCEDURE [dbo].[OrganizationUserUserDetails_ReadById]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[OrganizationUserUserDetailsView]
-    WHERE
-        [Id] = @Id
-END
-GO
-
-IF OBJECT_ID('[dbo].[OrganizationUserUserDetails_ReadWithCollectionsById]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[OrganizationUserUserDetails_ReadWithCollectionsById]
-END
-GO
-
-CREATE PROCEDURE [dbo].[OrganizationUserUserDetails_ReadWithCollectionsById]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    EXEC [OrganizationUserUserDetails_ReadById] @Id
-
-    SELECT
-        CU.[CollectionId] Id,
-        CU.[ReadOnly]
-    FROM
-        [dbo].[OrganizationUser] OU
-    INNER JOIN
-        [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[OrganizationUserId] = [OU].[Id]
-    WHERE
-        [OrganizationUserId] = @Id
-END
-GO
-
-IF COL_LENGTH('[dbo].[Collection]', 'ExternalId') IS NULL
-BEGIN
-    ALTER TABLE
-        [dbo].[Collection]
-    ADD
-        [ExternalId] NVARCHAR(300) NULL
-END
-GO
-
-IF OBJECT_ID('[dbo].[Collection_Create]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Collection_Create]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Collection_Create]
-    @Id UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @Name VARCHAR(MAX),
-    @ExternalId NVARCHAR(300),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    INSERT INTO [dbo].[Collection]
-    (
-        [Id],
-        [OrganizationId],
-        [Name],
-        [ExternalId],
-        [CreationDate],
-        [RevisionDate]
-    )
-    VALUES
-    (
-        @Id,
-        @OrganizationId,
-        @Name,
-        @ExternalId,
-        @CreationDate,
-        @RevisionDate
-    )
-
-    EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @Id, @OrganizationId
-END
-GO
-
-IF OBJECT_ID('[dbo].[Collection_Update]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Collection_Update]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Collection_Update]
-    @Id UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @Name VARCHAR(MAX),
-    @ExternalId NVARCHAR(300),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    UPDATE
-        [dbo].[Collection]
-    SET
-        [OrganizationId] = @OrganizationId,
-        [Name] = @Name,
-        [ExternalId] = @ExternalId,
-        [CreationDate] = @CreationDate,
-        [RevisionDate] = @RevisionDate
-    WHERE
-        [Id] = @Id
-
-    EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @Id, @OrganizationId
-END
-GO
-
-IF OBJECT_ID('[dbo].[Collection_CreateWithGroups]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Collection_CreateWithGroups]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Collection_CreateWithGroups]
-    @Id UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @Name VARCHAR(MAX),
-    @ExternalId NVARCHAR(300),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7),
-    @Groups AS [dbo].[SelectionReadOnlyArray] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    EXEC [dbo].[Collection_Create] @Id, @OrganizationId, @Name, @ExternalId, @CreationDate, @RevisionDate
-
-    ;WITH [AvailableGroupsCTE] AS(
-        SELECT
-            [Id]
-        FROM
-            [dbo].[Group]
-        WHERE
-            [OrganizationId] = @OrganizationId
-    )
-    INSERT INTO [dbo].[CollectionGroup]
-    (
-        [CollectionId],
-        [GroupId],
-        [ReadOnly]
-    )
-    SELECT
-        @Id,
-        [Id],
-        [ReadOnly]
-    FROM
-        @Groups
-    WHERE
-        [Id] IN (SELECT [Id] FROM [AvailableGroupsCTE])
-
-    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
-END
-GO
-
-IF OBJECT_ID('[dbo].[Collection_UpdateWithGroups]') IS NOT NULL
-BEGIN
-    DROP PROCEDURE [dbo].[Collection_UpdateWithGroups]
-END
-GO
-
-CREATE PROCEDURE [dbo].[Collection_UpdateWithGroups]
-    @Id UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER,
-    @Name VARCHAR(MAX),
-    @ExternalId NVARCHAR(300),
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7),
-    @Groups AS [dbo].[SelectionReadOnlyArray] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    EXEC [dbo].[Collection_Update] @Id, @OrganizationId, @Name, @ExternalId, @CreationDate, @RevisionDate
-
-    ;WITH [AvailableGroupsCTE] AS(
-        SELECT
-            Id
-        FROM
-            [dbo].[Group]
-        WHERE
-            OrganizationId = @OrganizationId
-    )
-    MERGE
-        [dbo].[CollectionGroup] AS [Target]
-    USING 
-        @Groups AS [Source]
-    ON
-        [Target].[CollectionId] = @Id
-        AND [Target].[GroupId] = [Source].[Id]
-    WHEN NOT MATCHED BY TARGET
-    AND [Source].[Id] IN (SELECT [Id] FROM [AvailableGroupsCTE]) THEN
-        INSERT VALUES
-        (
-            @Id,
-            [Source].[Id],
-            [Source].[ReadOnly]
-        )
-    WHEN MATCHED AND [Target].[ReadOnly] != [Source].[ReadOnly] THEN
-        UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly]
-    WHEN NOT MATCHED BY SOURCE
-    AND [Target].[CollectionId] = @Id THEN
-        DELETE
-    ;
-
-    EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @Id, @OrganizationId
-END
-GO
-
-IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'CollectionView')
-BEGIN
-    DROP VIEW [dbo].[CollectionView]
-END
-GO
-
-CREATE VIEW [dbo].[CollectionView]
-AS
-SELECT
-    *
-FROM
-    [dbo].[Collection]
-GO
-
-IF OBJECT_ID('[dbo].[UserCollectionDetails]') IS NOT NULL
-BEGIN
-    DROP FUNCTION [dbo].[UserCollectionDetails]
-END
-GO
-
-CREATE FUNCTION [dbo].[UserCollectionDetails](@UserId UNIQUEIDENTIFIER)
-RETURNS TABLE
-AS RETURN
-SELECT
-    C.*,
-    CASE
-        WHEN
-            OU.[AccessAll] = 1
-            OR G.[AccessAll] = 1
-            OR CU.[ReadOnly] = 0
-            OR CG.[ReadOnly] = 0
-        THEN 0
-        ELSE 1
-    END [ReadOnly]
-FROM
-    [dbo].[CollectionView] C
-INNER JOIN
-    [dbo].[OrganizationUser] OU ON C.[OrganizationId] = OU.[OrganizationId]
-INNER JOIN
-    [dbo].[Organization] O ON O.[Id] = C.[OrganizationId]
-LEFT JOIN
-    [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = [OU].[Id]
-LEFT JOIN
-    [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-LEFT JOIN
-    [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-LEFT JOIN
-    [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
-WHERE
-    OU.[UserId] = @UserId
-    AND OU.[Status] = 2 -- 2 = Confirmed
-    AND O.[Enabled] = 1
-    AND (
-        OU.[AccessAll] = 1
-        OR CU.[CollectionId] IS NOT NULL
-        OR G.[AccessAll] = 1
-        OR CG.[CollectionId] IS NOT NULL
-    )
-GO

util/Setup/Program.cs

@@ -1,10 +1,9 @@
-using DbUp;
+using Bit.Migrator;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Data.SqlClient;
 using System.Net.Http;
-using System.Reflection;
 
 namespace Bit.Setup
 {
@@ -164,43 +163,11 @@ namespace Bit.Setup
             try
             {
                 Helpers.WriteLine(_context, "Migrating database.");
-
                 var vaultConnectionString = Helpers.GetValueFromEnvFile("global",
                     "globalSettings__sqlServer__connectionString");
-                var masterConnectionString = new SqlConnectionStringBuilder(vaultConnectionString)
+                var migrator = new DbMigrator(vaultConnectionString, null);
-                {
+                var success = migrator.MigrateMsSqlDatabase(false);
-                    InitialCatalog = "master"
+                if(success)
-                }.ConnectionString;
-
-                using(var connection = new SqlConnection(masterConnectionString))
-                {
-                    var command = new SqlCommand(
-                        "IF ((SELECT COUNT(1) FROM sys.databases WHERE [name] = 'vault') = 0) " +
-                        "CREATE DATABASE [vault];", connection);
-                    command.Connection.Open();
-                    command.ExecuteNonQuery();
-                    command.CommandText = "IF ((SELECT DATABASEPROPERTYEX([name], 'IsAutoClose') " +
-                        "FROM sys.databases WHERE [name] = 'vault') = 1) " +
-                        "ALTER DATABASE [vault] SET AUTO_CLOSE OFF;";
-                    command.ExecuteNonQuery();
-                }
-
-                var builder = DeployChanges.To
-                    .SqlDatabase(vaultConnectionString)
-                    .JournalToSqlTable("dbo", "Migration")
-                    .WithScriptsAndCodeEmbeddedInAssembly(Assembly.GetExecutingAssembly(),
-                        s => s.Contains($".DbScripts.") && !s.Contains(".Archive."))
-                    .WithTransaction()
-                    .WithExecutionTimeout(new TimeSpan(0, 5, 0));
-
-                if(!_context.Quiet)
-                {
-                    builder.LogToConsole();
-                }
-
-                var upgrader = builder.Build();
-                var result = upgrader.PerformUpgrade();
-                if(result.Successful)
                 {
                     Helpers.WriteLine(_context, "Migration successful.");
                 }
@@ -220,7 +187,6 @@ namespace Bit.Setup
                     MigrateDatabase(nextAttempt);
                     return;
                 }
-
                 throw e;
             }
         }

util/Setup/Setup.csproj

@@ -8,16 +8,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="DbScripts\**\*.sql" />
     <EmbeddedResource Include="Templates\**\*.hbs" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Handlebars.Net" Version="1.9.5" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="dbup" Version="3.3.5" />
     <PackageReference Include="YamlDotNet" Version="5.4.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Migrator\Migrator.csproj" />
+  </ItemGroup>
+
 </Project>

util/Setup/Templates/DockerCompose.hbs

@@ -57,8 +57,6 @@ services:
     image: bitwarden/api:{{{CoreVersion}}}
     container_name: bitwarden-api
     restart: always
-    depends_on:
-      - "mssql"
     volumes:
       - ../core:/etc/bitwarden/core
       - ../ca-certificates:/etc/bitwarden/ca-certificates
@@ -86,6 +84,8 @@ services:
     image: bitwarden/admin:{{{CoreVersion}}}
     container_name: bitwarden-admin
     restart: always
+    depends_on:
+      - "mssql"
     volumes:
       - ../core:/etc/bitwarden/core
       - ../ca-certificates:/etc/bitwarden/ca-certificates
@@ -123,7 +123,7 @@ services:
     container_name: bitwarden-nginx
     restart: always
     depends_on:
-      - "api"
+      - "admin"
 {{#if HasPort}}
     ports:
 {{#if HttpPort}}