lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Corrected build failure

Browse Source 
--HG--
branch : dev
This commit is contained in:
Sebastien Ros
2010-09-02 16:48:07 -07:00
parent 3a9370d767
commit 4f673e235f
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
View File

@@ -6,7 +6,6 @@ using System.Text;
using System.Web.Security; using System.Web.Security;
using System.Xml.Linq; using System.Xml.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
using Orchard.Data;
using Orchard.Logging; using Orchard.Logging;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.Security; using Orchard.Security;
@@ -16,7 +15,6 @@ using Orchard.Users.Models;
using Orchard.Settings; using Orchard.Settings;
using Orchard.Messaging.Services; using Orchard.Messaging.Services;
using System.Collections.Generic; using System.Collections.Generic;
using System.Web.Mvc;
namespace Orchard.Users.Services { namespace Orchard.Users.Services {
[UsedImplicitly] [UsedImplicitly]
@@ -25,11 +23,9 @@ namespace Orchard.Users.Services {
private readonly IContentManager _contentManager; private readonly IContentManager _contentManager;
private readonly IMessageManager _messageManager; private readonly IMessageManager _messageManager;
private readonly IEnumerable<IUserEventHandler> _userEventHandlers; private readonly IEnumerable<IUserEventHandler> _userEventHandlers;
private readonly IRepository<UserPartRecord> _userRepository;
public MembershipService(IContentManager contentManager, IRepository<UserPartRecord> userRepository, IMessageManager messageManager, IEnumerable<IUserEventHandler> userEventHandlers) { public MembershipService(IContentManager contentManager, IMessageManager messageManager, IEnumerable<IUserEventHandler> userEventHandlers) {
_contentManager = contentManager; _contentManager = contentManager;
_userRepository = userRepository;
_messageManager = messageManager; _messageManager = messageManager;
_userEventHandlers = userEventHandlers; _userEventHandlers = userEventHandlers;
Logger = NullLogger.Instance; Logger = NullLogger.Instance;
@@ -83,7 +79,7 @@ namespace Orchard.Users.Services {
return user; return user;
} }
public void SendChallengeEmail(UserPart user, string url) { public void SendChallengeEmail(IUser user, string url) {
_messageManager.Send(user.ContentItem.Record, MessageTypes.Validation, "Email", new Dictionary<string, string> { { "ChallengeUrl", url } }); _messageManager.Send(user.ContentItem.Record, MessageTypes.Validation, "Email", new Dictionary<string, string> { { "ChallengeUrl", url } });
} }
@@ -107,7 +103,7 @@ namespace Orchard.Users.Services {
return user; return user;
} }
public string GetEncryptedChallengeToken(UserPart user) { public string GetEncryptedChallengeToken(IUser user) {
var challengeToken = new XElement("Token", new XAttribute("username", user.UserName), new XAttribute("validate-by-utc", DateTime.UtcNow.Add(DelayToValidate).ToString(CultureInfo.InvariantCulture))).ToString(); var challengeToken = new XElement("Token", new XAttribute("username", user.UserName), new XAttribute("validate-by-utc", DateTime.UtcNow.Add(DelayToValidate).ToString(CultureInfo.InvariantCulture))).ToString();
var data = Encoding.UTF8.GetBytes(challengeToken); var data = Encoding.UTF8.GetBytes(challengeToken);
return MachineKey.Encode(data, MachineKeyProtection.All); return MachineKey.Encode(data, MachineKeyProtection.All);