From 994f27ff4011c7280aa50f620277fecc3d5bc735 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 8 Mar 2016 21:20:56 -0500
Subject: [PATCH] Moved models and removed deuplicate error for username since
 we use emails as username as well.

---
 src/Api/Controllers/AccountsController.cs                       | 2 +-
 src/Api/Models/Request/{Auth => }/AuthTokenRequestModel.cs      | 0
 .../Models/Request/{Auth => }/AuthTokenTwoFactorRequestModel.cs | 0
 src/Api/Models/Request/{Ciphers => }/CipherRequestModel.cs      | 0
 src/Api/Models/Request/{Folders => }/FolderRequestModel.cs      | 0
 src/Api/Models/Request/{Sites => }/SiteRequestModel.cs          | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename src/Api/Models/Request/{Auth => }/AuthTokenRequestModel.cs (100%)
 rename src/Api/Models/Request/{Auth => }/AuthTokenTwoFactorRequestModel.cs (100%)
 rename src/Api/Models/Request/{Ciphers => }/CipherRequestModel.cs (100%)
 rename src/Api/Models/Request/{Folders => }/FolderRequestModel.cs (100%)
 rename src/Api/Models/Request/{Sites => }/SiteRequestModel.cs (100%)

diff --git a/src/Api/Controllers/AccountsController.cs b/src/Api/Controllers/AccountsController.cs
index 4d04db1d7..c1f651c29 100644
--- a/src/Api/Controllers/AccountsController.cs
+++ b/src/Api/Controllers/AccountsController.cs
@@ -45,7 +45,7 @@ namespace Bit.Api.Controllers
                 return;
             }
 
-            foreach(var error in result.Errors)
+            foreach(var error in result.Errors.Where(e => e.Code != "DuplicateUserName"))
             {
                 ModelState.AddModelError(string.Empty, error.Description);
             }
diff --git a/src/Api/Models/Request/Auth/AuthTokenRequestModel.cs b/src/Api/Models/Request/AuthTokenRequestModel.cs
similarity index 100%
rename from src/Api/Models/Request/Auth/AuthTokenRequestModel.cs
rename to src/Api/Models/Request/AuthTokenRequestModel.cs
diff --git a/src/Api/Models/Request/Auth/AuthTokenTwoFactorRequestModel.cs b/src/Api/Models/Request/AuthTokenTwoFactorRequestModel.cs
similarity index 100%
rename from src/Api/Models/Request/Auth/AuthTokenTwoFactorRequestModel.cs
rename to src/Api/Models/Request/AuthTokenTwoFactorRequestModel.cs
diff --git a/src/Api/Models/Request/Ciphers/CipherRequestModel.cs b/src/Api/Models/Request/CipherRequestModel.cs
similarity index 100%
rename from src/Api/Models/Request/Ciphers/CipherRequestModel.cs
rename to src/Api/Models/Request/CipherRequestModel.cs
diff --git a/src/Api/Models/Request/Folders/FolderRequestModel.cs b/src/Api/Models/Request/FolderRequestModel.cs
similarity index 100%
rename from src/Api/Models/Request/Folders/FolderRequestModel.cs
rename to src/Api/Models/Request/FolderRequestModel.cs
diff --git a/src/Api/Models/Request/Sites/SiteRequestModel.cs b/src/Api/Models/Request/SiteRequestModel.cs
similarity index 100%
rename from src/Api/Models/Request/Sites/SiteRequestModel.cs
rename to src/Api/Models/Request/SiteRequestModel.cs