aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Security
diff options
context:
space:
mode:
authorTthecreator <epostvanthomas@kpnmail.nl>2019-01-22 15:22:42 +0000
committerGitHub <noreply@github.com>2019-01-22 15:22:42 +0000
commit189b99df16bd4c93cc96422d7282d01d9ff5b82f (patch)
tree26d7da95fe3e3b2772b8b39a2463a6c0ac7652fc /MediaBrowser.Controller/Security
parenta00c0defa8cb22774f5dc8a7d566eb36ac7307e8 (diff)
parentedcfd8b565f632088c8b1f826db8e2fbecf9790d (diff)
Merge pull request #1 from jellyfin/dev
Update from jellyfin repo
Diffstat (limited to 'MediaBrowser.Controller/Security')
-rw-r--r--MediaBrowser.Controller/Security/AuthenticationInfo.cs4
-rw-r--r--MediaBrowser.Controller/Security/AuthenticationInfoQuery.cs2
-rw-r--r--MediaBrowser.Controller/Security/IAuthenticationRepository.cs1
-rw-r--r--MediaBrowser.Controller/Security/IEncryptionManager.cs1
4 files changed, 3 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Security/AuthenticationInfo.cs b/MediaBrowser.Controller/Security/AuthenticationInfo.cs
index ecb3866d0..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
{
@@ -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 2fa988ec1..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
{
diff --git a/MediaBrowser.Controller/Security/IAuthenticationRepository.cs b/MediaBrowser.Controller/Security/IAuthenticationRepository.cs
index 4f454f895..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.Querying;
-using System.Threading;
namespace MediaBrowser.Controller.Security
{
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