From 9520a646ad15039a040cb50bfead766bfe5c70a6 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 17 Mar 2020 12:05:06 -0400
Subject: [PATCH] UserId added to MemberResponseModel

---
 .../Models/Api/Public/Response/MemberResponseModel.cs  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Core/Models/Api/Public/Response/MemberResponseModel.cs b/src/Core/Models/Api/Public/Response/MemberResponseModel.cs
index 1dfd04d843..d158b81c14 100644
--- a/src/Core/Models/Api/Public/Response/MemberResponseModel.cs
+++ b/src/Core/Models/Api/Public/Response/MemberResponseModel.cs
@@ -22,6 +22,7 @@ namespace Bit.Core.Models.Api.Public
             }
 
             Id = user.Id;
+            UserId = user.UserId;
             Email = user.Email;
             Status = user.Status;
             Collections = collections?.Select(c => new AssociationWithPermissionsResponseModel(c));
@@ -37,6 +38,7 @@ namespace Bit.Core.Models.Api.Public
             }
 
             Id = user.Id;
+            UserId = user.UserId;
             Name = user.Name;
             Email = user.Email;
             TwoFactorEnabled = twoFactorEnabled;
@@ -51,12 +53,18 @@ namespace Bit.Core.Models.Api.Public
         [Required]
         public string Object => "member";
         /// <summary>
-        /// The member's unique identifier.
+        /// The member's unique identifier within the organization.
         /// </summary>
         /// <example>539a36c5-e0d2-4cf9-979e-51ecf5cf6593</example>
         [Required]
         public Guid Id { get; set; }
         /// <summary>
+        /// The member's unique identifier across Bitwarden.
+        /// </summary>
+        /// <example>48b47ee1-493e-4c67-aef7-014996c40eca</example>
+        [Required]
+        public Guid? UserId { get; set; }
+        /// <summary>
         /// The member's name, set from their user account profile.
         /// </summary>
         /// <example>John Smith</example>