From c239ece5c1dd3982b5a27cc70ed61d51d4dd65bc Mon Sep 17 00:00:00 2001 From: Sajad Afaghiy Date: Mon, 1 Apr 2024 14:28:19 +0330 Subject: [PATCH 1/5] Rename delete-bin-obj-folders.bat to delete-temp-directories.bat --- delete-bin-obj-folders.bat => delete-temp-directories.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename delete-bin-obj-folders.bat => delete-temp-directories.bat (95%) diff --git a/delete-bin-obj-folders.bat b/delete-temp-directories.bat similarity index 95% rename from delete-bin-obj-folders.bat rename to delete-temp-directories.bat index 9e2a02a6..20389227 100644 --- a/delete-bin-obj-folders.bat +++ b/delete-temp-directories.bat @@ -13,4 +13,4 @@ FOR /d /r . %%d in (bin,obj, logs, node_modules) DO (( ECHO. ECHO.BIN and OBJ folders have been successfully deleted. Press any key to exit. -pause > nul \ No newline at end of file +pause > nul From c4f78f5921e6380529f89b34ce6fec5e79291811 Mon Sep 17 00:00:00 2001 From: Sajad Afaghiy Date: Mon, 1 Apr 2024 14:30:43 +0330 Subject: [PATCH 2/5] Update delete-temp-directories.bat Refactor and user experience improvements. --- delete-temp-directories.bat | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/delete-temp-directories.bat b/delete-temp-directories.bat index 20389227..5921c8f4 100644 --- a/delete-temp-directories.bat +++ b/delete-temp-directories.bat @@ -1,16 +1,21 @@ -@ECHO off +@echo off cls -ECHO Deleting all BIN and OBJ folders... -ECHO. +set directories= bin, obj, logs, node_modules +set /a count = 0 -FOR /d /r . %%d in (bin,obj, logs, node_modules) DO (( - ECHO.Deleting: %%d - rd /s/q "%%d" - ) - ) -) +echo Deleting all following directories: +for %%d in (%directories%) do echo %%d +echo. -ECHO. -ECHO.BIN and OBJ folders have been successfully deleted. Press any key to exit. +FOR /d /r . %%d in (%directories%) DO if exist "%%d" ( + echo. Deleting: %%d + rd /s/q "%%d" + set /a count += 1 + ) + +echo. +echo The specified directories were successfully scanned. +echo Number of deleted directories: %count% +echo Press any key to exit. pause > nul From d7327152f7382d18788bee9a7e2c8831c78187cb Mon Sep 17 00:00:00 2001 From: Sajad Afaghiy Date: Mon, 1 Apr 2024 15:41:23 +0330 Subject: [PATCH 3/5] Update delete-temp-directories.bat --- delete-temp-directories.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delete-temp-directories.bat b/delete-temp-directories.bat index 5921c8f4..967dcb22 100644 --- a/delete-temp-directories.bat +++ b/delete-temp-directories.bat @@ -8,7 +8,7 @@ echo Deleting all following directories: for %%d in (%directories%) do echo %%d echo. -FOR /d /r . %%d in (%directories%) DO if exist "%%d" ( +for /d /r . %%d in (%directories%) do if exist "%%d" ( echo. Deleting: %%d rd /s/q "%%d" set /a count += 1 From 0228e1bb4791cf57d25f7ac9e20cd11fc4c6de13 Mon Sep 17 00:00:00 2001 From: Sajad Afaghiy Date: Sat, 6 Apr 2024 00:26:00 +0330 Subject: [PATCH 4/5] Update delete-temp-directories.bat --- delete-temp-directories.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delete-temp-directories.bat b/delete-temp-directories.bat index 967dcb22..d9e2badf 100644 --- a/delete-temp-directories.bat +++ b/delete-temp-directories.bat @@ -12,7 +12,7 @@ for /d /r . %%d in (%directories%) do if exist "%%d" ( echo. Deleting: %%d rd /s/q "%%d" set /a count += 1 - ) +) echo. echo The specified directories were successfully scanned. From 4dcb43726d0164fc29015b9d11805feaca639244 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Mon, 20 May 2024 23:10:10 -0400 Subject: [PATCH 5/5] fixes the exception loop handling --- .../UserLoggedInEventHandler.cs | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/services/identity/src/EShopOnAbp.IdentityService.Application/UserLoggedInEventHandler.cs b/services/identity/src/EShopOnAbp.IdentityService.Application/UserLoggedInEventHandler.cs index 058db2d8..075b1283 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.Application/UserLoggedInEventHandler.cs +++ b/services/identity/src/EShopOnAbp.IdentityService.Application/UserLoggedInEventHandler.cs @@ -1,8 +1,11 @@ -using System.Threading.Tasks; +using System.Linq; +using System.Threading.Tasks; using EShopOnAbp.IdentityService.ETOs; +using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; using Volo.Abp; using Volo.Abp.DependencyInjection; +using Volo.Abp.Domain.Repositories; using Volo.Abp.EventBus.Distributed; using Volo.Abp.Identity; using Volo.Abp.Uow; @@ -13,16 +16,22 @@ public class UserLoggedInEventHandler : IDistributedEventHandler _logger; + private readonly IIdentityUserRepository _identityUserRepository; + private readonly ILookupNormalizer _lookupNormalizer; - public UserLoggedInEventHandler(IdentityUserManager userManager, ILogger logger) + public UserLoggedInEventHandler(IdentityUserManager userManager, + ILogger logger, + IIdentityUserRepository identityUserRepository, + ILookupNormalizer lookupNormalizer) { _userManager = userManager; _logger = logger; + _identityUserRepository = identityUserRepository; + _lookupNormalizer = lookupNormalizer; } - - + [UnitOfWork] - public async virtual Task HandleEventAsync(UserLoggedInEto eventData) + public virtual async Task HandleEventAsync(UserLoggedInEto eventData) { if (eventData == null) { @@ -59,8 +68,15 @@ public class UserLoggedInEventHandler : IDistributedEventHandler