Folder APIs to new tables

src/Api/Controllers/FoldersController.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
@@ -7,8 +6,6 @@ using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
 using Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
-using Bit.Core.Models.Table;
-using Microsoft.AspNetCore.Identity;
 using Bit.Core.Services;
 
 namespace Bit.Api.Controllers
@@ -17,16 +14,16 @@ namespace Bit.Api.Controllers
     [Authorize("Application")]
     public class FoldersController : Controller
     {
-        private readonly ICipherRepository _cipherRepository;
+        private readonly IFolderRepository _folderRepository;
         private readonly ICipherService _cipherService;
         private readonly IUserService _userService;
 
         public FoldersController(
-            ICipherRepository cipherRepository,
+            IFolderRepository folderRepository,
             ICipherService cipherService,
             IUserService userService)
         {
-            _cipherRepository = cipherRepository;
+            _folderRepository = folderRepository;
             _cipherService = cipherService;
             _userService = userService;
         }
@@ -35,22 +32,21 @@ namespace Bit.Api.Controllers
         public async Task<FolderResponseModel> Get(string id)
         {
             var userId = _userService.GetProperUserId(User).Value;
-            var folder = await _cipherRepository.GetByIdAsync(new Guid(id), userId);
+            var folder = await _folderRepository.GetByIdAsync(new Guid(id), userId);
-            if(folder == null || folder.Type != Core.Enums.CipherType.Folder)
+            if(folder == null)
             {
                 throw new NotFoundException();
             }
 
-            return new FolderResponseModel(folder, userId);
+            return new FolderResponseModel(folder);
         }
 
         [HttpGet("")]
         public async Task<ListResponseModel<FolderResponseModel>> Get()
         {
             var userId = _userService.GetProperUserId(User).Value;
-            ICollection<Cipher> folders = await _cipherRepository.GetManyByTypeAndUserIdAsync(Core.Enums.CipherType.Folder,
+            var folders = await _folderRepository.GetManyByUserIdAsync(userId);
-                userId);
+            var responses = folders.Select(f => new FolderResponseModel(f));
-            var responses = folders.Select(f => new FolderResponseModel(f, userId));
             return new ListResponseModel<FolderResponseModel>(responses);
         }
 
@@ -58,9 +54,9 @@ namespace Bit.Api.Controllers
         public async Task<FolderResponseModel> Post([FromBody]FolderRequestModel model)
         {
             var userId = _userService.GetProperUserId(User).Value;
-            var folder = model.ToCipher(_userService.GetProperUserId(User).Value);
+            var folder = model.ToFolder(_userService.GetProperUserId(User).Value);
-            await _cipherService.SaveAsync(folder);
+            await _cipherService.SaveFolderAsync(folder);
-            return new FolderResponseModel(folder, userId);
+            return new FolderResponseModel(folder);
         }
 
         [HttpPut("{id}")]
@@ -68,27 +64,28 @@ namespace Bit.Api.Controllers
         public async Task<FolderResponseModel> Put(string id, [FromBody]FolderRequestModel model)
         {
             var userId = _userService.GetProperUserId(User).Value;
-            var folder = await _cipherRepository.GetByIdAsync(new Guid(id), userId);
+            var folder = await _folderRepository.GetByIdAsync(new Guid(id), userId);
-            if(folder == null || folder.Type != Core.Enums.CipherType.Folder)
+            if(folder == null)
             {
                 throw new NotFoundException();
             }
 
-            await _cipherService.SaveAsync(model.ToCipher(folder));
+            await _cipherService.SaveFolderAsync(model.ToFolder(folder));
-            return new FolderResponseModel(folder, userId);
+            return new FolderResponseModel(folder);
         }
 
         [HttpDelete("{id}")]
         [HttpPost("{id}/delete")]
         public async Task Delete(string id)
         {
-            var folder = await _cipherRepository.GetByIdAsync(new Guid(id), _userService.GetProperUserId(User).Value);
+            var userId = _userService.GetProperUserId(User).Value;
-            if(folder == null || folder.Type != Core.Enums.CipherType.Folder)
+            var folder = await _folderRepository.GetByIdAsync(new Guid(id), userId);
+            if(folder == null)
             {
                 throw new NotFoundException();
             }
 
-            await _cipherService.DeleteAsync(folder);
+            await _cipherService.DeleteFolderAsync(folder);
         }
     }
 }

src/Core/Models/Api/FolderDataModel.cs

@@ -1,35 +0,0 @@
-using System;
-using Bit.Core.Models.Table;
-using Newtonsoft.Json;
-
-namespace Bit.Core.Models.Api
-{
-    public class FolderDataModel
-    {
-        public FolderDataModel() { }
-
-        public FolderDataModel(FolderRequestModel folder)
-        {
-            Name = folder.Name;
-        }
-
-        public FolderDataModel(CipherRequestModel cipher)
-        {
-            Name = cipher.Name;
-        }
-
-        public FolderDataModel(Cipher cipher)
-        {
-            if(cipher.Type != Core.Enums.CipherType.Folder)
-            {
-                throw new ArgumentException("Cipher is not correct type.");
-            }
-
-            var data = JsonConvert.DeserializeObject<FolderDataModel>(cipher.Data);
-
-            Name = data.Name;
-        }
-
-        public string Name { get; set; }
-    }
-}

src/Core/Models/Api/Request/FolderRequestModel.cs

@@ -13,19 +13,17 @@ namespace Bit.Core.Models.Api
         [StringLength(300)]
         public string Name { get; set; }
 
-        public Cipher ToCipher(Guid userId)
+        public Folder ToFolder(Guid userId)
         {
-            return ToCipher(new Cipher
+            return ToFolder(new Folder
             {
                 UserId = userId
             });
         }
 
-        public Cipher ToCipher(Cipher existingFolder)
+        public Folder ToFolder(Folder existingFolder)
         {
-            existingFolder.Data = JsonConvert.SerializeObject(new FolderDataModel(this), new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+            existingFolder.Name = Name;
-            existingFolder.Type = Core.Enums.CipherType.Folder;
-
             return existingFolder;
         }
     }

src/Core/Models/Api/Response/FolderResponseModel.cs

@@ -5,24 +5,17 @@ namespace Bit.Core.Models.Api
 {
     public class FolderResponseModel : ResponseModel
     {
-        public FolderResponseModel(Cipher cipher, Guid userId)
+        public FolderResponseModel(Folder folder)
             : base("folder")
         {
-            if(cipher == null)
+            if(folder == null)
             {
-                throw new ArgumentNullException(nameof(cipher));
+                throw new ArgumentNullException(nameof(folder));
             }
 
-            if(cipher.Type != Core.Enums.CipherType.Folder)
+            Id = folder.Id.ToString();
-            {
+            Name = folder.Name;
-                throw new ArgumentException(nameof(cipher.Type));
+            RevisionDate = folder.RevisionDate;
-            }
-
-            var data = new FolderDataModel(cipher);
-
-            Id = cipher.Id.ToString();
-            Name = data.Name;
-            RevisionDate = cipher.RevisionDate;
         }
 
         public string Id { get; set; }

src/Core/Repositories/IFolderRepository.cs

@@ -1,9 +1,13 @@
 using System;
 using Bit.Core.Models.Table;
+using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Bit.Core.Repositories
 {
     public interface IFolderRepository : IRepository<Folder, Guid>
     {
+        Task<Folder> GetByIdAsync(Guid id, Guid userId);
+        Task<ICollection<Folder>> GetManyByUserIdAsync(Guid userId);
     }
 }

src/Core/Repositories/SqlServer/FolderRepository.cs

@@ -1,5 +1,11 @@
 using System;
 using Bit.Core.Models.Table;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using Dapper;
+using System.Linq;
 
 namespace Bit.Core.Repositories.SqlServer
 {
@@ -12,5 +18,29 @@ namespace Bit.Core.Repositories.SqlServer
         public FolderRepository(string connectionString)
             : base(connectionString)
         { }
+
+        public async Task<Folder> GetByIdAsync(Guid id, Guid userId)
+        {
+            var folder = await GetByIdAsync(id);
+            if(folder == null || folder.UserId != userId)
+            {
+                return null;
+            }
+
+            return folder;
+        }
+
+        public async Task<ICollection<Folder>> GetManyByUserIdAsync(Guid userId)
+        {
+            using(var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryAsync<Folder>(
+                    $"[{Schema}].[Folder_ReadByUserId]",
+                    new { UserId = userId },
+                    commandType: CommandType.StoredProcedure);
+
+                return results.ToList();
+            }
+        }
     }
 }

src/Sql/Sql.sqlproj

@@ -163,5 +163,7 @@
     <Build Include="dbo\Stored Procedures\SubvaultCipher_ReadByUserId.sql" />
     <Build Include="dbo\Views\CipherView.sql" />
     <Build Include="dbo\Stored Procedures\CipherDetails_ReadById.sql" />
+    <Build Include="dbo\Views\FolderView.sql" />
+    <Build Include="dbo\Stored Procedures\Folder_ReadByUserId.sql" />
   </ItemGroup>
 </Project>

src/Sql/dbo/Stored Procedures/Folder_ReadByUserId.sql

@@ -0,0 +1,13 @@
+CREATE PROCEDURE [dbo].[Folder_ReadByUserId]
+    @UserId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    SELECT
+        *
+    FROM
+        [dbo].[FolderView]
+    WHERE
+        [UserId] = @UserId
+END

src/Sql/dbo/Views/FolderView.sql

@@ -0,0 +1,6 @@
+CREATE VIEW [dbo].[FolderView]
+AS
+SELECT
+    *
+FROM
+    [dbo].[Folder]