diff options
| author | LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com> | 2019-01-23 00:31:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-23 00:31:35 -0800 |
| commit | 404bd04cbc17dc8c8bf4a5c9aa3ca9c5cd85aa68 (patch) | |
| tree | 3d267c6ceef9439a034c113095e10e4d619e7c70 /MediaBrowser.Controller/Security | |
| parent | 8ff89fdc0c30f595a171ffc550f907ef22b6212a (diff) | |
| parent | e05e002b8bb4d13eb2b80b56a0aad8903ddb701e (diff) | |
Merge pull request #8 from jellyfin/master
rebase to latest master
Diffstat (limited to 'MediaBrowser.Controller/Security')
4 files changed, 7 insertions, 11 deletions
diff --git a/MediaBrowser.Controller/Security/AuthenticationInfo.cs b/MediaBrowser.Controller/Security/AuthenticationInfo.cs index c75bf89e4..828213588 100644 --- a/MediaBrowser.Controller/Security/AuthenticationInfo.cs +++ b/MediaBrowser.Controller/Security/AuthenticationInfo.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace MediaBrowser.Controller.Security { @@ -33,7 +33,7 @@ namespace MediaBrowser.Controller.Security /// </summary> /// <value>The application version.</value> public string AppVersion { get; set; } - + /// <summary> /// Gets or sets the name of the device. /// </summary> @@ -65,6 +65,6 @@ namespace MediaBrowser.Controller.Security public DateTime? DateRevoked { get; set; } public DateTime DateLastActivity { get; set; } - public string UserName { get; set;} + public string UserName { get; set; } } } diff --git a/MediaBrowser.Controller/Security/AuthenticationInfoQuery.cs b/MediaBrowser.Controller/Security/AuthenticationInfoQuery.cs index 125534c46..2bd17eb26 100644 --- a/MediaBrowser.Controller/Security/AuthenticationInfoQuery.cs +++ b/MediaBrowser.Controller/Security/AuthenticationInfoQuery.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace MediaBrowser.Controller.Security { @@ -21,7 +21,7 @@ namespace MediaBrowser.Controller.Security /// </summary> /// <value>The access token.</value> public string AccessToken { get; set; } - + /// <summary> /// Gets or sets a value indicating whether this instance is active. /// </summary> @@ -33,7 +33,7 @@ namespace MediaBrowser.Controller.Security /// </summary> /// <value><c>null</c> if [has user] contains no value, <c>true</c> if [has user]; otherwise, <c>false</c>.</value> public bool? HasUser { get; set; } - + /// <summary> /// Gets or sets the start index. /// </summary> diff --git a/MediaBrowser.Controller/Security/IAuthenticationRepository.cs b/MediaBrowser.Controller/Security/IAuthenticationRepository.cs index 2843c6b73..6a9625613 100644 --- a/MediaBrowser.Controller/Security/IAuthenticationRepository.cs +++ b/MediaBrowser.Controller/Security/IAuthenticationRepository.cs @@ -1,6 +1,5 @@ -using MediaBrowser.Model.Devices; +using MediaBrowser.Model.Devices; using MediaBrowser.Model.Querying; -using System.Threading; namespace MediaBrowser.Controller.Security { @@ -10,7 +9,6 @@ namespace MediaBrowser.Controller.Security /// Creates the specified information. /// </summary> /// <param name="info">The information.</param> - /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task.</returns> void Create(AuthenticationInfo info); @@ -18,7 +16,6 @@ namespace MediaBrowser.Controller.Security /// Updates the specified information. /// </summary> /// <param name="info">The information.</param> - /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task.</returns> void Update(AuthenticationInfo info); diff --git a/MediaBrowser.Controller/Security/IEncryptionManager.cs b/MediaBrowser.Controller/Security/IEncryptionManager.cs index bb4f77d83..68680fdf3 100644 --- a/MediaBrowser.Controller/Security/IEncryptionManager.cs +++ b/MediaBrowser.Controller/Security/IEncryptionManager.cs @@ -1,4 +1,3 @@ - namespace MediaBrowser.Controller.Security { public interface IEncryptionManager |