Feature/no ref/change password redirection

shesha-core/src/Shesha.Application/Sessions/Dto/UserLoginInfoDto.cs

@@ -21,6 +21,9 @@ public class UserLoginInfoDto : EntityDto<long>
         //public TypeOfAccount? TypeOfAccount { get; set; }
         public string HomeUrl { get; set; }
         public bool IsSelfServiceUser { get; set; }
+
+        public bool ShouldChangePassword { get; set; }
+        public string PasswordChangeUrl { get; set; }
         public List<string> GrantedPermissions { get; set; } = new List<string>();
     }
 }

shesha-core/src/Shesha.Application/Sessions/SessionAppService.cs

@@ -1,114 +1,120 @@
-using Abp.Auditing;
-using Abp.Domain.Repositories;
-using Microsoft.AspNetCore.Mvc;
-using Shesha.Authorization;
-using Shesha.Domain;
+using Abp.Auditing;
+using Abp.Domain.Repositories;
+using Microsoft.AspNetCore.Mvc;
+using Shesha.Authorization;
+using Shesha.Configuration;
+using Shesha.Domain;
 using Shesha.Extensions;
-using Shesha.Sessions.Dto;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Shesha.Sessions
-{
-    public class SessionAppService : SheshaAppServiceBase, ISessionAppService
-    {
-        private readonly IRepository<ShaRoleAppointedPerson, Guid> _roleAppointmentRepository;
-        private readonly IShaPermissionChecker _permissionChecker;
-
-        public IHomePageRouter HomePageRouter { get; set; } = new NullHomePageRouter();
-
-        public SessionAppService(IRepository<ShaRoleAppointedPerson, Guid> roleAppointmentRepository, IShaPermissionChecker permissionChecker)
-        {
-            _roleAppointmentRepository = roleAppointmentRepository;
-            _permissionChecker = permissionChecker;
-        }
-
-        [Obsolete]
+using Shesha.Sessions.Dto;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Shesha.Sessions
+{
+    public class SessionAppService : SheshaAppServiceBase, ISessionAppService
+    {
+        private readonly IRepository<ShaRoleAppointedPerson, Guid> _roleAppointmentRepository;
+        private readonly IShaPermissionChecker _permissionChecker;
+        private readonly IAuthenticationSettings _authSetting;
+
+        public IHomePageRouter HomePageRouter { get; set; } = new NullHomePageRouter();
+
+        public SessionAppService(IRepository<ShaRoleAppointedPerson, Guid> roleAppointmentRepository, IShaPermissionChecker permissionChecker, 
+            IAuthenticationSettings authSetting)
+        {
+            _roleAppointmentRepository = roleAppointmentRepository;
+            _permissionChecker = permissionChecker;
+            _authSetting = authSetting;
+        }
+
+        [Obsolete]
         public async Task<GetCurrentLoginInfoOutput> GetCurrentLoginInformations()
         {
-            return await GetCurrentLoginInfo();
-        }
-
-        public async Task<GetCurrentLoginInfoOutput> GetCurrentLoginInfo()
-        {
-            var output = new GetCurrentLoginInfoOutput { };
-
-            if (AbpSession.TenantId.HasValue)
-            {
-                output.Tenant = ObjectMapper.Map<TenantLoginInfoDto>(await GetCurrentTenantAsync());
-            }
-
-            if (AbpSession.UserId.HasValue)
-            {
-                var user = await GetCurrentUserAsync();
-
-                string homeUrl = await HomePageRouter.GetHomePageUrlAsync(user);
-
-                output.User = new UserLoginInfoDto
-                {
-                    AccountFound = true,
-                    UserName = user.UserName,
-                    FirstName = user.Name,
-                    LastName = user.Surname,
-                    FullName = user.FullName,
-                    Email = user.EmailAddress,
-                    MobileNumber = user.PhoneNumber,
-                    GrantedPermissions = await GetGrantedPermissions(),
-                    HomeUrl = homeUrl
-                };
-            }
-
-            return output;
-        }
-
-        private async Task<List<string>> GetGrantedPermissions()
-        {
-            var grantedPermissions = new List<string>();
-
-            if (AbpSession.UserId.HasValue)
-            {
+            return await GetCurrentLoginInfo();
+        }
+
+        public async Task<GetCurrentLoginInfoOutput> GetCurrentLoginInfo()
+        {
+            var output = new GetCurrentLoginInfoOutput { };
+
+            if (AbpSession.TenantId.HasValue)
+            {
+                output.Tenant = ObjectMapper.Map<TenantLoginInfoDto>(await GetCurrentTenantAsync());
+            }
+
+            if (AbpSession.UserId.HasValue)
+            {
+                var user = await GetCurrentUserAsync();
+
+                string homeUrl = await HomePageRouter.GetHomePageUrlAsync(user);
+
+                output.User = new UserLoginInfoDto
+                {
+                    AccountFound = true,
+                    UserName = user.UserName,
+                    FirstName = user.Name,
+                    LastName = user.Surname,
+                    FullName = user.FullName,
+                    Email = user.EmailAddress,
+                    MobileNumber = user.PhoneNumber,
+                    GrantedPermissions = await GetGrantedPermissions(),
+                    HomeUrl = homeUrl,
+                    ShouldChangePassword = user.ChangePasswordOnNextLogin,
+                    PasswordChangeUrl = user.ChangePasswordOnNextLogin ? await _authSetting.PasswordChangeUrl.GetValueAsync() : null
+                };
+            }
+
+            return output;
+        }
+
+        private async Task<List<string>> GetGrantedPermissions()
+        {
+            var grantedPermissions = new List<string>();
+
+            if (AbpSession.UserId.HasValue)
+            {
                 var allPermissionNames = PermissionManager.GetAllPermissions(false).Select(p => p.Name).ToList();
 
-                foreach (var permissionName in allPermissionNames)
-                {
-                    if (await PermissionChecker.IsGrantedAsync(permissionName))
-                        grantedPermissions.Add(permissionName);
-                }
-            }
-
-            return grantedPermissions;
+                foreach (var permissionName in allPermissionNames)
+                {
+                    if (await PermissionChecker.IsGrantedAsync(permissionName))
+                        grantedPermissions.Add(permissionName);
+                }
+            }
+
+            return grantedPermissions;
         }
 
 
-        /// <summary>
-        /// I am using this method to get user roles and it is being used on login of a user and also when changing work Order Type, Please contact me(Moses) before removing it
-        /// </summary>
-        /// <returns></returns>
-        [DisableAuditing]
-        public async Task<List<string>> GetGrantedShaRoles()
-        {
-            var currentUser = AbpSession.UserId.HasValue
-                ? await GetCurrentPersonAsync()
-                : null;
-            if (currentUser == null)
-                return new List<string>();
-            var roles = await _roleAppointmentRepository.GetAll()
-                .Where(a => a.Person == currentUser)
-                .Select(a => a.Role.Name)
-                .Distinct()
-                .ToListAsync();
-            return roles;
-        }
-
-        /// <summary>
-        /// Clears permissions cache
-        /// </summary>
-        [HttpPost]
-        public async Task ClearPermissionsCache()
-        {
-            await _permissionChecker.ClearPermissionsCacheAsync();
-        }
-    }
-}
+        /// <summary>
+        /// I am using this method to get user roles and it is being used on login of a user and also when changing work Order Type, Please contact me(Moses) before removing it
+        /// </summary>
+        /// <returns></returns>
+        [DisableAuditing]
+        public async Task<List<string>> GetGrantedShaRoles()
+        {
+            var currentUser = AbpSession.UserId.HasValue
+                ? await GetCurrentPersonAsync()
+                : null;
+            if (currentUser == null)
+                return new List<string>();
+            var roles = await _roleAppointmentRepository.GetAll()
+                .Where(a => a.Person == currentUser)
+                .Select(a => a.Role.Name)
+                .Distinct()
+                .ToListAsync();
+            return roles;
+        }
+
+        /// <summary>
+        /// Clears permissions cache
+        /// </summary>
+        [HttpPost]
+        public async Task ClearPermissionsCache()
+        {
+            await _permissionChecker.ClearPermissionsCacheAsync();
+        }
+    }
+}

shesha-core/src/Shesha.Framework/Configuration/IAuthenticationSettings.cs

@@ -87,5 +87,12 @@ public interface IAuthenticationSettings: ISettingAccessors
         [Display(Name = "Num questions allowed")]
         [Setting(SheshaSettingNames.Security.ResetPasswordWithSecurityQuestionsNumQuestionsAllowed)]
         ISettingAccessor<int> ResetPasswordViaSecurityQuestionsNumQuestionsAllowed { get; }
+
+        /// <summary>
+        /// When you require users to change their passwords, this is the URL they will be redirected to
+        /// </summary>
+        [Display(Name = "Password change URL")]
+        [Setting(SheshaSettingNames.Security.PasswordChangeUrl)]
+        ISettingAccessor<string> PasswordChangeUrl { get; }
     }
 }

shesha-core/src/Shesha.Framework/Configuration/SheshaSettingNames.cs

@@ -17,6 +17,8 @@ public static class Security
             public const string MobileLoginPinLifetime = "Shesha.Security.MobileLoginPinLifetime";            
             public const string ResetPasswordWithSecurityQuestionsIsSupported = "Shesha.Security.ResetPasswordWithSecurityQuestionsIsSupported";
             public const string ResetPasswordWithSecurityQuestionsNumQuestionsAllowed = "Shesha.Security.ResetPasswordWithSecurityQuestionsNumQuestionsAllowed";
+
+            public const string PasswordChangeUrl = "Shesha.Security.PasswordChangeUrl";    
         }
 
         public static class Sms

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

@@ -121,6 +121,7 @@ public override void Initialize()
 
                 s.AutoLogoffTimeout.WithDefaultValue(0);
                 s.ResetPasswordViaSecurityQuestionsNumQuestionsAllowed.WithDefaultValue(3);
+                s.PasswordChangeUrl.WithDefaultValue("/account/change-password");
             });
             IocManager.RegisterSettingAccessor<IPasswordComplexitySettings>(s => {
                 s.RequiredLength.WithDefaultValue(3);

shesha-core/src/Shesha.Web.Host/appsettings.json

@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "Default": "Data Source=.; Initial Catalog=function-shesha-test;Integrated Security=SSPI"
+    "Default": "Data Source=.; Initial Catalog=function-shesha-test;Integrated Security=SSPI;TrustServerCertificate=true"
   },
   "App": {
     "ServerRootAddress": "http://sheshacore-demo.boxfusion.co.za",

shesha-reactjs/src/apis/session.ts

@@ -1,51 +1,53 @@
-import { IAjaxResponse, IAjaxResponseBase } from '@/interfaces/ajaxResponse';
-import * as RestfulShesha from '@/utils/fetchers';
-
-export interface UserLoginInfoDto {
-  id?: number;
-  accountFound?: boolean;
-  userName?: string | null;
-  firstName?: string | null;
-  lastName?: string | null;
-  fullName?: string | null;
-  picture?: string | null;
-  email?: string | null;
-  mobileNumber?: string | null;
-  hasRegistered?: boolean;
-  loginProvider?: string | null;
-  homeUrl?: string | null;
-  isSelfServiceUser?: boolean;
-  grantedPermissions?: string[] | null;
-}
-export interface ApplicationInfoDto {
-  version?: string | null;
-  releaseDate?: string;
-  features?: {
-    [key: string]: boolean;
-  } | null;
-}
-
-export interface TenantLoginInfoDto {
-  id?: number;
-  tenancyName?: string | null;
-  name?: string | null;
-}
-export interface GetCurrentLoginInfoOutput {
-  application?: ApplicationInfoDto;
-  user?: UserLoginInfoDto;
-  tenant?: TenantLoginInfoDto;
-}
-
-export interface GetCurrentLoginInfoOutputAjaxResponse extends IAjaxResponse<GetCurrentLoginInfoOutput> {}
-
-export type sessionGetCurrentLoginInfoProps = Omit<
-  RestfulShesha.GetProps<GetCurrentLoginInfoOutputAjaxResponse, IAjaxResponseBase, void, void>,
-  'queryParams'
->;
-
-export const sessionGetCurrentLoginInfo = (props: sessionGetCurrentLoginInfoProps) =>
-  RestfulShesha.get<GetCurrentLoginInfoOutputAjaxResponse, IAjaxResponseBase, void, void>(
-    `/api/services/app/Session/GetCurrentLoginInfo`,
-    undefined,
-    props
-  );
+import { IAjaxResponse, IAjaxResponseBase } from '@/interfaces/ajaxResponse';
+import * as RestfulShesha from '@/utils/fetchers';
+
+export interface UserLoginInfoDto {
+  id?: number;
+  accountFound?: boolean;
+  userName?: string | null;
+  firstName?: string | null;
+  lastName?: string | null;
+  fullName?: string | null;
+  picture?: string | null;
+  email?: string | null;
+  mobileNumber?: string | null;
+  hasRegistered?: boolean;
+  loginProvider?: string | null;
+  homeUrl?: string | null;
+  isSelfServiceUser?: boolean;
+  shouldChangePassword?: boolean;
+  passwordChangeUrl?: string | null;
+  grantedPermissions?: string[] | null;
+}
+export interface ApplicationInfoDto {
+  version?: string | null;
+  releaseDate?: string;
+  features?: {
+    [key: string]: boolean;
+  } | null;
+}
+
+export interface TenantLoginInfoDto {
+  id?: number;
+  tenancyName?: string | null;
+  name?: string | null;
+}
+export interface GetCurrentLoginInfoOutput {
+  application?: ApplicationInfoDto;
+  user?: UserLoginInfoDto;
+  tenant?: TenantLoginInfoDto;
+}
+
+export interface GetCurrentLoginInfoOutputAjaxResponse extends IAjaxResponse<GetCurrentLoginInfoOutput> {}
+
+export type sessionGetCurrentLoginInfoProps = Omit<
+  RestfulShesha.GetProps<GetCurrentLoginInfoOutputAjaxResponse, IAjaxResponseBase, void, void>,
+  'queryParams'
+>;
+
+export const sessionGetCurrentLoginInfo = (props: sessionGetCurrentLoginInfoProps) =>
+  RestfulShesha.get<GetCurrentLoginInfoOutputAjaxResponse, IAjaxResponseBase, void, void>(
+    `/api/services/app/Session/GetCurrentLoginInfo`,
+    undefined,
+    props
+  );