From ce036c5e16a3521037558d1107b95daa937b0558 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 10 Jan 2017 21:39:25 -0500
Subject: [PATCH] Moved domains APIs to new Settings controller

---
 src/Api/Controllers/AccountsController.cs     | 17 --------
 src/Api/Controllers/SettingsController.cs     | 43 +++++++++++++++++++
 .../UpdateDomainsRequestModel.cs              |  0
 3 files changed, 43 insertions(+), 17 deletions(-)
 create mode 100644 src/Api/Controllers/SettingsController.cs
 rename src/Api/Models/Request/{Accounts => }/UpdateDomainsRequestModel.cs (100%)

diff --git a/src/Api/Controllers/AccountsController.cs b/src/Api/Controllers/AccountsController.cs
index 3c5a72eefa..81a5429d1e 100644
--- a/src/Api/Controllers/AccountsController.cs
+++ b/src/Api/Controllers/AccountsController.cs
@@ -157,13 +157,6 @@ namespace Bit.Api.Controllers
             return Task.FromResult(response);
         }
 
-        [HttpGet("domains")]
-        public Task<DomainsResponseModel> GetDomains()
-        {
-            var response = new DomainsResponseModel(_currentContext.User);
-            return Task.FromResult(response);
-        }
-
         [HttpPut("profile")]
         [HttpPost("profile")]
         public async Task<ProfileResponseModel> PutProfile([FromBody]UpdateProfileRequestModel model)
@@ -174,16 +167,6 @@ namespace Bit.Api.Controllers
             return response;
         }                      
 
-        [HttpPut("domains")]
-        [HttpPost("domains")]
-        public async Task<DomainsResponseModel> PutDomains([FromBody]UpdateDomainsRequestModel model)
-        {
-            await _userService.SaveUserAsync(model.ToUser(_currentContext.User));
-
-            var response = new DomainsResponseModel(_currentContext.User);
-            return response;
-        }
-
         [HttpGet("two-factor")]
         public async Task<TwoFactorResponseModel> GetTwoFactor(string masterPasswordHash, TwoFactorProviderType provider)
         {
diff --git a/src/Api/Controllers/SettingsController.cs b/src/Api/Controllers/SettingsController.cs
new file mode 100644
index 0000000000..bc360864db
--- /dev/null
+++ b/src/Api/Controllers/SettingsController.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Bit.Api.Models;
+using Bit.Core.Services;
+using Bit.Core;
+
+namespace Bit.Api.Controllers
+{
+    [Route("settings")]
+    [Authorize("Application")]
+    public class SettingsController : Controller
+    {
+        private readonly IUserService _userService;
+        private readonly CurrentContext _currentContext;
+
+        public SettingsController(
+            IUserService userService,
+            CurrentContext currentContext)
+        {
+            _userService = userService;
+            _currentContext = currentContext;
+        }
+
+        [HttpGet("domains")]
+        public Task<DomainsResponseModel> GetDomains()
+        {
+            var response = new DomainsResponseModel(_currentContext.User);
+            return Task.FromResult(response);
+        }
+
+        [HttpPut("domains")]
+        [HttpPost("domains")]
+        public async Task<DomainsResponseModel> PutDomains([FromBody]UpdateDomainsRequestModel model)
+        {
+            await _userService.SaveUserAsync(model.ToUser(_currentContext.User));
+
+            var response = new DomainsResponseModel(_currentContext.User);
+            return response;
+        }
+    }
+}
diff --git a/src/Api/Models/Request/Accounts/UpdateDomainsRequestModel.cs b/src/Api/Models/Request/UpdateDomainsRequestModel.cs
similarity index 100%
rename from src/Api/Models/Request/Accounts/UpdateDomainsRequestModel.cs
rename to src/Api/Models/Request/UpdateDomainsRequestModel.cs