From 30451f12cc4987a521f9ba8c97e0f74020709049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20KILI=C3=87?= Date: Thu, 24 Nov 2022 17:54:47 +0300 Subject: [PATCH 1/7] toaster text alignment --- .../theme-shared/src/lib/components/toast/toast.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html index 25db3a12e0..bff6e7dee9 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html @@ -2,7 +2,7 @@
-
+
From 17cc955c8eba3b8257c5260c073c809e50164cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20KILI=C3=87?= Date: Fri, 25 Nov 2022 12:17:29 +0300 Subject: [PATCH 2/7] toaster text alignment --- .../src/lib/components/toast/toast.component.html | 2 +- .../src/lib/components/toast/toast.component.scss | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html index bff6e7dee9..0e785a22bb 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html @@ -2,7 +2,7 @@
-
+
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss index 64bf8a6068..08b26c5184 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss @@ -79,3 +79,10 @@ $toastClass: abp-toast; } } } + +.toast-flex { + display: flex; + align-self: center; + word-break: break-word; + +} From 0d57c2896b31f0286695feb6f32e69855b94caf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20KILI=C3=87?= Date: Fri, 25 Nov 2022 12:18:09 +0300 Subject: [PATCH 3/7] formatted scss --- .../theme-shared/src/lib/components/toast/toast.component.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss index 08b26c5184..39ea573cde 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss @@ -84,5 +84,4 @@ $toastClass: abp-toast; display: flex; align-self: center; word-break: break-word; - } From afffee21f2a1629f13d36c19fdb81bf470491e68 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Fri, 25 Nov 2022 13:13:24 +0300 Subject: [PATCH 4/7] Remove isSameDataFunction --- .../personal-settings.component.ts | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts index 6ec15b1667..060cef712c 100644 --- a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts +++ b/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() { From 0ad64465c54cbd23558a6bea6c5db72f106ce6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20KILI=C3=87?= Date: Fri, 25 Nov 2022 13:50:21 +0300 Subject: [PATCH 5/7] delete toast-flex class --- .../src/lib/components/toast/toast.component.scss | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss index 39ea573cde..192af4afdb 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss +++ b/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; @@ -79,9 +82,3 @@ $toastClass: abp-toast; } } } - -.toast-flex { - display: flex; - align-self: center; - word-break: break-word; -} From e5d6164a57f84a26b80e0b037df635298307711b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20KILI=C3=87?= Date: Fri, 25 Nov 2022 15:30:25 +0300 Subject: [PATCH 6/7] delete toast-flex class --- .../theme-shared/src/lib/components/toast/toast.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html index 0e785a22bb..25db3a12e0 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html @@ -2,7 +2,7 @@
-
+
From 22ad7c39f3dfcfe06e4982e5504cb559ae9e05e2 Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 1 Dec 2022 15:16:47 +0800 Subject: [PATCH 7/7] Add `GivenName` claim to `Userinfo` endpoint. --- .../Volo/Abp/OpenIddict/Controllers/UserInfoController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/UserInfoController.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/UserInfoController.cs index 74fc01c89f..418b361bda 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/UserInfoController.cs +++ b/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))