From ff55da9029f8b18343dbf65ca2afa643b6e0877f Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Wed, 13 Mar 2013 01:19:03 -0400
Subject: switch authentication to sha1

---
 MediaBrowser.Controller/Entities/User.cs        | 24 +-----------------------
 MediaBrowser.Controller/Library/IUserManager.cs | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 23 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index 7e50b1ea5..849b9cfee 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -1,15 +1,14 @@
 using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Serialization;
 using System;
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -425,26 +424,5 @@ namespace MediaBrowser.Controller.Entities
                 FileSystem.CopyAll(defaultPath, userPath);
             }
         }
-
-        /// <summary>
-        /// Resets the password by clearing it.
-        /// </summary>
-        /// <returns>Task.</returns>
-        public Task ResetPassword(IUserManager userManager)
-        {
-            return ChangePassword(string.Empty, userManager);
-        }
-
-        /// <summary>
-        /// Changes the password.
-        /// </summary>
-        /// <param name="newPassword">The new password.</param>
-        /// <returns>Task.</returns>
-        public Task ChangePassword(string newPassword, IUserManager userManager)
-        {
-            Password = string.IsNullOrEmpty(newPassword) ? string.Empty : newPassword.GetMD5().ToString();
-
-            return userManager.UpdateUser(this);
-        }
     }
 }
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index cb37b8145..1a2c1482c 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -159,5 +159,20 @@ namespace MediaBrowser.Controller.Library
         /// <param name="item">The item.</param>
         /// <param name="data">The data.</param>
         Task SaveUserDataForItem(User user, BaseItem item, UserItemData data);
+
+        /// <summary>
+        /// Resets the password.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        /// <returns>Task.</returns>
+        Task ResetPassword(User user);
+
+        /// <summary>
+        /// Changes the password.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        /// <param name="newPassword">The new password.</param>
+        /// <returns>Task.</returns>
+        Task ChangePassword(User user, string newPassword);
     }
 }
-- 
cgit v1.2.3