From d1c696bad5f86197aba559e34c5796861c6ee9d0 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 16 Apr 2019 11:07:44 -0400
Subject: [PATCH] new api endpoints

---
 src/Core/Abstractions/IApiService.cs |  38 ++++++++-
 src/Core/Services/ApiService.cs      | 113 ++++++++++++++++++++++++---
 2 files changed, 137 insertions(+), 14 deletions(-)

diff --git a/src/Core/Abstractions/IApiService.cs b/src/Core/Abstractions/IApiService.cs
index 7dd80c167..2cd82c032 100644
--- a/src/Core/Abstractions/IApiService.cs
+++ b/src/Core/Abstractions/IApiService.cs
@@ -1,9 +1,43 @@
-using System.Threading.Tasks;
+using Bit.Core.Models.Domain;
+using Bit.Core.Models.Request;
+using Bit.Core.Models.Response;
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
 
 namespace Bit.Core.Abstractions
 {
     public interface IApiService
     {
-        
+        string ApiBaseUrl { get; set; }
+        string IdentityBaseUrl { get; set; }
+        bool UrlsSet { get; }
+
+        Task DeleteCipherAsync(string id);
+        Task DeleteCipherAttachmentAsync(string id, string attachmentId);
+        Task DeleteFolderAsync(string id);
+        Task<IdentityTokenResponse> DoRefreshTokenAsync();
+        Task<long> GetAccountRevisionDateAsync();
+        Task<string> GetActiveBearerTokenAsync();
+        Task<CipherResponse> GetCipherAsync(string id);
+        Task<FolderResponse> GetFolderAsync(string id);
+        Task<ProfileResponse> GetProfileAsync();
+        Task<SyncResponse> GetSyncAsync(string id);
+        Task PostAccountKeysAsync(KeysRequest request);
+        Task<CipherResponse> PostCipherAsync(CipherRequest request);
+        Task<CipherResponse> PostCipherCreateAsync(CipherCreateRequest request);
+        Task<FolderResponse> PostFolderAsync(FolderRequest request);
+        Task<Tuple<IdentityTokenResponse, IdentityTwoFactorResponse>> PostIdentityTokenAsync(TokenRequest request);
+        Task PostPasswordHintAsync(PasswordHintRequest request);
+        Task<PreloginResponse> PostPreloginAsync(PreloginRequest request);
+        Task PostRegisterAsync(RegisterRequest request);
+        Task<CipherResponse> PutCipherAsync(string id, CipherRequest request);
+        Task PutCipherCollectionsAsync(string id, CipherCollectionsRequest request);
+        Task<FolderResponse> PutFolderAsync(string id, FolderRequest request);
+        Task<CipherResponse> PutShareCipherAsync(string id, CipherShareRequest request);
+        Task RefreshIdentityTokenAsync();
+        Task<TResponse> SendAsync<TRequest, TResponse>(HttpMethod method, string path,
+            TRequest body, bool authed, bool hasResponse);
+        void SetUrls(EnvironmentUrls urls);
     }
 }
diff --git a/src/Core/Services/ApiService.cs b/src/Core/Services/ApiService.cs
index a3aad7801..5be0362fd 100644
--- a/src/Core/Services/ApiService.cs
+++ b/src/Core/Services/ApiService.cs
@@ -124,36 +124,125 @@ namespace Bit.Core.Services
 
         #region Account APIs
 
-        public async Task<ProfileResponse> GetProfileAsync()
+        public Task<ProfileResponse> GetProfileAsync()
         {
-            return await SendAsync<object, ProfileResponse>(HttpMethod.Get, "/accounts/profile", null, true, true);
+            return SendAsync<object, ProfileResponse>(HttpMethod.Get, "/accounts/profile", null, true, true);
         }
 
-        public async Task<PreloginResponse> PostPreloginAsync(PreloginRequest request)
+        public Task<PreloginResponse> PostPreloginAsync(PreloginRequest request)
         {
-            return await SendAsync<PreloginRequest, PreloginResponse>(HttpMethod.Post, "/accounts/prelogin",
+            return SendAsync<PreloginRequest, PreloginResponse>(HttpMethod.Post, "/accounts/prelogin",
                 request, false, true);
         }
 
-        public async Task<long> GetAccountRevisionDateAsync()
+        public Task<long> GetAccountRevisionDateAsync()
         {
-            return await SendAsync<object, long>(HttpMethod.Get, "/accounts/revision-date", null, true, true);
+            return SendAsync<object, long>(HttpMethod.Get, "/accounts/revision-date", null, true, true);
         }
 
-        public async Task PostPasswordHintAsync(PasswordHintRequest request)
+        public Task PostPasswordHintAsync(PasswordHintRequest request)
         {
-            await SendAsync<PasswordHintRequest, object>(HttpMethod.Post, "/accounts/password-hint",
+            return SendAsync<PasswordHintRequest, object>(HttpMethod.Post, "/accounts/password-hint",
                 request, false, false);
         }
 
-        public async Task PostRegisterAsync(RegisterRequest request)
+        public Task PostRegisterAsync(RegisterRequest request)
         {
-            await SendAsync<RegisterRequest, object>(HttpMethod.Post, "/accounts/register", request, false, false);
+            return SendAsync<RegisterRequest, object>(HttpMethod.Post, "/accounts/register", request, false, false);
         }
 
-        public async Task PostAccountKeysAsync(KeysRequest request)
+        public Task PostAccountKeysAsync(KeysRequest request)
         {
-            await SendAsync<KeysRequest, object>(HttpMethod.Post, "/accounts/keys", request, true, false);
+            return SendAsync<KeysRequest, object>(HttpMethod.Post, "/accounts/keys", request, true, false);
+        }
+
+        #endregion
+
+        #region Folder APIs
+
+        public Task<FolderResponse> GetFolderAsync(string id)
+        {
+            return SendAsync<object, FolderResponse>(HttpMethod.Get, string.Concat("/folders/", id),
+                null, true, true);
+        }
+
+        public Task<FolderResponse> PostFolderAsync(FolderRequest request)
+        {
+            return SendAsync<FolderRequest, FolderResponse>(HttpMethod.Post, "/folders", request, true, true);
+        }
+
+        public async Task<FolderResponse> PutFolderAsync(string id, FolderRequest request)
+        {
+            return await SendAsync<FolderRequest, FolderResponse>(HttpMethod.Put, string.Concat("/folders/", id),
+                request, true, true);
+        }
+
+        public Task DeleteFolderAsync(string id)
+        {
+            return SendAsync<object, object>(HttpMethod.Delete, string.Concat("/folders/", id), null, true, false);
+        }
+
+        #endregion
+
+        #region Cipher APIs
+
+        public Task<CipherResponse> GetCipherAsync(string id)
+        {
+            return SendAsync<object, CipherResponse>(HttpMethod.Get, string.Concat("/ciphers/", id),
+                null, true, true);
+        }
+
+        public Task<CipherResponse> PostCipherAsync(CipherRequest request)
+        {
+            return SendAsync<CipherRequest, CipherResponse>(HttpMethod.Post, "/ciphers", request, true, true);
+        }
+
+        public Task<CipherResponse> PostCipherCreateAsync(CipherCreateRequest request)
+        {
+            return SendAsync<CipherCreateRequest, CipherResponse>(HttpMethod.Post, "/ciphers/create",
+                request, true, true);
+        }
+
+        public Task<CipherResponse> PutCipherAsync(string id, CipherRequest request)
+        {
+            return SendAsync<CipherRequest, CipherResponse>(HttpMethod.Put, string.Concat("/ciphers/", id),
+                request, true, true);
+        }
+
+        public Task<CipherResponse> PutShareCipherAsync(string id, CipherShareRequest request)
+        {
+            return SendAsync<CipherShareRequest, CipherResponse>(HttpMethod.Put,
+                string.Concat("/ciphers/", id, "/share"), request, true, true);
+        }
+
+        public Task PutCipherCollectionsAsync(string id, CipherCollectionsRequest request)
+        {
+            return SendAsync<CipherCollectionsRequest, object>(HttpMethod.Put,
+                string.Concat("/ciphers/", id, "/collections"), request, true, false);
+        }
+
+        public Task DeleteCipherAsync(string id)
+        {
+            return SendAsync<object, object>(HttpMethod.Delete, string.Concat("/ciphers/", id), null, true, false);
+        }
+
+        #endregion
+
+        #region Attachments APIs
+
+        public Task DeleteCipherAttachmentAsync(string id, string attachmentId)
+        {
+            return SendAsync<object, object>(HttpMethod.Delete,
+                string.Concat("/ciphers/", id, "/attachments/", attachmentId), null, true, false);
+        }
+
+        #endregion
+
+        #region Sync APIs
+
+        public Task<SyncResponse> GetSyncAsync(string id)
+        {
+            return SendAsync<object, SyncResponse>(HttpMethod.Get, "/sync", null, true, true);
         }
 
         #endregion