From 0abcdd9724d1290d088c8b4da2ec1af7f66ff398 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 28 Sep 2017 13:11:56 -0400
Subject: [PATCH] import ciphers, not logins

---
 src/Api/Controllers/CiphersController.cs               |  4 ++--
 .../Api/Request/Accounts/ImportCiphersRequestModel.cs  |  2 +-
 src/Core/Models/Api/Request/CipherRequestModel.cs      | 10 ++++++++++
 .../ImportOrganizationCiphersRequestModel.cs           |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Api/Controllers/CiphersController.cs b/src/Api/Controllers/CiphersController.cs
index 0c91e8c89..0352300ac 100644
--- a/src/Api/Controllers/CiphersController.cs
+++ b/src/Api/Controllers/CiphersController.cs
@@ -212,7 +212,7 @@ namespace Bit.Api.Controllers
         {
             var userId = _userService.GetProperUserId(User).Value;
             var folders = model.Folders.Select(f => f.ToFolder(userId)).ToList();
-            var ciphers = model.Logins.Select(l => l.ToCipherDetails(userId)).ToList();
+            var ciphers = model.Ciphers.Select(c => c.ToCipherDetails(userId)).ToList();
             await _cipherService.ImportCiphersAsync(folders, ciphers, model.FolderRelationships);
         }
 
@@ -227,7 +227,7 @@ namespace Bit.Api.Controllers
 
             var userId = _userService.GetProperUserId(User).Value;
             var collections = model.Collections.Select(c => c.ToCollection(orgId)).ToList();
-            var ciphers = model.Logins.Select(l => l.ToOrganizationCipherDetails(orgId)).ToList();
+            var ciphers = model.Ciphers.Select(l => l.ToOrganizationCipherDetails(orgId)).ToList();
             await _cipherService.ImportCiphersAsync(collections, ciphers, model.CollectionRelationships, userId);
         }
 
diff --git a/src/Core/Models/Api/Request/Accounts/ImportCiphersRequestModel.cs b/src/Core/Models/Api/Request/Accounts/ImportCiphersRequestModel.cs
index 079188ec2..76e50cd94 100644
--- a/src/Core/Models/Api/Request/Accounts/ImportCiphersRequestModel.cs
+++ b/src/Core/Models/Api/Request/Accounts/ImportCiphersRequestModel.cs
@@ -5,7 +5,7 @@ namespace Bit.Core.Models.Api
     public class ImportCiphersRequestModel
     {
         public FolderRequestModel[] Folders { get; set; }
-        public LoginRequestModel[] Logins { get; set; }
+        public CipherRequestModel[] Ciphers { get; set; }
         public KeyValuePair<int, int>[] FolderRelationships { get; set; }
     }
 }
diff --git a/src/Core/Models/Api/Request/CipherRequestModel.cs b/src/Core/Models/Api/Request/CipherRequestModel.cs
index d0c6ff477..1f93c6394 100644
--- a/src/Core/Models/Api/Request/CipherRequestModel.cs
+++ b/src/Core/Models/Api/Request/CipherRequestModel.cs
@@ -124,6 +124,16 @@ namespace Bit.Core.Models.Api
             });
         }
 
+        public CipherDetails ToOrganizationCipherDetails(Guid orgId)
+        {
+            return ToCipherDetails(new CipherDetails
+            {
+                Type = Type,
+                OrganizationId = orgId,
+                Edit = true
+            });
+        }
+
         public class LoginType
         {
             [EncryptedString]
diff --git a/src/Core/Models/Api/Request/Organizations/ImportOrganizationCiphersRequestModel.cs b/src/Core/Models/Api/Request/Organizations/ImportOrganizationCiphersRequestModel.cs
index b2decbb1c..ebbcc8044 100644
--- a/src/Core/Models/Api/Request/Organizations/ImportOrganizationCiphersRequestModel.cs
+++ b/src/Core/Models/Api/Request/Organizations/ImportOrganizationCiphersRequestModel.cs
@@ -5,7 +5,7 @@ namespace Bit.Core.Models.Api
     public class ImportOrganizationCiphersRequestModel
     {
         public CollectionRequestModel[] Collections { get; set; }
-        public LoginRequestModel[] Logins { get; set; }
+        public CipherRequestModel[] Ciphers { get; set; }
         public KeyValuePair<int, int>[] CollectionRelationships { get; set; }
     }
 }