Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

4 files changed, 37 insertions, 4 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 0fdb8f7cc..4786194e2 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -175,7 +175,7 @@ namespace MediaBrowser.Model.Configuration
 
         public PeopleMetadataOptions PeopleMetadataOptions { get; set; }
 
-        public string[] SecureApps1 { get; set; }
+        public string[] SecureApps2 { get; set; }
 
         public bool SaveMetadataHidden { get; set; }
 
@@ -223,7 +223,7 @@ namespace MediaBrowser.Model.Configuration
 
             PeopleMetadataOptions = new PeopleMetadataOptions();
 
-            SecureApps1 = new[]
+            SecureApps2 = new[]
             {
                 "Dashboard",
                 "MBKinect",
@@ -231,7 +231,7 @@ namespace MediaBrowser.Model.Configuration
                 "Media Browser Theater",
 
                 //"Chrome Companion",
-                //"MB-Classic"
+                "MB-Classic"
             };
 
             MetadataOptions = new[]
diff --git a/MediaBrowser.Model/Connect/UserLinkType.cs b/MediaBrowser.Model/Connect/UserLinkType.cs
new file mode 100644
index 000000000..e8ea15a4e
--- /dev/null
+++ b/MediaBrowser.Model/Connect/UserLinkType.cs
@@ -0,0 +1,15 @@
+
+namespace MediaBrowser.Model.Connect
+{
+    public enum UserLinkType
+    {
+        /// <summary>
+        /// The linked user
+        /// </summary>
+        LinkedUser = 1,
+        /// <summary>
+        /// The guest
+        /// </summary>
+        Guest = 2
+    }
+}
diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs
index 787f55ec0..b88e9d411 100644
--- a/MediaBrowser.Model/Dto/UserDto.cs
+++ b/MediaBrowser.Model/Dto/UserDto.cs
@@ -1,9 +1,10 @@
 using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Connect;
+using MediaBrowser.Model.Extensions;
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.Serialization;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dto
 {
@@ -20,6 +21,22 @@ namespace MediaBrowser.Model.Dto
         public string Name { get; set; }
 
         /// <summary>
+        /// Gets or sets the name of the connect user.
+        /// </summary>
+        /// <value>The name of the connect user.</value>
+        public string ConnectUserName { get; set; }
+        /// <summary>
+        /// Gets or sets the connect user identifier.
+        /// </summary>
+        /// <value>The connect user identifier.</value>
+        public string ConnectUserId { get; set; }
+        /// <summary>
+        /// Gets or sets the type of the connect link.
+        /// </summary>
+        /// <value>The type of the connect link.</value>
+        public UserLinkType ConnectLinkType { get; set; }
+        
+        /// <summary>
         /// Gets or sets the id.
         /// </summary>
         /// <value>The id.</value>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 9223db80a..c4da280e2 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -81,6 +81,7 @@
     <Compile Include="Configuration\ChapterOptions.cs" />
     <Compile Include="Configuration\XbmcMetadataOptions.cs" />
     <Compile Include="Configuration\SubtitlePlaybackMode.cs" />
+    <Compile Include="Connect\UserLinkType.cs" />
     <Compile Include="Drawing\ImageOrientation.cs" />
     <Compile Include="Dto\StreamOptions.cs" />
     <Compile Include="FileOrganization\AutoOrganizeOptions.cs" />