Skip to content

Commit 7608f4c

Browse files
malimingmaliming
committed
Do not return the smtp password to the UI settings page.
1 parent 04cf16b commit 7608f4c

File tree

30 files changed

+62
-34
lines changed

30 files changed

+62
-34
lines changed

‎modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Volo.Abp.SettingManagement;
1212
public class EmailSettingsAppService : SettingManagementAppServiceBase, IEmailSettingsAppService
1313
{
1414
protected ISettingManager SettingManager { get; }
15-
15+
1616
protected IEmailSender EmailSender { get; }
1717

1818
public EmailSettingsAppService(ISettingManager settingManager, IEmailSender emailSender)
@@ -30,7 +30,6 @@ public virtual async Task<EmailSettingsDto> GetAsync()
3030
SmtpHost = await SettingProvider.GetOrNullAsync(EmailSettingNames.Smtp.Host),
3131
SmtpPort = Convert.ToInt32(await SettingProvider.GetOrNullAsync(EmailSettingNames.Smtp.Port)),
3232
SmtpUserName = await SettingProvider.GetOrNullAsync(EmailSettingNames.Smtp.UserName),
33-
SmtpPassword = await SettingProvider.GetOrNullAsync(EmailSettingNames.Smtp.Password),
3433
SmtpDomain = await SettingProvider.GetOrNullAsync(EmailSettingNames.Smtp.Domain),
3534
SmtpEnableSsl = Convert.ToBoolean(await SettingProvider.GetOrNullAsync(EmailSettingNames.Smtp.EnableSsl)),
3635
SmtpUseDefaultCredentials = Convert.ToBoolean(await SettingProvider.GetOrNullAsync(EmailSettingNames.Smtp.UseDefaultCredentials)),
@@ -42,7 +41,6 @@ public virtual async Task<EmailSettingsDto> GetAsync()
4241
{
4342
settingsDto.SmtpHost = await SettingManager.GetOrNullForTenantAsync(EmailSettingNames.Smtp.Host, CurrentTenant.GetId(), false);
4443
settingsDto.SmtpUserName = await SettingManager.GetOrNullForTenantAsync(EmailSettingNames.Smtp.UserName, CurrentTenant.GetId(), false);
45-
settingsDto.SmtpPassword = await SettingManager.GetOrNullForTenantAsync(EmailSettingNames.Smtp.Password, CurrentTenant.GetId(), false);
4644
settingsDto.SmtpDomain = await SettingManager.GetOrNullForTenantAsync(EmailSettingNames.Smtp.Domain, CurrentTenant.GetId(), false);
4745
}
4846

@@ -56,7 +54,10 @@ public virtual async Task UpdateAsync(UpdateEmailSettingsDto input)
5654
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.Host, input.SmtpHost);
5755
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.Port, input.SmtpPort.ToString());
5856
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.UserName, input.SmtpUserName);
59-
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.Password, input.SmtpPassword);
57+
if (!input.SmtpPassword.IsNullOrWhiteSpace())
58+
{
59+
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.Password, input.SmtpPassword);
60+
}
6061
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.Domain, input.SmtpDomain);
6162
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.EnableSsl, input.SmtpEnableSsl.ToString());
6263
await SettingManager.SetForTenantOrGlobalAsync(CurrentTenant.Id, EmailSettingNames.Smtp.UseDefaultCredentials, input.SmtpUseDefaultCredentials.ToString().ToLowerInvariant());

‎modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<Validation MessageLocalizer="@LH.Localize">
8080
<Field>
8181
<FieldLabel>@L["SmtpPassword"]</FieldLabel>
82-
<TextEdit Role="TextRole.Password" @bind-Text="@EmailSettings.SmtpPassword">
82+
<TextEdit Role="TextRole.Password" @bind-Text="@EmailSettings.SmtpPassword" Placeholder="@L["SmtpPasswordPlaceholder"].Value">
8383
<Feedback>
8484
<ValidationError/>
8585
</Feedback>
@@ -99,7 +99,7 @@
9999
}
100100
<SubmitButton Clicked="@UpdateSettingsAsync"/>
101101
</Column>
102-
102+
103103
</Row>
104104
</Form>
105105

@@ -164,4 +164,4 @@
164164
</ModalContent>
165165
</Modal>
166166
}
167-
}
167+
}

‎modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/ar.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"Feature:SettingManagementEnable": "تمكين إدارة الإعداد",
3535
"Feature:SettingManagementEnableDescription": "تفعيل إعداد نظام الإدارة في التطبيق.",
3636
"Feature:AllowChangingEmailSettings": "السماح لتغيير إعدادات البريد الإلكتروني.",
37-
"Feature:AllowChangingEmailSettingsDescription": "السماح لتغيير إعدادات البريد الإلكتروني."
37+
"Feature:AllowChangingEmailSettingsDescription": "السماح لتغيير إعدادات البريد الإلكتروني.",
38+
"SmtpPasswordPlaceholder": "أدخل قيمة لتحديث كلمة المرور",
3839
}
3940
}

‎modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/cs.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"Feature:SettingManagementEnable": "Povolit správu nastavení",
3535
"Feature:SettingManagementEnableDescription": "Povolit systém správy nastavení v aplikaci.",
3636
"Feature:AllowChangingEmailSettings": "Povolit změnu nastavení e-mailu.",
37-
"Feature:AllowChangingEmailSettingsDescription": "Povolit změnu nastavení e-mailu."
37+
"Feature:AllowChangingEmailSettingsDescription": "Povolit změnu nastavení e-mailu.",
38+
"SmtpPasswordPlaceholder": "Zadejte hodnotu pro aktualizaci hesla",
3839
}
3940
}

‎modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"Feature:SettingManagementEnable": "Einstellungsverwaltung aktivieren",
3535
"Feature:SettingManagementEnableDescription": "Aktivieren Sie das Einstellungsverwaltungssystem in der Anwendung.",
3636
"Feature:AllowChangingEmailSettings": "Änderung der E-Mail-Einstellungen zulassen.",
37-
"Feature:AllowChangingEmailSettingsDescription": "Änderung der E-Mail-Einstellungen zulassen."
37+
"Feature:AllowChangingEmailSettingsDescription": "Änderung der E-Mail-Einstellungen zulassen.",
38+
"SmtpPasswordPlaceholder": "Geben Sie einen Wert ein, um das Passwort zu aktualisieren"
3839
}
3940
}

‎modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"Feature:SettingManagementEnable": "Aktivieren Sie die Einstellungsverwaltung",
3535
"Feature:SettingManagementEnableDescription": "Aktivieren Sie das Einstellungsverwaltungssystem in der Anwendung.",
3636
"Feature:AllowChangingEmailSettings": "Erlauben Sie das Ändern der E-Mail-Einstellungen.",
37-
"Feature:AllowChangingEmailSettingsDescription": "Erlauben Sie das Ändern der E-Mail-Einstellungen."
37+
"Feature:AllowChangingEmailSettingsDescription": "Erlauben Sie das Ändern der E-Mail-Einstellungen.",
38+
"SmtpPasswordPlaceholder": "Geben Sie einen Wert ein, um das Passwort zu aktualisieren"
3839
}
3940
}

‎modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/el.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"Feature:SettingManagementEnable": "Ενεργοποίηση διαχείρισης ρυθμίσεων",
3232
"Feature:SettingManagementEnableDescription": "Ενεργοποίηση συστήματος διαχείρισης ρυθμίσεων στην εφαρμογή.",
3333
"Feature:AllowChangingEmailSettings": "Επιτρέψτε την αλλαγή των ρυθμίσεων email.",
34-
"Feature:AllowChangingEmailSettingsDescription": "Επιτρέψτε την αλλαγή των ρυθμίσεων email."
34+
"Feature:AllowChangingEmailSettingsDescription": "Επιτρέψτε την αλλαγή των ρυθμίσεων email.",
35+
"SmtpPasswordPlaceholder": "Εισαγάγετε μια τιμή για ενημέρωση κωδικού πρόσβασης"
3536
}
3637
}

‎modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"Feature:SettingManagementEnable": "Enable setting management",
3535
"Feature:SettingManagementEnableDescription": "Enable setting management system in the application.",
3636
"Feature:AllowChangingEmailSettings": "Allow changing email settings.",
37-
"Feature:AllowChangingEmailSettingsDescription": "Allow changing email settings."
37+
"Feature:AllowChangingEmailSettingsDescription": "Allow changing email settings.",
38+
"SmtpPasswordPlaceholder": "Enter a value to update password"
3839
}
3940
}

‎modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"Feature:SettingManagementEnable": "Habilitar la gestión de la configuración",
3535
"Feature:SettingManagementEnableDescription": "Habilite el sistema de gestión de la configuración en la aplicación.",
3636
"Feature:AllowChangingEmailSettings": "Permitir cambiar la configuración de correo electrónico.",
37-
"Feature:AllowChangingEmailSettingsDescription": "Permitir cambiar la configuración de correo electrónico."
37+
"Feature:AllowChangingEmailSettingsDescription": "Permitir cambiar la configuración de correo electrónico.",
38+
"SmtpPasswordPlaceholder": "Ingrese un valor para actualizar la contraseña"
3839
}
3940
}

‎modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/fi.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"Feature:SettingManagementEnable": "Ota asetusten hallinta käyttöön",
3535
"Feature:SettingManagementEnableDescription": "Ota asetustenhallintajärjestelmä käyttöön sovelluksessa.",
3636
"Feature:AllowChangingEmailSettings": "Salli sähköpostiasetusten muuttaminen.",
37-
"Feature:AllowChangingEmailSettingsDescription": "Salli sähköpostiasetusten muuttaminen."
37+
"Feature:AllowChangingEmailSettingsDescription": "Salli sähköpostiasetusten muuttaminen.",
38+
"SmtpPasswordPlaceholder": "Syötä arvo päivittääksesi salasana"
3839
}
3940
}

0 commit comments

Comments
 (0)