lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-27 12:29:04 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixing that the OpenId User shape template has hidden the password change for local users too

Browse Source
This commit is contained in:
Lombiq
2018-08-30 01:24:17 +02:00
committed by Zoltán Lehóczky
parent c237420dbf
commit 64dc18bb40
4 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.OpenId/Orchard.OpenId.csproj
View File

@@ -227,6 +227,7 @@
<Compile Include="Providers\Google.cs" /> <Compile Include="Providers\Google.cs" />
<Compile Include="ResourceManifest.cs" /> <Compile Include="ResourceManifest.cs" />
<Compile Include="Services\AzureActiveDirectory\IAzureActiveDirectoryService.cs" /> <Compile Include="Services\AzureActiveDirectory\IAzureActiveDirectoryService.cs" />
<Compile Include="Services\IOpenIdAuthenticationService.cs" />
<Compile Include="Services\Twitter\MissingSettingsBanner.cs" /> <Compile Include="Services\Twitter\MissingSettingsBanner.cs" />
<Compile Include="Services\AzureActiveDirectory\MissingSettingsBanner.cs" /> <Compile Include="Services\AzureActiveDirectory\MissingSettingsBanner.cs" />
<Compile Include="Services\AzureActiveDirectory\InMemoryCache.cs" /> <Compile Include="Services\AzureActiveDirectory\InMemoryCache.cs" />

11
src/Orchard.Web/Modules/Orchard.OpenId/Services/IOpenIdAuthenticationService.cs Normal file
View File

@@ -0,0 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Orchard.OpenId.Services {
public interface IOpenIdAuthenticationService : IDependency {
bool IsLocalUser();
}
}

4
src/Orchard.Web/Modules/Orchard.OpenId/Services/OpenIdAuthenticationService.cs
View File

@@ -12,7 +12,7 @@ using Orchard.Services;
namespace Orchard.OpenId.Services { namespace Orchard.OpenId.Services {
[OrchardFeature("Orchard.OpenId")] [OrchardFeature("Orchard.OpenId")]
public class OpenIdAuthenticationService : IAuthenticationService { public class OpenIdAuthenticationService : IAuthenticationService, IOpenIdAuthenticationService {
private readonly ShellSettings _settings; private readonly ShellSettings _settings;
private readonly IClock _clock; private readonly IClock _clock;
private readonly IMembershipService _membershipService; private readonly IMembershipService _membershipService;
@@ -103,7 +103,7 @@ namespace Orchard.OpenId.Services {
return _localAuthenticationUser = localUser; return _localAuthenticationUser = localUser;
} }
private bool IsLocalUser() { public bool IsLocalUser() {
var httpContext = _httpContextAccessor.Current(); var httpContext = _httpContextAccessor.Current();
if (httpContext.IsBackgroundContext()) { if (httpContext.IsBackgroundContext()) {

15
src/Orchard.Web/Modules/Orchard.OpenId/Views/User.cshtml
View File

@@ -1,7 +1,18 @@
<div class="user-display"> @using System.Web.Mvc;
<div class="user-display">
@if (WorkContext.CurrentUser != null) { @if (WorkContext.CurrentUser != null) {
IHtmlString userNameDisplayHtml;
if (WorkContext.Resolve<Orchard.OpenId.Services.IOpenIdAuthenticationService>().IsLocalUser()) {
userNameDisplayHtml = Html.Raw("<a href=\"" + @Url.Action("ChangePassword", new { Controller = "Account", Area = "Orchard.Users" }) + "\">" + Html.ItemDisplayText(WorkContext.CurrentUser) + "</a>");
}
else {
userNameDisplayHtml = Html.ItemDisplayText(WorkContext.CurrentUser);
}
<span class="user-actions welcome"> <span class="user-actions welcome">
@T("Welcome, <strong>{0}</strong>!", Html.ItemDisplayText(WorkContext.CurrentUser)) @T("Welcome, <strong>{0}</strong>!", userNameDisplayHtml)
</span> </span>
<span class="user-actions"> <span class="user-actions">
@Html.ActionLink(T("Sign Out").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl }, new { rel = "nofollow" }) @Html.ActionLink(T("Sign Out").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl }, new { rel = "nofollow" })