Merge remote-tracking branch 'upstream/main' into lihlmise/b/textfield

# Conflicts:
#	shesha-reactjs/src/designer-components/textField/textField.tsx

Author: Lihlu

shesha-core/src/Shesha.Application/Authorization/TokenAuthController.cs

@@ -26,6 +26,7 @@
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using System.Transactions;
 
 namespace Shesha.Authorization
 {
@@ -41,13 +42,15 @@ public class TokenAuthController : SheshaControllerBase
         private readonly IRepository<ShaUserRegistration, Guid> _userRegistration;
         private readonly IExternalAuthConfiguration _externalAuthConfiguration;
         private readonly IExternalAuthManager _externalAuthManager;
-        private readonly UserRegistrationManager _userRegistrationManager;
+        private readonly IUserRegistrationManager _userRegistrationManager;
         private readonly IRepository<Person, Guid> _personRepository;
         private readonly IRepository<MobileDevice, Guid> _mobileDeviceRepository;
         private readonly ITokenBlacklistService _tokenBlacklistService;
         private readonly UserManager<User> _userManager;
         private readonly AbpUserClaimsPrincipalFactory<User, Role> _claimsPrincipalFactory;
         private readonly IConfiguration _appConfiguration;
+        private readonly IRepository<User, long> _userRepository;
+
 
         public TokenAuthController(
             LogInManager logInManager,
@@ -56,14 +59,15 @@ public TokenAuthController(
             TokenAuthConfiguration configuration,
             IExternalAuthConfiguration externalAuthConfiguration,
             IExternalAuthManager externalAuthManager,
-            UserRegistrationManager userRegistrationManager,
+            IUserRegistrationManager userRegistrationManager,
             IRepository<Person, Guid> personRepository,
             IRepository<ShaUserRegistration, Guid> userRegistration,
             IRepository<MobileDevice, Guid> mobileDeviceRepository,
             ITokenBlacklistService tokenBlacklistService,
             UserManager<User> userManager,
             AbpUserClaimsPrincipalFactory<User, Role> claimsPrincipalFactory,
-            IConfiguration appConfiguration)
+            IConfiguration appConfiguration,
+            IRepository<User, long> userRepository)
         {
             _logInManager = logInManager;
             _tenantCache = tenantCache;
@@ -79,6 +83,7 @@ public TokenAuthController(
             _userManager = userManager;
             _claimsPrincipalFactory = claimsPrincipalFactory;
             _appConfiguration = appConfiguration;
+            _userRepository = userRepository;
         }
 
         [HttpPost]
@@ -335,28 +340,33 @@ public async Task<ExternalAuthenticateResultModel> ExternalAuthenticateAsync([Fr
 
         private async Task<User> RegisterExternalUserAsync(ExternalAuthUserInfo externalUser)
         {
-            var user = await _userRegistrationManager.RegisterAsync(
-                externalUser.Name,
-                externalUser.Surname,
-                externalUser.EmailAddress,
-                externalUser.EmailAddress,
-                Authorization.Users.User.CreateRandomPassword(),
-                true
-            );
-
-            user.Logins = new List<UserLogin>
+            using (var uow = UnitOfWorkManager.Begin(TransactionScopeOption.RequiresNew))
             {
-                new UserLogin
+                var user = await _userRegistrationManager.RegisterAsync(
+                    externalUser.Name,
+                    externalUser.Surname,
+                    externalUser.EmailAddress,
+                    externalUser.EmailAddress,
+                    Authorization.Users.User.CreateRandomPassword(),
+                    true
+                );
+
+                if (user.Logins == null)
+                    user.Logins = new List<UserLogin>();
+
+                user.Logins.Add(new UserLogin
                 {
                     LoginProvider = externalUser.Provider,
                     ProviderKey = externalUser.ProviderKey,
-                    TenantId = user.TenantId
-                }
-            };
+                    TenantId = user.TenantId,
+                    UserId = user.Id
+                });
 
-            await CurrentUnitOfWork.SaveChangesAsync();
+                await _userRepository.UpdateAsync(user);
+                await uow.CompleteAsync();
 
-            return user;
+                return user;
+            }
         }
 
         private async Task<ExternalAuthUserInfo> GetExternalUserInfoAsync(ExternalAuthenticateModel model)
@@ -392,7 +402,7 @@ private async Task<ShaLoginResult<User>> GetLoginResultAsync(string usernameOrEm
             }
         }
 
-        private string CreateAccessToken(IEnumerable<Claim> claims) 
+        private string CreateAccessToken(IEnumerable<Claim> claims)
         {
             var validFrom = DateTime.UtcNow;
             var expiresOn = validFrom.Add(_configuration.Expiration);

shesha-core/src/Shesha.Framework/Authorization/Users/IUserRegistrationManager.cs

@@ -0,0 +1,16 @@
+using System.Threading.Tasks;
+using Abp.Domain.Services;
+
+namespace Shesha.Authorization.Users
+{
+    /// <summary>
+    /// Interface for user registration management
+    /// </summary>
+    public interface IUserRegistrationManager : IDomainService
+    {
+        /// <summary>
+        /// Registers a new user
+        /// </summary>
+        Task<User> RegisterAsync(string name, string? surname, string emailAddress, string userName, string plainPassword, bool isEmailConfirmed);
+    }
+}

shesha-core/src/Shesha.Framework/Authorization/Users/UserRegistrationManager.cs

@@ -9,30 +9,27 @@
 using Abp.UI;
 using Microsoft.AspNetCore.Identity;
 using Shesha.Authorization.Roles;
-using Shesha.Extensions;
+using Shesha.Extensions;
 using Shesha.MultiTenancy;
 
 namespace Shesha.Authorization.Users
 {
-    public class UserRegistrationManager : DomainService
+    public class UserRegistrationManager : DomainService, IUserRegistrationManager
     {
-        public IAbpSession AbpSession { get; set; } = NullAbpSession.Instance;
-
+        public IAbpSession AbpSession { get; set; } = NullAbpSession.Instance;
+
         private readonly TenantManager _tenantManager;
         private readonly UserManager _userManager;
         private readonly RoleManager _roleManager;
-        private readonly IPasswordHasher<User> _passwordHasher;
 
         public UserRegistrationManager(
             TenantManager tenantManager,
             UserManager userManager,
-            RoleManager roleManager,
-            IPasswordHasher<User> passwordHasher)
+            RoleManager roleManager)
         {
             _tenantManager = tenantManager;
             _userManager = userManager;
             _roleManager = roleManager;
-            _passwordHasher = passwordHasher;
 
             AbpSession = NullAbpSession.Instance;
         }
@@ -56,7 +53,7 @@ public async Task<User> RegisterAsync(string name, string? surname, string email
             };
 
             user.SetNormalizedNames();
-           
+
             foreach (var defaultRole in await _roleManager.Roles.Where(r => r.IsDefault).ToListAsync())
             {
                 user.Roles.Add(new UserRole(tenant.Id, user.Id, defaultRole.Id));

shesha-core/src/Shesha.Framework/SheshaFrameworkModule.cs

@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Configuration;
 using Shesha.Authorization;
+using Shesha.Authorization.Users;
 using Shesha.Configuration;
 using Shesha.Configuration.Email;
 using Shesha.Configuration.Runtime;
@@ -88,6 +89,7 @@ public override void Initialize()
 
             IocManager.Register<StoredFileService, StoredFileService>(DependencyLifeStyle.Transient);
             IocManager.Register<AzureStoredFileService, AzureStoredFileService>(DependencyLifeStyle.Transient);
+            IocManager.Register<IUserRegistrationManager, UserRegistrationManager>(DependencyLifeStyle.Transient);
             IocManager.IocContainer.Register(
                 Component.For<IStoredFileService>().UsingFactoryMethod(f =>
                 {

shesha-reactjs/src/components/chevron/index.tsx

@@ -65,7 +65,7 @@ export const ChevronControl: FC<IChevronControlProps> = (props) => {
             key={uuid}
             {...props}
             icon={showIcons === true ? props.icon : undefined}
-            styleJson={{ ...newStyles, ...stylingBoxCSS, alignContent: fontStyles.textAlign, justifyContent: fontStyles.textAlign }}
+            styleCss={{ ...newStyles, ...stylingBoxCSS, alignContent: fontStyles.textAlign, justifyContent: fontStyles.textAlign }}
             buttonType="text"
             label={props.item}
           />

shesha-reactjs/src/components/formDesigner/components/styles.ts

@@ -24,6 +24,7 @@ export const useStyles = createStyles(({ css, cx, token }, model: IConfigurableF
             > .ant-form-item-label {
                 ${paddingStyles({ ...model.stylingBoxJson, paddingLeft: 0, paddingRight: 0, _type: 'styleBox' })}
                 align-content: center;
+                min-height: fit-content;
                 ${model.autoAlignLabel !== false
                   ? `
                   /* A validation message grows the control column. With height: 100% the label

shesha-reactjs/src/components/formDesigner/formComponent/formComponentModelPreparer.tsx

@@ -51,7 +51,7 @@ export const FormComponentModelPreparer: FC<FormComponentPrepareModelProps> = ({
       return sourceComponentModel;
 
     // Default styles + Theme component styles
-    const defStyle: IStyleValue = toolboxComponent?.getDefaultStyles?.() ?? { styleJson: {} };
+    const defStyle: IStyleValue = toolboxComponent?.getDefaultStyles?.() ?? { styleCss: {} };
     const themeDefStyle: IStyleValue = isDefined(theme.components)
       ? deepMergeValues(defStyle, theme.components[sourceComponentModel.type] as IStyleValue, deepMergeSkipUndefinedFunc)
       : defStyle;
@@ -89,7 +89,8 @@ export const FormComponentModelPreparer: FC<FormComponentPrepareModelProps> = ({
 
   const { isInput = false, isOutput = false } = toolboxComponent ?? {};
 
-  const styleJson = useActualContextExecution(unwrappedModel.style, undefined, {}); // use default style if empty or error
+  const styleCss = useActualContextExecution(unwrappedModel.style, undefined, unwrappedModel.styleCss ?? {}); // use default style if empty or error
+  const wrapperStyleCss = useActualContextExecution(unwrappedModel.wrapperStyle, undefined, unwrappedModel.wrapperStyleCss ?? {}); // use default style if empty or error
 
   const allowInherit = toolboxComponent?.allowInherit === true;
   const readOnly = useMemo(() =>
@@ -111,9 +112,9 @@ export const FormComponentModelPreparer: FC<FormComponentPrepareModelProps> = ({
 
   const propertyName = isInput || isOutput ? unwrappedModel.propertyName : undefined;
 
-  const actualModel = useMemo(() => {
-    return { ...unwrappedModel, styleJson, readOnly, disabled, hidden, propertyName };
-  }, [hidden, propertyName, readOnly, disabled, styleJson, unwrappedModel]);
+  const actualModel = useMemo((): UnwrapCodeEvaluators<IConfigurableFormComponent> => {
+    return { ...unwrappedModel, styleCss, wrapperStyleCss, readOnly, disabled, hidden, propertyName };
+  }, [hidden, propertyName, readOnly, disabled, styleCss, wrapperStyleCss, unwrappedModel]);
 
   const actualApiModel = useDeepCompareMemo(() => deepMergeValues(actualModel, apiModel), [actualModel, apiModel]);
 
@@ -145,7 +146,7 @@ export const FormComponentModelPreparer: FC<FormComponentPrepareModelProps> = ({
     };
   }, [modelMetadata, actualApiModel.propertyName]);
 
-  const componentModel = useDeepCompareMemo(() => {
+  const componentModel = useDeepCompareMemo((): UnwrapCodeEvaluators<IConfigurableFormComponent> => {
     return toolboxComponent && propMetadata
       ? updateComponentModelFromMetadata(toolboxComponent, actualApiModel, propMetadata) as UnwrapCodeEvaluators<IConfigurableFormComponent>
       : actualApiModel;

shesha-reactjs/src/components/formDesigner/utils/stylingUtils.ts

@@ -76,7 +76,7 @@ export const getFullSizeWrapperStyle = (model: IStyleValue): IStyleValue => ({
  * This allows to keep the margins the same as in the "live" forms.
  * If the component's margin is less than the designer's padding,
  * then the padding - margin difference is applied so that the component always has a minimum padding in designer mode. */
-const getDesignerPadding = (value: string | number | undefined, designerValue: string | number | undefined): string | number | undefined => {
+export const getDesignerPadding = (value: string | number | undefined, designerValue: string | number | undefined): string | number | undefined => {
   const stringValue = isDefined(value) ? String(value) : undefined;
   const designerStringValue = isDefined(designerValue) ? String(designerValue) : undefined;
   if (isNullOrWhiteSpace(stringValue) || isNullOrWhiteSpace(designerStringValue)) return designerValue;