Merge pull request #18671 from abpframework/auto-merge/rel-8-0/2409

Merge branch dev with rel-8.0

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityErrorCodes.cs

@@ -11,4 +11,5 @@ public static class IdentityErrorCodes
     public const string UsersCanNotChangeTwoFactor = "Volo.Abp.Identity:010007";
     public const string CanNotChangeTwoFactor = "Volo.Abp.Identity:010008";
     public const string YouCannotDelegateYourself = "Volo.Abp.Identity:010009";
+    public const string ClaimNameExist = "Volo.Abp.Identity:010021";
 }

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ar.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "لا يمكنك تغيير إعداد العاملين.",
     "Volo.Abp.Identity:010008": "لا يجوز تغيير إعداد عاملين.",
     "Volo.Abp.Identity:010009": "لا يمكنك تفويض نفسك.",
+    "Volo.Abp.Identity:010021": "الاسم {0} موجود بالفعل.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "العدد الأقصى المسموح به لعضوية الوحدة التنظيمية للمستخدم",
     "ThisUserIsNotActiveMessage": "هذا المستخدم غير نشط.",
     "Permission:IdentityManagement": "إدارة الهوية",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/cs.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Nastavení dvou faktorů nemůžete změnit.",
     "Volo.Abp.Identity:010008": "Není povoleno měnit nastavení dvou faktorů.",
     "Volo.Abp.Identity:010009": "Nemůžete delegovat své vlastní oprávnění.",
+    "Volo.Abp.Identity:010021": "Název '{0}' již existuje.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Maximální povolený počet členů organizační jednotky pro uživatele",
     "ThisUserIsNotActiveMessage": "Tento uživatel není aktivní.",
     "Permission:IdentityManagement": "Správa identit",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/de.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Sie können Ihre Zwei-Faktor-Einstellung nicht ändern.",
     "Volo.Abp.Identity:010008": "Die Zwei-Faktor-Einstellung dürfen nicht geändert werden.",
     "Volo.Abp.Identity:010009": "Sie können sich nicht selbst delegieren.",
+    "Volo.Abp.Identity:010021": "Der Name existiert bereits {0}",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Maximal zulässige Anzahl an Mitgliedschaften in Organisationseinheiten für einen Benutzer",
     "ThisUserIsNotActiveMessage": "Dieser Benutzer ist nicht aktiv.",
     "Permission:IdentityManagement": "Identitätsverwaltung",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/el.json

@@ -75,6 +75,7 @@
     "Volo.Abp.Identity:010007": "Δεν μπορείτε να αλλάξετε τη ρύθμιση δύο παραγόντων.",
     "Volo.Abp.Identity:010008": "Δεν επιτρέπεται η αλλαγή της ρύθμισης δύο παραγόντων.",
     "Volo.Abp.Identity:010009": "Δεν μπορείτε να αναθέσετε την εξουσιοδότησή σας σε εσάς ίδιο.",
+    "Volo.Abp.Identity:010021": "Το όνομα '{0}' υπάρχει ήδη.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Μέγιστος επιτρεπόμενος αριθμός μελών μονάδας οργανισμού για έναν χρήστη",
     "ThisUserIsNotActiveMessage": "Αυτός ο χρήστης δεν είναι ενεργός.",
     "Permission:IdentityManagement": "Διαχείριση ταυτότητας",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en-GB.json

@@ -75,6 +75,7 @@
     "Volo.Abp.Identity:010007": "You can't change your two factor setting.",
     "Volo.Abp.Identity:010008": "Changing the two factor setting is not allowed.",
     "Volo.Abp.Identity:010009": "You cannot delegate yourself!",
+    "Volo.Abp.Identity:010021": "Name exist: '{0}'",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Maximum allowed organisation unit membership count for a user",
     "Permission:IdentityManagement": "Identity management",
     "Permission:RoleManagement": "Role management",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "You can't change your two factor setting.",
     "Volo.Abp.Identity:010008": "It's not allowed to change two factor setting.",
     "Volo.Abp.Identity:010009": "You can not delegate yourself.",
+    "Volo.Abp.Identity:010021": "Name exist: '{0}'.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Maximum allowed organization unit membership count for a user",
     "ThisUserIsNotActiveMessage": "This user is not active.",
     "Permission:IdentityManagement": "Identity management",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/es.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "No puedes cambiar tu configuración de autentificación de dos pasos.",
     "Volo.Abp.Identity:010008": "No está permitido cambiar la configuración de autenticación de dos pasos.",
     "Volo.Abp.Identity:010009": "No puedes delegar tu propia cuenta!",
+    "Volo.Abp.Identity:010021": "Ya existe un con el nombre '{0}'",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Número máximo de unidades organizativas por usuario",
     "ThisUserIsNotActiveMessage": "Este usuario no está activo.",
     "Permission:IdentityManagement": "Gestión de identidades",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fa.json

@@ -75,6 +75,7 @@
     "Volo.Abp.Identity:010007": "شما نمی توانید تنظیمات دو مرحله ای خود را تغییر دهید.",
     "Volo.Abp.Identity:010008": "تغییر دادن تنظیمات دو مرحله ای مجاز نمی باشد.",
     "Volo.Abp.Identity:010009": "شما نمی توانید خودتان را معرفی کنید.",
+    "Volo.Abp.Identity:010021": "نام {0} قبلاً استفاده گردیده است.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "حداکثر تعداد مجاز عضویت در یک واحد سازمان برای یک کاربر",
     "ThisUserIsNotActiveMessage": "این کاربر غیرفعال میباشد.",
     "Permission:IdentityManagement": "مدیریت هویت",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fi.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Et voi muuttaa kahden tekijän asetusta.",
     "Volo.Abp.Identity:010008": "Kahden tekijän asetusta ei saa muuttaa.",
     "Volo.Abp.Identity:010009": "Et voi delegoida itseäsi.",
+    "Volo.Abp.Identity:010021": "{0} on jo olemassa.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Suurin sallittu organisaatioyksikön jäsenmäärä käyttäjälle",
     "ThisUserIsNotActiveMessage": "Tämä käyttäjä ei ole aktiivinen.",
     "Permission:IdentityManagement": "Identiteetin hallinta",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fr.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Vous ne pouvez pas modifier votre paramètre à deux facteurs.",
     "Volo.Abp.Identity:010008": "Il n’est pas permis de changer deux facteurs de réglage.",
     "Volo.Abp.Identity:010009": "Vous ne pouvez pas vous déléguer vous-même.",
+    "Volo.Abp.Identity:010021" : "Le nom '{0}' existe déjà.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Nombre maximal d’adhésions autorisées à l’unité d’organisation pour un utilisateur",
     "ThisUserIsNotActiveMessage": "Cet utilisateur n'est pas actif.",
     "Permission:IdentityManagement": "Gestion de l’identité",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hi.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "आप अपनी दो कारक सेटिंग नहीं बदल सकते।",
     "Volo.Abp.Identity:010008": "इसे दो कारक सेटिंग बदलने की अनुमति नहीं है।",
     "Volo.Abp.Identity:010009": "आप अपने आप को अधिकृत नहीं कर सकते हैं!",
+    "Volo.Abp.Identity:010021" : "नाम '{0}' पहले से ही लिया गया है।",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "उपयोगकर्ता के लिए अधिकतम अनुमत संगठन इकाई सदस्यता गणना",
     "ThisUserIsNotActiveMessage": "यह उपयोगकर्ता सक्रिय नहीं है।",
     "Permission:IdentityManagement": "पहचान प्रबंधन",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hr.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Ne možete promijeniti postavku dva faktora.",
     "Volo.Abp.Identity:010008": "Nije dopušteno mijenjati postavke dvofaktorske autentifikacije.",
     "Volo.Abp.Identity:010009": "Ne možete delegirati sami sebi.",
+    "Volo.Abp.Identity:010021" : "Naziv '{0}' već postoji.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Maksimalni dopušteni broj članstva u organizacijskoj jedinici za korisnika",
     "ThisUserIsNotActiveMessage": "Ovaj korisnik nije aktivan.",
     "Permission:IdentityManagement": "Upravljanje identitetom",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hu.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Nem változtathatja meg a kétlépcsős bejelentkezés beállítását.",
     "Volo.Abp.Identity:010008": "Kétlépcsős bejelentkezés beállítás megváltoztatása nem megengedett.",
     "Volo.Abp.Identity:010009": "Nem adhatja át a saját jogosultságait.",
+    "Volo.Abp.Identity:010021" : "'{0}' nevű már létezik.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "A maximálisan megengedett szervezeti egység tagsági szám egy felhasználó számára",
     "ThisUserIsNotActiveMessage": "Ez a felhasználó nem aktív.",
     "Permission:IdentityManagement": "Identitáskezelés",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/is.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Þú getur ekki breytt tveggja þátta stillingu þinni.",
     "Volo.Abp.Identity:010008": "Það er ekki leyfilegt að breyta tvíþátta stillingu.",
     "Volo.Abp.Identity:010009": "Þú getur ekki delegað þér sjálfum.",
+    "Volo.Abp.Identity:010021" : "Nafnið '{0}' er þegar í notkun.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Hámarks leyfileg fjöldi aðildar að skipulagseiningu fyrir notanda",
     "ThisUserIsNotActiveMessage": "Þessi notandi er ekki virkur.",
     "Permission:IdentityManagement": "Auðkenninga umsjón",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/it.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Non puoi modificare l'impostazione dei due fattori.",
     "Volo.Abp.Identity:010008": "Non è consentito modificare l'impostazione a due fattori.",
     "Volo.Abp.Identity:010009": "Non puoi delegare te stesso.",
+    "Volo.Abp.Identity:010021" : "Il nome '{0}' è già in uso.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Numero massimo consentito di membri dell'unità organizzativa per un utente",
     "ThisUserIsNotActiveMessage": "Questo utente non è attivo.",
     "Permission:IdentityManagement": "Gestione identità",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/nl.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "U kunt uw instelling voor tweefactor authenticatie niet wijzigen.",
     "Volo.Abp.Identity:010008": "Het is niet toegestaan om de instelling van tweefactor authenticatie te wijzigen.",
     "Volo.Abp.Identity:010009": "U kunt uzelf niet delegeren.",
+    "Volo.Abp.Identity:010021" : "Er bestaat al een met de naam '{0}'.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Maximaal toegestande aantal lidmaatschappen van organisatie-eenheden voor een gebruiker",
     "ThisUserIsNotActiveMessage": "Deze gebruiker is niet actief.",
     "Permission:IdentityManagement": "Identiteitsbeheer",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pl-PL.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Nie możesz zmienić ustawienia dwóch czynników.",
     "Volo.Abp.Identity:010008": "Nie wolno zmieniać ustawienia dwuczynnikowego.",
     "Volo.Abp.Identity:010009": "Nie możesz delegować swoich uprawnień.",
+    "Volo.Abp.Identity:010021" : "Nazwa '{0}' już istnieje.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Maksymalna dozwolona liczba członków jednostki organizacyjnej dla użytkownika",
     "ThisUserIsNotActiveMessage": "Ten użytkownik nie jest aktywny.",
     "Permission:IdentityManagement": "Zarządzanie tożsamością",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pt-BR.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Você não pode alterar sua configuração de dois fatores.",
     "Volo.Abp.Identity:010008": "Não é permitido alterar a configuração de dois fatores.",
     "Volo.Abp.Identity:010009": "Você não pode delegar a si mesmo.",
+    "Volo.Abp.Identity:010021" : "Já existe um(a) {0} com o nome.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Contagem máxima permitida de membros da unidade organizacional para um usuário",
     "ThisUserIsNotActiveMessage": "Este usuário não está ativo.",
     "Permission:IdentityManagement": "Acessos",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Nu vă puteţi schimba setările de autentificare în doi paşi.",
     "Volo.Abp.Identity:010008": "Nu este permisă modificarea setărilor autentificării în doi paşi.",
     "Volo.Abp.Identity:010009": "Nu vă puteţi delega singur.",
+    "Volo.Abp.Identity:010021" : "Numele '{0}' este deja luat.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Numărul maxim de unităţi organizaţionale permise pentru un utilizator",
     "ThisUserIsNotActiveMessage": "Acest utilizator nu este activ.",
     "Permission:IdentityManagement": "Administrare identităţii",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ru.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Вы не можете изменить настройку двух факторов.",
     "Volo.Abp.Identity:010008": "Изменение двухфакторной настройки не допускается.",
     "Volo.Abp.Identity:010009": "Вы не можете делегировать свои собственные права.",
+    "Volo.Abp.Identity:010021" : "Имя '{0}' уже существует.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Максимально допустимое количество членов организационного подразделения для пользователя",
     "ThisUserIsNotActiveMessage": "Этот пользователь не активен.",
     "Permission:IdentityManagement": "Управление идентификацией",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sk.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Dvojfaktorové nastavenie nie je možné zmeniť.",
     "Volo.Abp.Identity:010008": "Dvojfaktorové nastavenie nie je povolené zmeniť.",
     "Volo.Abp.Identity:010009": "Nemôžete delegovať svoje vlastné oprávnenia.",
+    "Volo.Abp.Identity:010021" : "Názov '{0}' sa už používa.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Maximálny povolený počet členov organizačnej jednotky pre používateľa",
     "ThisUserIsNotActiveMessage": "Tento používateľ nie je aktívny.",
     "Permission:IdentityManagement": "Správa identít",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sl.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Nastavitve dveh faktorjev ne morete spremeniti.",
     "Volo.Abp.Identity:010008": "Ni dovoljeno spreminjati nastavitve dveh faktorjev.",
     "Volo.Abp.Identity:010009": "Ne morete delegirati svojih pravic.",
+    "Volo.Abp.Identity:010021" : "Naziv '{0}' že obstaja.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Največje dovoljeno število članov v organizacijski enoti za uporabnika",
     "ThisUserIsNotActiveMessage": "Ta uporabnik ni aktiven.",
     "Permission:IdentityManagement": "Upravljanje identitet",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "İki faktörlü ayarınızı değiştiremezsiniz.",
     "Volo.Abp.Identity:010008": "İki faktörlü ayarın değiştirilmesine izin verilmez.",
     "Volo.Abp.Identity:010009": "Kendinizi yetkilendiremezsiniz.",
+    "Volo.Abp.Identity:010021" : "{0} isminde bir birim zaten var.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Bir kullanıcı için izin verilen en fazla organizasyon birimi sayısı",
     "ThisUserIsNotActiveMessage": "Bu kullanıcı aktif değil.",
     "Permission:IdentityManagement": "Kimlik yönetimi",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/vi.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "Bạn không thể thay đổi cài đặt hai yếu tố của mình.",
     "Volo.Abp.Identity:010008": "Không được phép thay đổi cài đặt hai yếu tố.",
     "Volo.Abp.Identity:010009": "Bạn không thể ủy quyền cho chính mình.",
+    "Volo.Abp.Identity:010021": "Tên '{0}' đã tồn tại.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "Số lượng thành viên đơn vị tổ chức tối đa được phép cho một người dùng",
     "ThisUserIsNotActiveMessage": "Người dùng này không hoạt động.",
     "Permission:IdentityManagement": "Quản lý danh tính",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "你不能修改你的双因素身份验证设置",
     "Volo.Abp.Identity:010008": "不允许修改双因素身份验证设置。",
     "Volo.Abp.Identity:010009": "你不能委托给自己。",
+    "Volo.Abp.Identity:010021": "名称：'{0}' 已存在",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "组织单位最大允许的成员资格计数",
     "ThisUserIsNotActiveMessage": "该用户不可用。",
     "Permission:IdentityManagement": "身份标识管理",

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json

@@ -76,6 +76,7 @@
     "Volo.Abp.Identity:010007": "你不能修改你的雙因素身份驗證設置",
     "Volo.Abp.Identity:010008": "不允許修改雙因素身份驗證設置.",
     "Volo.Abp.Identity:010009": "你不能委派給自己",
+    "Volo.Abp.Identity:010021" : "名稱 '{0}' 已存在.",
     "Identity.OrganizationUnit.MaxUserMembershipCount": "允許一個使用者至多可隸屬在幾個組織單位",
     "ThisUserIsNotActiveMessage": "該用戶不可用.",
     "Permission:IdentityManagement": "身份識別管理",

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityClaimTypeManager.cs

@@ -16,7 +16,7 @@ public class IdentityClaimTypeManager : DomainService
     {
         if (await IdentityClaimTypeRepository.AnyAsync(claimType.Name))
         {
-            throw new AbpException($"Name Exist: {claimType.Name}");
+            throw new BusinessException(IdentityErrorCodes.ClaimNameExist).WithData("0", claimType.Name);
         }
 
         return await IdentityClaimTypeRepository.InsertAsync(claimType);

modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityClaimTypeManager_Tests.cs

@@ -32,7 +32,7 @@ public class IdentityClaimTypeManager_Tests : AbpIdentityDomainTestBase
     [Fact]
     public async Task Create_Name_Exist_Should_Exception()
     {
-        await Assert.ThrowsAnyAsync<AbpException>(async () => await _claimTypeManager.CreateAsync(
+        await Assert.ThrowsAnyAsync<BusinessException>(async () => await _claimTypeManager.CreateAsync(
             new IdentityClaimType(
                 Guid.NewGuid(), "Age")));
     }