From c3e056e7a74cfb0cd8224147072983136324c616 Mon Sep 17 00:00:00 2001 From: bnymncoskuner Date: Fri, 23 Oct 2020 11:50:59 +0300 Subject: [PATCH 1/2] fix: slash difference between macos and windows and add hungarian --- npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts index b30b1e742b..d6385e3af7 100644 --- a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts +++ b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts @@ -62,8 +62,8 @@ export function registerLocale(locale: string, injector: Injector): Promise return new Promise((resolve, reject) => { return import( /* webpackChunkName: "_locale-[request]"*/ - /* webpackInclude: /\/(ar|cs|en|fr|pt|tr|ru|sl|zh-Hans|zh-Hant).js/ */ - /* webpackExclude: /\/global|\/extra/ */ + /* webpackInclude: /[/\\](ar|cs|en|fr|pt|tr|ru|hu|sl|zh-Hans|zh-Hant).js/ */ + /* webpackExclude: /[/\\]global|extra/ */ `@angular/common/locales/${cultureNameLocaleFileMap[locale] || locale}.js` ) .then(module => { @@ -101,7 +101,9 @@ async function defaultLocalErrorHandlerFn({ } if (isDevMode) { - console.error(`Cannot find the ${locale} locale file. You can check how can add new culture at https://docs.abp.io/en/abp/latest/UI/Angular/Localization#adding-new-culture`); + console.error( + `Cannot find the ${locale} locale file. You can check how can add new culture at https://docs.abp.io/en/abp/latest/UI/Angular/Localization#adding-new-culture`, + ); } resolve(); From 2d7f724a774deed0b541023e472310b2d622bab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 23 Oct 2020 12:49:06 +0300 Subject: [PATCH 2/2] #5913 Should Configure ProviderOptions on the Blazor UI startup project --- .../MyProjectNameBlazorModule.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs index 7554ae8aca..8097475d64 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs @@ -3,6 +3,7 @@ using System.Net.Http; using Blazorise; using Blazorise.Bootstrap; using Blazorise.Icons.FontAwesome; +using IdentityModel; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -71,7 +72,11 @@ namespace MyCompanyName.MyProjectName.Blazor builder.Services.AddOidcAuthentication(options => { builder.Configuration.Bind("AuthServer", options.ProviderOptions); + options.UserOptions.RoleClaim = JwtClaimTypes.Role; options.ProviderOptions.DefaultScopes.Add("MyProjectName"); + options.ProviderOptions.DefaultScopes.Add("role"); + options.ProviderOptions.DefaultScopes.Add("email"); + options.ProviderOptions.DefaultScopes.Add("phone"); }); }