From ab173cf5cfdeb5172eac83cd4cf030089df2a12b Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 29 Mar 2017 22:23:26 -0400
Subject: [PATCH] read subvaults by confirmed admin user

---
 src/Sql/Sql.sqlproj                           |  1 +
 .../Subvault_ReadByIdAdminUserId.sql          | 19 +++++++++++++++++++
 ...bvault_ReadByOrganizationIdAdminUserId.sql |  1 +
 3 files changed, 21 insertions(+)
 create mode 100644 src/Sql/dbo/Stored Procedures/Subvault_ReadByIdAdminUserId.sql

diff --git a/src/Sql/Sql.sqlproj b/src/Sql/Sql.sqlproj
index f7d0131cc6..55e6ec22f0 100644
--- a/src/Sql/Sql.sqlproj
+++ b/src/Sql/Sql.sqlproj
@@ -179,5 +179,6 @@
     <Build Include="dbo\Stored Procedures\Cipher_UpdatePartial.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationIdEmail.sql" />
     <Build Include="dbo\Stored Procedures\OrganizationUser_ReadByOrganizationId.sql" />
+    <Build Include="dbo\Stored Procedures\Subvault_ReadByIdAdminUserId.sql" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Subvault_ReadByIdAdminUserId.sql b/src/Sql/dbo/Stored Procedures/Subvault_ReadByIdAdminUserId.sql
new file mode 100644
index 0000000000..ecdb7af403
--- /dev/null
+++ b/src/Sql/dbo/Stored Procedures/Subvault_ReadByIdAdminUserId.sql	
@@ -0,0 +1,19 @@
+CREATE PROCEDURE [dbo].[Subvault_ReadByIdAdminUserId]
+    @Id UNIQUEIDENTIFIER,
+    @UserId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    SELECT
+        S.*
+    FROM
+        [dbo].[SubvaultView] S
+    INNER JOIN
+        [OrganizationUser] OU ON OU.[OrganizationId] = S.[OrganizationId]
+    WHERE
+        S.[Id] = @Id
+        AND OU.[UserId] = @UserId
+        AND OU.[Status] = 2 -- Confirmed
+        AND OU.[Type] <= 1 -- Owner and admin
+END
\ No newline at end of file
diff --git a/src/Sql/dbo/Stored Procedures/Subvault_ReadByOrganizationIdAdminUserId.sql b/src/Sql/dbo/Stored Procedures/Subvault_ReadByOrganizationIdAdminUserId.sql
index 86853cba34..17662dd872 100644
--- a/src/Sql/dbo/Stored Procedures/Subvault_ReadByOrganizationIdAdminUserId.sql	
+++ b/src/Sql/dbo/Stored Procedures/Subvault_ReadByOrganizationIdAdminUserId.sql	
@@ -14,5 +14,6 @@ BEGIN
     WHERE
         S.[OrganizationId] = @OrganizationId
         AND OU.[UserId] = @UserId
+        AND OU.[Status] = 2 -- Confirmed
         AND OU.[Type] <= 1 -- Owner and admin
 END
\ No newline at end of file