Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Plugin Authentication.Facebook - change type of project to Microsoft.NET.Sdk.Razor
KrzysztofPajak707edbb2153e
diff --git a/src/Plugins/Authentication.Facebook/Areas/Admin/Controllers/FacebookAuthenticationSettingsController.cs b/src/Plugins/Authentication.Facebook/Areas/Admin/Controllers/FacebookAuthenticationSettingsController.csnew file mode 100644index 000000000..e71996234--- /dev/null+++ b/src/Plugins/Authentication.Facebook/Areas/Admin/Controllers/FacebookAuthenticationSettingsController.cs@@ -0,0 +1,86 @@+using Authentication.Facebook.Models;+using Grand.Business.Common.Interfaces.Configuration;+using Grand.Business.Common.Interfaces.Localization;+using Grand.Business.Common.Interfaces.Security;+using Grand.Business.Common.Services.Security;+using Grand.Web.Common.Controllers;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;+using Microsoft.AspNetCore.Mvc;+using System.Threading.Tasks;++namespace Authentication.Facebook.Controllers+{+ [AuthorizeAdmin]+ [Area("Admin")]+ [PermissionAuthorize(PermissionSystemName.ExternalAuthenticationMethods)]+ public class FacebookAuthenticationSettingsController : BasePluginController+ {+ #region Fields++ private readonly FacebookExternalAuthSettings _facebookExternalAuthSettings;+ private readonly ITranslationService _translationService;+ private readonly IPermissionService _permissionService;+ private readonly ISettingService _settingService;++ #endregion++ #region Ctor++ public FacebookAuthenticationSettingsController(FacebookExternalAuthSettings facebookExternalAuthSettings,+ ITranslationService translationService,+ IPermissionService permissionService,+ ISettingService settingService)+ {+ _facebookExternalAuthSettings = facebookExternalAuthSettings;+ _translationService = translationService;+ _permissionService = permissionService;+ _settingService = settingService;+ }++ #endregion++ #region Methods++ public async Task<IActionResult> Configure()+ {+ if (!await _permissionService.Authorize(StandardPermission.ManageExternalAuthenticationMethods))+ return AccessDeniedView();++ var model = new ConfigurationModel {+ ClientId = _facebookExternalAuthSettings.ClientKeyIdentifier,+ ClientSecret = _facebookExternalAuthSettings.ClientSecret,+ DisplayOrder = _facebookExternalAuthSettings.DisplayOrder+ };+++ return View(model);+ }++ [HttpPost]+ public async Task<IActionResult> Configure(ConfigurationModel model)+ {+ if (!await _permissionService.Authorize(StandardPermission.ManageExternalAuthenticationMethods))+ return AccessDeniedView();++ if (!ModelState.IsValid)+ return await Configure();++ _facebookExternalAuthSettings.ClientKeyIdentifier = model.ClientId;+ _facebookExternalAuthSettings.ClientSecret = model.ClientSecret;+ _facebookExternalAuthSettings.DisplayOrder = model.DisplayOrder;++ await _settingService.SaveSetting(_facebookExternalAuthSettings);++ //now clear settings cache+ await _settingService.ClearCache();++ Success(_translationService.GetResource("Admin.Plugins.Saved"));++ return await Configure();+ }+++ #endregion+ }+}\ No newline at end of filediff --git a/src/Plugins/Authentication.Facebook/Views/Configure.cshtml b/src/Plugins/Authentication.Facebook/Areas/Admin/Views/FacebookAuthenticationSettings/Configure.cshtmlsimilarity index 96%rename from src/Plugins/Authentication.Facebook/Views/Configure.cshtmlrename to src/Plugins/Authentication.Facebook/Areas/Admin/Views/FacebookAuthenticationSettings/Configure.cshtmlindex 225d1f764..c9073cab2 100644--- a/src/Plugins/Authentication.Facebook/Views/Configure.cshtml+++ b/src/Plugins/Authentication.Facebook/Areas/Admin/Views/FacebookAuthenticationSettings/Configure.cshtml@@ -3,7 +3,7 @@Layout = "_ConfigurePlugin";}<input id="active-menu-item" type="hidden" value="/Admin/ExternalAuthentication/Methods" />-<form asp-controller="FacebookAuthentication" asp-action="Configure" method="post">+<form asp-controller="FacebookAuthenticationSettings" asp-area="Admin" asp-action="Configure" method="post"><div class="form-horizontal"><div class="form-body">diff --git a/src/Plugins/Authentication.Facebook/Areas/Admin/Views/_ViewImports.cshtml b/src/Plugins/Authentication.Facebook/Areas/Admin/Views/_ViewImports.cshtmlnew file mode 100644index 000000000..2fb08c043--- /dev/null+++ b/src/Plugins/Authentication.Facebook/Areas/Admin/Views/_ViewImports.cshtml@@ -0,0 +1,8 @@+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers+@addTagHelper *, Grand.Web.Common+@addTagHelper *, Grand.Web++@using Microsoft.AspNetCore.Mvc.ViewFeatures+@using Grand.Infrastructure.Extensions++@inject Grand.Web.Common.Localization.LocService Locdiff --git a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csprojindex 824861b26..282cc889f 100644--- a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj+++ b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj@@ -1,4 +1,4 @@-<Project Sdk="Microsoft.NET.Sdk">+<Project Sdk="Microsoft.NET.Sdk.Razor"><PropertyGroup><TargetFramework>net5.0</TargetFramework>@@ -6,6 +6,7 @@<Authors>UNIT-SOFT Sp. z o.o.</Authors><Company>UNIT-SOFT Sp. z o.o.</Company><PackageProjectUrl>https://grandnode.com/</PackageProjectUrl>+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc></PropertyGroup><PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">@@ -89,21 +90,6 @@<None Update="logo.jpg"><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory></None>- <None Update="Notes.txt">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </None>- <None Update="Views\Configure.cshtml">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </None>- <None Update="Views\PublicInfo.cshtml">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </None>- <None Update="Views\SignInFailed.cshtml">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </None>- <None Update="Views\_ViewImports.cshtml">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </None></ItemGroup>diff --git a/src/Plugins/Authentication.Facebook/Components/FacebookAuthentication.cs b/src/Plugins/Authentication.Facebook/Components/FacebookAuthentication.csindex bdcaf3452..af3d1fe3a 100644--- a/src/Plugins/Authentication.Facebook/Components/FacebookAuthentication.cs+++ b/src/Plugins/Authentication.Facebook/Components/FacebookAuthentication.cs@@ -7,7 +7,7 @@ namespace Authentication.Facebook.Components{public IViewComponentResult Invoke(){- return View("~/Plugins/Authentication.Facebook/Views/PublicInfo.cshtml");+ return View();}}}\ No newline at end of filediff --git a/src/Plugins/Authentication.Facebook/Controllers/FacebookAuthenticationController.cs b/src/Plugins/Authentication.Facebook/Controllers/FacebookAuthenticationController.csindex e3b6eab0e..56809bf3a 100644--- a/src/Plugins/Authentication.Facebook/Controllers/FacebookAuthenticationController.cs+++ b/src/Plugins/Authentication.Facebook/Controllers/FacebookAuthenticationController.cs@@ -1,13 +1,8 @@using Authentication.Facebook.Models;using Grand.Business.Authentication.Interfaces;using Grand.Business.Authentication.Utilities;-using Grand.Business.Common.Interfaces.Configuration;-using Grand.Business.Common.Interfaces.Localization;-using Grand.Business.Common.Interfaces.Security;-using Grand.Business.Common.Services.Security;-using Grand.Web.Common.Controllers;-using Grand.Web.Common.Filters;using Grand.SharedKernel;+using Grand.Web.Common.Controllers;using Microsoft.AspNetCore.Authentication;using Microsoft.AspNetCore.Authentication.Facebook;using Microsoft.AspNetCore.Mvc;@@ -23,75 +18,22 @@ namespace Authentication.Facebook.Controllersprivate readonly FacebookExternalAuthSettings _facebookExternalAuthSettings;private readonly IExternalAuthenticationService _externalAuthenticationService;- private readonly ITranslationService _translationService;- private readonly IPermissionService _permissionService;- private readonly ISettingService _settingService;#endregion#region Ctorpublic FacebookAuthenticationController(FacebookExternalAuthSettings facebookExternalAuthSettings,- IExternalAuthenticationService externalAuthenticationService,- ITranslationService translationService,- IPermissionService permissionService,- ISettingService settingService)+ IExternalAuthenticationService externalAuthenticationService){_facebookExternalAuthSettings = facebookExternalAuthSettings;_externalAuthenticationService = externalAuthenticationService;- _translationService = translationService;- _permissionService = permissionService;- _settingService = settingService;}#endregion#region Methods- [AuthorizeAdmin]- [Area("Admin")]- public async Task<IActionResult> Configure()- {- if (!await _permissionService.Authorize(StandardPermission.ManageExternalAuthenticationMethods))- return AccessDeniedView();-- var model = new ConfigurationModel- {- ClientId = _facebookExternalAuthSettings.ClientKeyIdentifier,- ClientSecret = _facebookExternalAuthSettings.ClientSecret,- DisplayOrder = _facebookExternalAuthSettings.DisplayOrder- };--- return View("~/Plugins/Authentication.Facebook/Views/Configure.cshtml", model);- }-- [HttpPost]- [AutoValidateAntiforgeryToken]- [AuthorizeAdmin]- [Area("Admin")]- public async Task<IActionResult> Configure(ConfigurationModel model)- {- if (!await _permissionService.Authorize(StandardPermission.ManageExternalAuthenticationMethods))- return AccessDeniedView();-- if (!ModelState.IsValid)- return await Configure();-- _facebookExternalAuthSettings.ClientKeyIdentifier = model.ClientId;- _facebookExternalAuthSettings.ClientSecret = model.ClientSecret;- _facebookExternalAuthSettings.DisplayOrder = model.DisplayOrder;-- await _settingService.SaveSetting(_facebookExternalAuthSettings);-- //now clear settings cache- await _settingService.ClearCache();-- Success(_translationService.GetResource("Admin.Plugins.Saved"));-- return await Configure();- }-public IActionResult FacebookLogin(string returnUrl){if (!_externalAuthenticationService.AuthenticationProviderIsAvailable(FacebookAuthenticationDefaults.ProviderSystemName))@@ -101,8 +43,7 @@ namespace Authentication.Facebook.Controllersthrow new GrandException("Facebook authentication module not configured");//configure login callback action- var authenticationProperties = new AuthenticationProperties- {+ var authenticationProperties = new AuthenticationProperties {RedirectUri = Url.Action("FacebookLoginCallback", "FacebookAuthentication", new { returnUrl = returnUrl })};@@ -117,8 +58,7 @@ namespace Authentication.Facebook.Controllersreturn RedirectToRoute("Login");//create external authentication parameters- var authenticationParameters = new ExternalAuthParam- {+ var authenticationParameters = new ExternalAuthParam {ProviderSystemName = FacebookAuthenticationDefaults.ProviderSystemName,AccessToken = await HttpContext.GetTokenAsync(FacebookDefaults.AuthenticationScheme, "access_token"),Email = authenticateResult.Principal.FindFirst(claim => claim.Type == ClaimTypes.Email)?.Value,@@ -133,12 +73,11 @@ namespace Authentication.Facebook.Controllerspublic IActionResult FacebookSignInFailed(string error_code, string error_message, string state){//handle exception and display message to user- var model = new FailedModel()- {+ var model = new FailedModel() {ErrorCode = error_code,ErrorMessage = error_message};- return View("~/Plugins/Authentication.Facebook/Views/SignInFailed.cshtml", model);+ return View(model);}diff --git a/src/Plugins/Authentication.Facebook/FacebookAuthenticationDefaults.cs b/src/Plugins/Authentication.Facebook/FacebookAuthenticationDefaults.csindex 5ba6e721e..dd0e21358 100644--- a/src/Plugins/Authentication.Facebook/FacebookAuthenticationDefaults.cs+++ b/src/Plugins/Authentication.Facebook/FacebookAuthenticationDefaults.cs@@ -11,6 +11,6 @@ namespace Authentication.Facebook/// </summary>public const string ProviderSystemName = "ExternalAuth.Facebook";- public const string ConfigurationUrl = "../FacebookAuthentication/Configure";+ public const string ConfigurationUrl = "../FacebookAuthenticationSettings/Configure";}}diff --git a/src/Plugins/Authentication.Facebook/Views/SignInFailed.cshtml b/src/Plugins/Authentication.Facebook/Views/FacebookAuthentication/FacebookSignInFailed.cshtmlsimilarity index 100%rename from src/Plugins/Authentication.Facebook/Views/SignInFailed.cshtmlrename to src/Plugins/Authentication.Facebook/Views/FacebookAuthentication/FacebookSignInFailed.cshtmldiff --git a/src/Plugins/Authentication.Facebook/Views/PublicInfo.cshtml b/src/Plugins/Authentication.Facebook/Views/Shared/Components/FacebookAuthentication/Default.cshtmlsimilarity index 100%rename from src/Plugins/Authentication.Facebook/Views/PublicInfo.cshtmlrename to src/Plugins/Authentication.Facebook/Views/Shared/Components/FacebookAuthentication/Default.cshtml