Merge branch 'rel-3.3' of https://github.com/abpframework/abp into re…

…l-3.3
abpframework · Oct 23, 2020 · 80118b2 · 80118b2
2 parents e541b7d + 2d7f724
commit 80118b2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 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
@@ -62,8 +62,8 @@ export function registerLocale(locale: string, injector: Injector): Promise<any>
   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();

diff --git a/...lates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/...lates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
@@ -3,6 +3,7 @@
 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 @@ private static void ConfigureAuthentication(WebAssemblyHostBuilder builder)
             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");
             });
         }