refactor cipher queries by user. tuned indexing.

src/Sql/dbo/Functions/CipherDetails.sql

@@ -10,18 +10,20 @@ SELECT
     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
+    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, '"')))
+    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

src/Sql/dbo/Functions/UserCipherDetails.sql

@@ -1,42 +1,62 @@
 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 C.[UserId] IS NOT NULL OR OU.[AccessAll] = 1 OR CU.[ReadOnly] = 0 OR G.[AccessAll] = 1 OR CG.[ReadOnly] = 0 THEN 1
+    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 C.[UserId] IS NULL AND O.[UseTotp] = 1 THEN 1
+    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].[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]
+    [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 C.[UserId] IS NULL AND CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
+    [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
-    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
-        )
-    )
+    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