Merge pull request #14915 from abpframework/auto-merge/rel-6-0/1517

Merge branch rel-7.0 with rel-6.0

modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/UserInfoController.cs

@@ -44,6 +44,7 @@ public class UserInfoController : AbpOpenIdDictControllerBase
             claims[AbpClaimTypes.TenantId] = user.TenantId;
             claims[OpenIddictConstants.Claims.PreferredUsername] = user.UserName;
             claims[OpenIddictConstants.Claims.FamilyName] = user.Surname;
+            claims[OpenIddictConstants.Claims.GivenName] = user.Name;
         }
 
         if (User.HasScope(OpenIddictConstants.Scopes.Email))

npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts

@@ -36,7 +36,6 @@ export class PersonalSettingsComponent
   form: UntypedFormGroup;
 
   inProgress: boolean;
-  private profile: ProfileDto;
 
   constructor(
     private fb: UntypedFormBuilder,
@@ -79,24 +78,12 @@ export class PersonalSettingsComponent
       });
   }
 
-  isDataSame(oldValue, newValue) {
-    return Object.entries(oldValue).some(([key, value]) => {
-      if (key in newValue) {
-        return value !== newValue[key];
-      }
-      return false;
-    });
-  }
-
   logoutConfirmation = () => {
     this.authService.logout().subscribe();
   };
 
   private isLogoutConfirmMessageActive() {
-    if (!this.isPersonalSettingsChangedConfirmationActive) {
-      return false;
-    }
-    return this.isDataSame(this.profile, this.form.value);
+    return this.isPersonalSettingsChangedConfirmationActive;
   }
 
   private showLogoutConfirmMessage() {

npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss

@@ -47,6 +47,9 @@ $toastClass: abp-toast;
   }
   .#{$toastClass}-content {
     position: relative;
+    display: flex;
+    align-self: center;
+    word-break: break-word;
     .#{$toastClass}-close-button {
       position: absolute;
       top: 0;