Merge branch 'dev' of https://github.com/abpframework/abp into ci/volo-3078

modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs

@@ -139,12 +139,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
             if (result.RequiresTwoFactor)
             {
-                return RedirectToPage("./SendSecurityCode", new
-                {
-                    returnUrl = ReturnUrl,
-                    returnUrlHash = ReturnUrlHash,
-                    rememberMe = LoginInput.RememberMe
-                });
+                return await TwoFactorLoginResultAsync();
             }
 
             if (result.IsLockedOut)

modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs

@@ -107,12 +107,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
             if (result.RequiresTwoFactor)
             {
-                return RedirectToPage("./SendSecurityCode", new
-                {
-                    returnUrl = ReturnUrl,
-                    returnUrlHash = ReturnUrlHash,
-                    rememberMe = LoginInput.RememberMe
-                });
+                return await TwoFactorLoginResultAsync();
             }
 
             if (result.IsLockedOut)
@@ -142,6 +137,14 @@ namespace Volo.Abp.Account.Web.Pages.Account
             return RedirectSafely(ReturnUrl, ReturnUrlHash);
         }
 
+        /// <summary>
+        /// Override this method to add 2FA for your application.
+        /// </summary>
+        protected virtual Task<IActionResult> TwoFactorLoginResultAsync()
+        {
+            throw new NotImplementedException();
+        }
+
         protected virtual async Task<List<ExternalProviderModel>> GetExternalProviders()
         {
             var schemes = await SchemeProvider.GetAllSchemesAsync();

modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml

@@ -1,8 +0,0 @@
-@page
-@using Microsoft.AspNetCore.Mvc.Localization
-@using Volo.Abp.Account.Localization
-@using Volo.Abp.Account.Web.Pages.Account
-@model SendSecurityCodeModel
-@inject IHtmlLocalizer<AccountResource> L
-<h2>Send security code!</h2>
-<p>TODO: This page is under construction.</p>

modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Rendering;
-
-namespace Volo.Abp.Account.Web.Pages.Account
-{
-    public class SendSecurityCodeModel : AccountPageModel
-    {
-        public List<SelectListItem> Providers { get; set; }
-        
-        public virtual async Task<IActionResult> OnGetAsync()
-        {
-            var user = await SignInManager.GetTwoFactorAuthenticationUserAsync();
-            if (user == null)
-            {
-                return RedirectToPage("./Login");
-            }
-
-            return Page();
-
-            //CheckCurrentTenant(await SignInManager.GetVerifiedTenantIdAsync());
-
-            //Providers = (await UserManager.GetValidTwoFactorProvidersAsync(user))
-            //    .Select(userProvider =>
-            //        new SelectListItem
-            //        {
-            //            Text = userProvider,
-            //            Value = userProvider
-            //        }).ToList();
-
-            //return View(
-            //    new SendSecurityCodeViewModel
-            //    {
-            //        ReturnUrl = returnUrl,
-            //        RememberMe = rememberMe
-            //    }
-            //);
-        }
-
-        public virtual Task<IActionResult> OnPostAsync()
-        {
-            return Task.FromResult<IActionResult>(Page());
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationModule.cs

@@ -6,6 +6,7 @@ namespace Volo.CmsKit.Admin
 {
     [DependsOn(
         typeof(CmsKitAdminApplicationContractsModule),
+        typeof(AbpAutoMapperModule),
         typeof(CmsKitCommonApplicationModule)
         )]
     public class CmsKitAdminApplicationModule : AbpModule

modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebAutoMapperProfile.cs

@@ -1,14 +0,0 @@
-using AutoMapper;
-
-namespace Volo.CmsKit.Admin.Web
-{
-    public class CmsKitAdminWebAutoMapperProfile : Profile
-    {
-        public CmsKitAdminWebAutoMapperProfile()
-        {
-            /* You can configure your AutoMapper mapping configuration here.
-             * Alternatively, you can split your mapping configurations
-             * into multiple profile classes for a better organization. */
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs

@@ -2,7 +2,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.CmsKit.Admin.Web.Menus;
 using Volo.Abp.AspNetCore.Mvc.Localization;
-using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
@@ -44,13 +43,7 @@ namespace Volo.CmsKit.Admin.Web
 
             Configure<AbpVirtualFileSystemOptions>(options =>
             {
-                options.FileSets.AddEmbedded<CmsKitAdminWebModule>();
-            });
-
-            context.Services.AddAutoMapperObjectMapper<CmsKitAdminWebModule>();
-            Configure<AbpAutoMapperOptions>(options =>
-            {
-                options.AddMaps<CmsKitAdminWebModule>(validate: true);
+                options.FileSets.AddEmbedded<CmsKitAdminWebModule>("Volo.CmsKit.Admin.Web");
             });
 
             Configure<RazorPagesOptions>(options =>

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj

@@ -13,7 +13,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Common.Web\Volo.CmsKit.Common.Web.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Admin.HttpApi\Volo.CmsKit.Admin.HttpApi.csproj" />
   </ItemGroup>

modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs

@@ -44,7 +44,7 @@ namespace Volo.CmsKit.Public.Web
 
             Configure<AbpVirtualFileSystemOptions>(options =>
             {
-                options.FileSets.AddEmbedded<CmsKitPublicWebModule>();
+                options.FileSets.AddEmbedded<CmsKitPublicWebModule>("Volo.CmsKit.Public.Web");
             });
 
             context.Services.AddAutoMapperObjectMapper<CmsKitPublicWebModule>();

npm/ng-packs/packages/schematics/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.schematics",
-  "version": "3.1.0-rc.1",
-  "description": "Schematics that works with ABP CLI",
+  "version": "3.0.5",
+  "description": "Schematics that works with ABP Backend",
   "keywords": [
     "schematics"
   ],
   "author": "",
   "license": "MIT",
-  "schematics": "./src/collection.json",
+  "schematics": "./collection.json",
   "dependencies": {
     "@angular-devkit/core": "~10.0.3",
     "@angular-devkit/schematics": "~10.0.3",