aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Connect
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Controller/Connect')
-rw-r--r--MediaBrowser.Controller/Connect/ConnectInvitationRequest.cs20
-rw-r--r--MediaBrowser.Controller/Connect/ConnectUser.cs8
-rw-r--r--MediaBrowser.Controller/Connect/ConnectUserLink.cs10
-rw-r--r--MediaBrowser.Controller/Connect/IConnectManager.cs9
-rw-r--r--MediaBrowser.Controller/Connect/UserLinkResult.cs8
5 files changed, 11 insertions, 44 deletions
diff --git a/MediaBrowser.Controller/Connect/ConnectInvitationRequest.cs b/MediaBrowser.Controller/Connect/ConnectInvitationRequest.cs
deleted file mode 100644
index 91516723bf..0000000000
--- a/MediaBrowser.Controller/Connect/ConnectInvitationRequest.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-
-namespace MediaBrowser.Controller.Connect
-{
- public class ConnectInvitationRequest
- {
- public string LocalUserId { get; set; }
-
- public string Username { get; set; }
-
- public string RequesterUserId { get; set; }
-
- public ConnectUserType Type { get; set; }
- }
-
- public enum ConnectUserType
- {
- LinkedUser = 1,
- Guest = 2
- }
-}
diff --git a/MediaBrowser.Controller/Connect/ConnectUser.cs b/MediaBrowser.Controller/Connect/ConnectUser.cs
index c640f90952..389330cecb 100644
--- a/MediaBrowser.Controller/Connect/ConnectUser.cs
+++ b/MediaBrowser.Controller/Connect/ConnectUser.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+
namespace MediaBrowser.Controller.Connect
{
public class ConnectUser
@@ -11,6 +6,7 @@ namespace MediaBrowser.Controller.Connect
public string Id { get; set; }
public string Name { get; set; }
public string Email { get; set; }
+ public bool IsActive { get; set; }
}
public class ConnectUserQuery
diff --git a/MediaBrowser.Controller/Connect/ConnectUserLink.cs b/MediaBrowser.Controller/Connect/ConnectUserLink.cs
deleted file mode 100644
index 93de6d8b4e..0000000000
--- a/MediaBrowser.Controller/Connect/ConnectUserLink.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-
-namespace MediaBrowser.Controller.Connect
-{
- public class ConnectUserLink
- {
- public string Username { get; set; }
- public string UserId { get; set; }
- public string LocalUserId { get; set; }
- }
-}
diff --git a/MediaBrowser.Controller/Connect/IConnectManager.cs b/MediaBrowser.Controller/Connect/IConnectManager.cs
index 6c2128cd3f..7c1e14c302 100644
--- a/MediaBrowser.Controller/Connect/IConnectManager.cs
+++ b/MediaBrowser.Controller/Connect/IConnectManager.cs
@@ -11,19 +11,12 @@ namespace MediaBrowser.Controller.Connect
string WanApiAddress { get; }
/// <summary>
- /// Gets the user information.
- /// </summary>
- /// <param name="userId">The user identifier.</param>
- /// <returns>ConnectUserInfo.</returns>
- ConnectUserLink GetUserInfo(string userId);
-
- /// <summary>
/// Links the user.
/// </summary>
/// <param name="userId">The user identifier.</param>
/// <param name="connectUsername">The connect username.</param>
/// <returns>Task.</returns>
- Task LinkUser(string userId, string connectUsername);
+ Task<UserLinkResult> LinkUser(string userId, string connectUsername);
/// <summary>
/// Removes the link.
diff --git a/MediaBrowser.Controller/Connect/UserLinkResult.cs b/MediaBrowser.Controller/Connect/UserLinkResult.cs
new file mode 100644
index 0000000000..4ed57cfc2d
--- /dev/null
+++ b/MediaBrowser.Controller/Connect/UserLinkResult.cs
@@ -0,0 +1,8 @@
+
+namespace MediaBrowser.Controller.Connect
+{
+ public class UserLinkResult
+ {
+ public bool IsPending { get; set; }
+ }
+}