add server id to dto's

8 files changed, 46 insertions, 9 deletions

diff --git a/MediaBrowser.Model/ApiClient/ServerCredentials.cs b/MediaBrowser.Model/ApiClient/ServerCredentials.cs
index 4999062948..56bf5cc185 100644
--- a/MediaBrowser.Model/ApiClient/ServerCredentials.cs
+++ b/MediaBrowser.Model/ApiClient/ServerCredentials.cs
@@ -35,6 +35,8 @@ namespace MediaBrowser.Model.ApiClient
                 // Merge the data
                 existing.DateLastAccessed = new[] { existing.DateLastAccessed, server.DateLastAccessed }.Max();
 
+                existing.UserLinkType = server.UserLinkType;
+
                 if (!string.IsNullOrEmpty(server.AccessToken))
                 {
                     existing.AccessToken = server.AccessToken;
diff --git a/MediaBrowser.Model/ApiClient/ServerInfo.cs b/MediaBrowser.Model/ApiClient/ServerInfo.cs
index 299e3015c4..0570647e9b 100644
--- a/MediaBrowser.Model/ApiClient/ServerInfo.cs
+++ b/MediaBrowser.Model/ApiClient/ServerInfo.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Model.System;
+using MediaBrowser.Model.Connect;
+using MediaBrowser.Model.System;
 using System;
 using System.Collections.Generic;
 
@@ -15,6 +16,7 @@ namespace MediaBrowser.Model.ApiClient
         public List<WakeOnLanInfo> WakeOnLanInfos { get; set; }
         public DateTime DateLastAccessed { get; set; }
         public String ExchangeToken { get; set; }
+        public UserLinkType? UserLinkType { get; set; }
 
         public ServerInfo()
         {
diff --git a/MediaBrowser.Model/Connect/ConnectUserServer.cs b/MediaBrowser.Model/Connect/ConnectUserServer.cs
index b48a132638..caa6ebb145 100644
--- a/MediaBrowser.Model/Connect/ConnectUserServer.cs
+++ b/MediaBrowser.Model/Connect/ConnectUserServer.cs
@@ -9,5 +9,6 @@ namespace MediaBrowser.Model.Connect
         public string AccessKey { get; set; }
         public string SystemId { get; set; }
         public string LocalAddress { get; set; }
+        public string UserType { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
index 27001f7215..49e5724181 100644
--- a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
@@ -1,10 +1,11 @@
 using System;
 using System.ComponentModel;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.LiveTv
 {
-    public class BaseTimerInfoDto : IHasPropertyChangedEvent
+    public class BaseTimerInfoDto : IHasPropertyChangedEvent, IHasServerId
     {
         /// <summary>
         /// Occurs when a property value changes.
@@ -17,6 +18,12 @@ namespace MediaBrowser.Model.LiveTv
         public string Id { get; set; }
 
         /// <summary>
+        /// Gets or sets the server identifier.
+        /// </summary>
+        /// <value>The server identifier.</value>
+        public string ServerId { get; set; }
+
+        /// <summary>
         /// Gets or sets the external identifier.
         /// </summary>
         /// <value>The external identifier.</value>
diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
index 351378eea1..667ad4f14a 100644
--- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
@@ -13,14 +13,20 @@ namespace MediaBrowser.Model.LiveTv
     /// Class ChannelInfoDto
     /// </summary>
     [DebuggerDisplay("Name = {Name}, Number = {Number}")]
-    public class ChannelInfoDto : IHasPropertyChangedEvent, IItemDto
+    public class ChannelInfoDto : IHasPropertyChangedEvent, IItemDto, IHasServerId
     {
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
         public string Name { get; set; }
-        
+
+        /// <summary>
+        /// Gets or sets the server identifier.
+        /// </summary>
+        /// <value>The server identifier.</value>
+        public string ServerId { get; set; }
+
         /// <summary>
         /// Gets or sets the identifier.
         /// </summary>
diff --git a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
index 50881f72fe..97cd91b2cb 100644
--- a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
@@ -11,7 +11,7 @@ using MediaBrowser.Model.Library;
 namespace MediaBrowser.Model.LiveTv
 {
     [DebuggerDisplay("Name = {Name}, StartTime = {StartDate}, EndTime = {EndDate}")]
-    public class ProgramInfoDto : IHasPropertyChangedEvent, IItemDto
+    public class ProgramInfoDto : IHasPropertyChangedEvent, IItemDto, IHasServerId
     {
         /// <summary>
         /// Id of the program.
@@ -25,6 +25,12 @@ namespace MediaBrowser.Model.LiveTv
         public double? PrimaryImageAspectRatio { get; set; }
 
         /// <summary>
+        /// Gets or sets the server identifier.
+        /// </summary>
+        /// <value>The server identifier.</value>
+        public string ServerId { get; set; }
+
+        /// <summary>
         /// Gets or sets the original primary image aspect ratio.
         /// </summary>
         /// <value>The original primary image aspect ratio.</value>
diff --git a/MediaBrowser.Model/LiveTv/RecordingGroupDto.cs b/MediaBrowser.Model/LiveTv/RecordingGroupDto.cs
index 07c5ac32f9..8a0b488cc5 100644
--- a/MediaBrowser.Model/LiveTv/RecordingGroupDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingGroupDto.cs
@@ -1,6 +1,7 @@
-using System.ComponentModel;
-using System.Diagnostics;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Extensions;
+using System.ComponentModel;
+using System.Diagnostics;
 
 namespace MediaBrowser.Model.LiveTv
 {
@@ -8,9 +9,15 @@ namespace MediaBrowser.Model.LiveTv
     /// Class RecordingGroupDto.
     /// </summary>
     [DebuggerDisplay("Name = {Name}, Count = {RecordingCount}")]
-    public class RecordingGroupDto : IHasPropertyChangedEvent
+    public class RecordingGroupDto : IHasPropertyChangedEvent, IHasServerId
     {
         /// <summary>
+        /// Gets or sets the server identifier.
+        /// </summary>
+        /// <value>The server identifier.</value>
+        public string ServerId { get; set; }
+        
+        /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
index 43ae9681e3..15378a9af1 100644
--- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
@@ -11,7 +11,7 @@ using System.Runtime.Serialization;
 namespace MediaBrowser.Model.LiveTv
 {
     [DebuggerDisplay("Name = {Name}, ChannelName = {ChannelName}")]
-    public class RecordingInfoDto : IHasPropertyChangedEvent, IItemDto
+    public class RecordingInfoDto : IHasPropertyChangedEvent, IItemDto, IHasServerId
     {
         /// <summary>
         /// Id of the recording.
@@ -25,6 +25,12 @@ namespace MediaBrowser.Model.LiveTv
         public double? PrimaryImageAspectRatio { get; set; }
 
         /// <summary>
+        /// Gets or sets the server identifier.
+        /// </summary>
+        /// <value>The server identifier.</value>
+        public string ServerId { get; set; }
+
+        /// <summary>
         /// Gets or sets the original primary image aspect ratio.
         /// </summary>
         /// <value>The original primary image aspect ratio.</value>