diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-07-02 14:34:08 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-07-02 14:34:08 -0400 |
| commit | 59dc591f66c20b6417aa2baa9503a154585386f9 (patch) | |
| tree | 68ee71de2e4162550bb95f5e661ef413ddf1e046 /MediaBrowser.Controller | |
| parent | 9bab99d4d8659e69478722d72028e84b64575ab2 (diff) | |
update to jquery mobile 1.4.3
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Library/IUserManager.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Net/AuthorizationInfo.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Session/ISessionManager.cs | 13 |
3 files changed, 17 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs index 010caa2337..0da5f92728 100644 --- a/MediaBrowser.Controller/Library/IUserManager.cs +++ b/MediaBrowser.Controller/Library/IUserManager.cs @@ -50,11 +50,11 @@ namespace MediaBrowser.Controller.Library /// <summary> /// Authenticates a User and returns a result indicating whether or not it succeeded /// </summary> - /// <param name="user">The user.</param> + /// <param name="username">The username.</param> /// <param name="password">The password.</param> /// <returns>Task{System.Boolean}.</returns> /// <exception cref="System.ArgumentNullException">user</exception> - Task<bool> AuthenticateUser(User user, string password); + Task<bool> AuthenticateUser(string username, string password); /// <summary> /// Refreshes metadata for each user diff --git a/MediaBrowser.Controller/Net/AuthorizationInfo.cs b/MediaBrowser.Controller/Net/AuthorizationInfo.cs index e609204d69..d7dcb60f0e 100644 --- a/MediaBrowser.Controller/Net/AuthorizationInfo.cs +++ b/MediaBrowser.Controller/Net/AuthorizationInfo.cs @@ -28,5 +28,10 @@ namespace MediaBrowser.Controller.Net /// </summary> /// <value>The version.</value> public string Version { get; set; } + /// <summary> + /// Gets or sets the token. + /// </summary> + /// <value>The token.</value> + public string Token { get; set; } } } diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs index 74ad1b7ee6..6d3a9d20cf 100644 --- a/MediaBrowser.Controller/Session/ISessionManager.cs +++ b/MediaBrowser.Controller/Session/ISessionManager.cs @@ -2,6 +2,7 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Session; +using MediaBrowser.Model.Users; using System; using System.Collections.Generic; using System.Threading; @@ -206,11 +207,11 @@ namespace MediaBrowser.Controller.Session /// <param name="sessionId">The session identifier.</param> /// <param name="item">The item.</param> void ReportNowViewingItem(string sessionId, BaseItemInfo item); - + /// <summary> /// Authenticates the new session. /// </summary> - /// <param name="user">The user.</param> + /// <param name="username">The username.</param> /// <param name="password">The password.</param> /// <param name="clientType">Type of the client.</param> /// <param name="appVersion">The application version.</param> @@ -218,7 +219,7 @@ namespace MediaBrowser.Controller.Session /// <param name="deviceName">Name of the device.</param> /// <param name="remoteEndPoint">The remote end point.</param> /// <returns>Task{SessionInfo}.</returns> - Task<SessionInfo> AuthenticateNewSession(User user, string password, string clientType, string appVersion, string deviceId, string deviceName, string remoteEndPoint); + Task<AuthenticationResult> AuthenticateNewSession(string username, string password, string clientType, string appVersion, string deviceId, string deviceName, string remoteEndPoint); /// <summary> /// Reports the capabilities. @@ -248,5 +249,11 @@ namespace MediaBrowser.Controller.Session /// <param name="version">The version.</param> /// <returns>SessionInfo.</returns> SessionInfo GetSession(string deviceId, string client, string version); + + /// <summary> + /// Validates the security token. + /// </summary> + /// <param name="token">The token.</param> + void ValidateSecurityToken(string token); } }
\ No newline at end of file |
