dashboard data dynamic, user details fetch from session storage

CustomerOnlineRemit/CustomerOnlineRemit.Business/Business/Account/AccountBusiness.cs

@@ -18,17 +18,17 @@ namespace CustomerOnlineRemit.Business.Business.Account
             return _accountRepo.DoLoginAsync(loginModel);
         }
 
-        public Task<CommonResponse> GetDynamicTable(string flag)
+        public Task<CommonResponse> GetDynamicTable(string flag, LoginResponse loginDetails)
         {
             return _accountRepo.GetDynamicTable(flag);
         }
 
-        public Task<CustomerReceiverModel> GetCustomerReceiverList(bool ShowAll)
+        public Task<CustomerReceiverModel> GetCustomerReceiverList(bool ShowAll, LoginResponse loginDetails)
         {
             return _accountRepo.GetCustomerReceiverList(ShowAll);
         }
 
-        public Task<CustomerTransactionList> GetCustomerTransactionList(bool ShowAll)
+        public Task<CustomerTransactionList> GetCustomerTransactionList(bool ShowAll, LoginResponse loginDetails)
         {
             return _accountRepo.GetCustomerTransactionList(ShowAll);
         }

CustomerOnlineRemit/CustomerOnlineRemit.Business/Business/Account/IAccountBusiness.cs

@@ -7,8 +7,8 @@ namespace CustomerOnlineRemit.Business.Business.Account
     public interface IAccountBusiness
     {
         Task<LoginResponse> DoLoginAsync(LoginModel loginModel);
-        Task<CommonResponse> GetDynamicTable(string flag);
-        Task<CustomerReceiverModel> GetCustomerReceiverList(bool ShowAll);
-        Task<CustomerTransactionList> GetCustomerTransactionList(bool ShowAll);
+        Task<CommonResponse> GetDynamicTable(string flag, LoginResponse loginDetails);
+        Task<CustomerReceiverModel> GetCustomerReceiverList(bool ShowAll, LoginResponse loginDetails);
+        Task<CustomerTransactionList> GetCustomerTransactionList(bool ShowAll, LoginResponse loginDetails);
     }
 }

CustomerOnlineRemit/CustomerOnlineRemit.Common/Model/CommonResponse.cs

@@ -30,7 +30,6 @@
 
         public string Id { get; set; }
         public dynamic Data { get; set; }
-        public List<dynamic> ListData { get; set; }
         public string Extra { get; set; }
         public string Extra2 { get; set; }
 

CustomerOnlineRemit/CustomerOnlineRemit.Repository/Repository/Account/AccountRepository.cs

@@ -25,11 +25,11 @@ namespace CustomerOnlineRemit.Repository.Repository.Account
             {
                 var sql = "EXEC proc_online_customer_login";
                 sql += " @Flag  = " + _dbHelper.FilterString("l");
-                sql += ", @customerEmail  = " + _dbHelper.FilterString(loginModel.UserName);
-                sql += ", @customerPassword = " + _dbHelper.FilterString(loginModel.Password);
-                sql += ", @ipAddress = " + _dbHelper.FilterString(loginModel.IpAddress);
-                sql += ", @sessionId = " + _dbHelper.FilterString(loginModel.SessionId);
-                sql += ", @LogInfo = N" + _dbHelper.FilterString(JsonConvert.SerializeObject(loginModel.LoginInfo));
+                sql += ",@customerEmail  = " + _dbHelper.FilterString(loginModel.UserName);
+                sql += ",@customerPassword = " + _dbHelper.FilterString(loginModel.Password);
+                sql += ",@ipAddress = " + _dbHelper.FilterString(loginModel.IpAddress);
+                sql += ",@sessionId = " + _dbHelper.FilterString(loginModel.SessionId);
+                sql += ",@LogInfo = N" + _dbHelper.FilterString(JsonConvert.SerializeObject(loginModel.LoginInfo));
 
                 Log.Debug("ACCOUNTREPOSITORY | DOLOGINASYNC | SQL | " + sql);
                 var dr = _dbHelper.ExecuteDataRow(sql);
@@ -56,7 +56,7 @@ namespace CustomerOnlineRemit.Repository.Repository.Account
                         _response.GoogleAuthCode = "";
                         _response.MobileNumber = Convert.ToString(dr["mobile"]);
                         _response.RememberMe = loginModel.RememberMe;
-                        _response.SessionId = Convert.ToString(dr["username"]);
+                        _response.SessionId = loginModel.SessionId;
                     }
                 }
             }
@@ -70,14 +70,14 @@ namespace CustomerOnlineRemit.Repository.Repository.Account
             return Task.FromResult(_response);
         }
 
-        public Task<CustomerReceiverModel> GetCustomerReceiverList(bool ShowAll)
+        public Task<CustomerReceiverModel> GetCustomerReceiverList(bool ShowAll, LoginResponse loginDetails)
         {
             CustomerReceiverModel _response = new CustomerReceiverModel();
             try
             {
                 var sql = "EXEC PROC_DYNAMIC_TABLE";
                 sql += " @Flag = " + _dbHelper.FilterString("CustomerReceiver");
-                sql += " @ShowAll = " + _dbHelper.FilterString(ShowAll.ToString());
+                sql += ",@ShowAll = " + _dbHelper.FilterString(ShowAll.ToString());
 
                 Log.Debug("ACCOUNTREPOSITORY | GETCUSTOMERRECEIVERLIST | SQL | " + sql);
                 var dt = _dbHelper.ExecuteDataTable(sql);
@@ -119,14 +119,14 @@ namespace CustomerOnlineRemit.Repository.Repository.Account
             return Task.FromResult(_response);
         }
 
-        public Task<CustomerTransactionList> GetCustomerTransactionList(bool ShowAll)
+        public Task<CustomerTransactionList> GetCustomerTransactionList(bool ShowAll, LoginResponse loginDetails)
         {
             CustomerTransactionList _response = new CustomerTransactionList();
             try
             {
                 var sql = "EXEC PROC_DYNAMIC_TABLE";
                 sql += " @Flag = " + _dbHelper.FilterString("CustomerTxn");
-                sql += " @ShowAll = " + _dbHelper.FilterString(ShowAll.ToString());
+                sql += ",@ShowAll = " + _dbHelper.FilterString(ShowAll.ToString());
 
                 Log.Debug("ACCOUNTREPOSITORY | GETCUSTOMERTRANSACTIONLIST | SQL | " + sql);
                 var dt = _dbHelper.ExecuteDataTable(sql);
@@ -171,7 +171,7 @@ namespace CustomerOnlineRemit.Repository.Repository.Account
             return Task.FromResult(_response);
         }
 
-        public Task<CommonResponse> GetDynamicTable(string flag)
+        public Task<CommonResponse> GetDynamicTable(string flag, LoginResponse loginDetails)
         {
             CommonResponse _response = new CommonResponse();
             try

CustomerOnlineRemit/CustomerOnlineRemit.Repository/Repository/Account/IAccountRepository.cs

@@ -7,8 +7,8 @@ namespace CustomerOnlineRemit.Repository.Repository.Account
     public interface IAccountRepository
     {
         Task<LoginResponse> DoLoginAsync(LoginModel loginModel);
-        Task<CommonResponse> GetDynamicTable(string flag);
-        Task<CustomerReceiverModel> GetCustomerReceiverList(bool ShowAll);
-        Task<CustomerTransactionList> GetCustomerTransactionList(bool ShowAll);
+        Task<CommonResponse> GetDynamicTable(string flag, LoginResponse loginDetails);
+        Task<CustomerReceiverModel> GetCustomerReceiverList(bool ShowAll, LoginResponse loginDetails);
+        Task<CustomerTransactionList> GetCustomerTransactionList(bool ShowAll, LoginResponse loginDetails);
     }
 }

CustomerOnlineRemit/CustomerOnlineRemit/Authentication/CustomAuthenticationStateProvider.cs

@@ -36,7 +36,6 @@ namespace CustomerOnlineRemit.Authentication
             {
                 return await Task.FromResult(new AuthenticationState(_anonymous));
             }
-
         }
 
         public async Task UpdateAuthenticationState(LoginResponse userSession)
@@ -49,7 +48,16 @@ namespace CustomerOnlineRemit.Authentication
 
                 claimsPrincipal = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>
                 {
-                    new Claim(ClaimTypes.Name, userSession.UserName)
+                    new Claim(ClaimTypes.Name, userSession.UserName),
+                    new Claim("UserName", userSession.UserName),
+                    new Claim("UserId", userSession.UserId),
+                    new Claim("FullName", userSession.FullName),
+                    new Claim("MobileNumber", userSession.MobileNumber),
+                    new Claim("Email", userSession.Email),
+                    new Claim("RememberMe", Convert.ToString(userSession.RememberMe)),
+                    new Claim("ForceChangePassword", Convert.ToString(userSession.ForceChangePassword)),
+                    new Claim("GoogleAuthCode", userSession.GoogleAuthCode),
+                    new Claim("SessionId", userSession.SessionId)
                 }));
             }
             else

CustomerOnlineRemit/CustomerOnlineRemit/Data/Account/AccountServices.cs

@@ -3,6 +3,7 @@ using CustomerOnlineRemit.Business.Business.Account;
 using CustomerOnlineRemit.Common.Model;
 using CustomerOnlineRemit.Common.Model.Account;
 using CustomerOnlineRemit.Common.Model.Customer;
+using CustomerOnlineRemit.Helper.SessionHelper;
 using Microsoft.AspNetCore.Components.Authorization;
 
 namespace CustomerOnlineRemit.Data.Account
@@ -12,24 +13,24 @@ namespace CustomerOnlineRemit.Data.Account
         private readonly IAccountBusiness _accountBusiness;
         private readonly HttpClient _httpClient;
         private readonly AuthenticationStateProvider _authStateProvider;
+        private readonly ILoginUserInfo _loginInfo;
 
-        public AccountServices(IAccountBusiness accountBusiness, IHttpClientFactory httpClientFactory, AuthenticationStateProvider authStateProvider)
+        public AccountServices(IAccountBusiness accountBusiness, IHttpClientFactory httpClientFactory, AuthenticationStateProvider authStateProvider, ILoginUserInfo loginInfo)
         {
             _accountBusiness = accountBusiness;
             _httpClient = httpClientFactory.CreateClient("MyInternalClient");
             _authStateProvider = authStateProvider;
+            _loginInfo = loginInfo;
         }
 
         public async Task<CommonResponse> DoLoginAsync(LoginModel loginModel)
         {
+            loginModel.SessionId = Guid.NewGuid().ToString();   
             var response = await _accountBusiness.DoLoginAsync(loginModel);
             if (response.ResponseCode == ResponseHelper.SUCCESS)
             {
                 var customAuthStateProvider = (CustomAuthenticationStateProvider)_authStateProvider;
-                await customAuthStateProvider.UpdateAuthenticationState(new LoginResponse
-                {
-                    UserName = response.UserName
-                });
+                await customAuthStateProvider.UpdateAuthenticationState(response);
             }
             return response;
         }
@@ -41,12 +42,14 @@ namespace CustomerOnlineRemit.Data.Account
 
         public async Task<CustomerReceiverModel> GetCustomerReceiverList(bool ShowAll)
         {
-            return await _accountBusiness.GetCustomerReceiverList(ShowAll);
+            var loginDetails = await _loginInfo.GetLoginDetails();
+            return await _accountBusiness.GetCustomerReceiverList(ShowAll, loginDetails);
         }
 
         public async Task<CustomerTransactionList> GetCustomerTransactionList(bool ShowAll)
         {
-            return await _accountBusiness.GetCustomerTransactionList(ShowAll);
+            var loginDetails = await _loginInfo.GetLoginDetails();
+            return await _accountBusiness.GetCustomerTransactionList(ShowAll, loginDetails);
         }
     }
 }

CustomerOnlineRemit/CustomerOnlineRemit/Helper/LoginUserInfo.cs

@@ -1,26 +0,0 @@
-using CustomerOnlineRemit.Common.Model.Account;
-using System.Security.Claims;
-
-namespace CustomerOnlineRemit.Helper
-{
-    public static class LoginUserInfo
-    {
-        public static LoginResponse GetLoginDetails(this HttpContext context)
-        {
-            var claimIdentity = context.User.Identity as ClaimsIdentity;
-
-            var model = new LoginResponse();
-            if (claimIdentity.IsAuthenticated)
-            {
-                model.UserName = claimIdentity.FindFirst(x => x.Type == "UserName").Value;
-                model.FullName = claimIdentity.FindFirst(x => x.Type == ClaimTypes.Name).Value;
-                model.ForceChangePassword = Convert.ToBoolean(claimIdentity.FindFirst(x => x.Type == "ForceChangePassword").Value);
-                model.MobileNumber = claimIdentity.FindFirst(x => x.Type == "MobileNumber").Value;
-                model.Email = claimIdentity.FindFirst(x => x.Type == "Email").Value;
-                model.RememberMe = Convert.ToBoolean(claimIdentity.FindFirst(x => x.Type == "RememberMe").Value);
-                model.SessionId = claimIdentity.FindFirst(x => x.Type == "SessionId").Value;
-            }
-            return model;
-        }
-    }
-}

CustomerOnlineRemit/CustomerOnlineRemit/Helper/SessionHelper/ILoginUserInfo.cs

@@ -0,0 +1,9 @@
+using CustomerOnlineRemit.Common.Model.Account;
+
+namespace CustomerOnlineRemit.Helper.SessionHelper
+{
+    public interface ILoginUserInfo
+    {
+        Task<LoginResponse> GetLoginDetails();
+    }
+}

CustomerOnlineRemit/CustomerOnlineRemit/Helper/SessionHelper/LoginUserInfo.cs

@@ -0,0 +1,37 @@
+using CustomerOnlineRemit.Common.Model;
+using CustomerOnlineRemit.Common.Model.Account;
+using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
+
+namespace CustomerOnlineRemit.Helper.SessionHelper
+{
+    public class LoginUserInfo : ILoginUserInfo
+    {
+        private ProtectedSessionStorage _sessionStorage;
+        public LoginUserInfo(ProtectedSessionStorage sessionStorage)
+        {
+            _sessionStorage = sessionStorage;
+        }
+
+        public async Task<LoginResponse> GetLoginDetails()
+        {
+            LoginResponse _response = new LoginResponse();
+            try
+            {
+                var userSessionStorageResult = await _sessionStorage.GetAsync<LoginResponse>("UserSession");
+                _response = userSessionStorageResult.Success ? userSessionStorageResult.Value : null;
+
+                if (_response == null)
+                    return await Task.FromResult(_response);
+
+                _response.ResponseCode = ResponseHelper.SUCCESS;
+                _response.ResponseMessage = ResponseMessageHelper.SUCCESS;
+            }
+            catch (Exception ex)
+            {
+                _response.ResponseCode = ResponseHelper.EXCEPTION;
+                _response.ResponseMessage = "Exception occured: " + ex.Message;
+            }
+            return await Task.FromResult(_response);
+        }
+    }
+}

CustomerOnlineRemit/CustomerOnlineRemit/Program.cs

@@ -20,6 +20,7 @@ using CustomerOnlineRemit.Authentication;
 using CustomerOnlineRemit.Business.Business.Account;
 using CustomerOnlineRemit.Components;
 using CustomerOnlineRemit.Data.Account;
+using CustomerOnlineRemit.Helper.SessionHelper;
 using CustomerOnlineRemit.Repository.ConnectionServices;
 using CustomerOnlineRemit.Repository.Repository.Account;
 using Microsoft.AspNetCore.Authentication.Cookies;
@@ -45,7 +46,9 @@ builder.Services.AddScoped<ToastAlertComponent>();
 builder.Services.AddScoped<AccountServices>();
 builder.Services.AddScoped<ProtectedSessionStorage>();
 builder.Services.AddScoped<AuthenticationStateProvider, CustomAuthenticationStateProvider>();
+builder.Services.AddScoped<AuthenticationStateProvider, CustomAuthenticationStateProvider>();
 builder.Services.AddScoped<IAccountBusiness, AccountBusiness>();
+builder.Services.AddScoped<ILoginUserInfo, LoginUserInfo>();
 builder.Services.AddScoped<IAccountRepository, AccountRepository>();
 builder.Services.AddScoped<IDBServiceUtility, DBServiceUtility>();
 builder.Services.AddScoped<IAccountServices, AccountServices>();

CustomerOnlineRemit/CustomerOnlineRemit/obj/Debug/net7.0/CustomerOnlineRemit.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-c9a9879ded997bbd3c7e9f4d75a3412de67cca8f
+75000278dd7cb78eba52acf79768445f3457e302