Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align Azure Communication Implementations #16747

Merged
merged 10 commits into from
Sep 18, 2024
2 changes: 1 addition & 1 deletion src/OrchardCore.Cms.Web/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
// "DefaultSender": "",
// "ConnectionString": ""
//}
//"OrchardCore_Sms_AzureCommunicationServices": {
//"OrchardCore_Sms_AzureCommunication": {
MikeAlhayek marked this conversation as resolved.
Show resolved Hide resolved
Piedone marked this conversation as resolved.
Show resolved Hide resolved
// "PhoneNumber": "",
// "ConnectionString": ""
//}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public override async Task<IDisplayResult> EditAsync(ISite site, AzureEmailSetti
model.IsEnabled = settings.IsEnabled;
model.DefaultSender = settings.DefaultSender;
model.HasConnectionString = !string.IsNullOrWhiteSpace(settings.ConnectionString);
}).Location("Content:5#Azure")
}).Location("Content:5#Azure Communication")
.OnGroup(SettingsGroupId);
}

Expand Down
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.Email.Azure/Manifest.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
using OrchardCore.Modules.Manifest;

[assembly: Module(
Name = "Azure Email Provider",
Name = "Azure Communication Email",
Author = ManifestConstants.OrchardCoreTeam,
Website = ManifestConstants.OrchardCoreWebsite,
Version = ManifestConstants.OrchardCoreVersion,
Description = "Provides an email service provider leveraging Azure Communication Services (ACS).",
Description = "Provides email service providers leveraging Azure Communication Services (ACS).",
Piedone marked this conversation as resolved.
Show resolved Hide resolved
Dependencies =
[
"OrchardCore.Email"
"OrchardCore.Email",
MikeAlhayek marked this conversation as resolved.
Show resolved Hide resolved
],
Category = "Messaging"
)]
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ public AzureEmailProvider(
{
}

public override LocalizedString DisplayName => S["Azure Communication Service"];
public override LocalizedString DisplayName
=> S["Azure Communication"];
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ public DefaultAzureEmailProvider(
{
}

public override LocalizedString DisplayName => S["Default Azure Communication Service"];
public override LocalizedString DisplayName
=> S["Default Azure Communication"];
}
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Sms.Azure/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public override void ConfigureServices(IServiceCollection services)

services.Configure<DefaultAzureSmsOptions>(options =>
{
_shellConfiguration.GetSection("OrchardCore_Sms_AzureCommunicationServices").Bind(options);
_shellConfiguration.GetSection("OrchardCore_Sms_AzureCommunication").Bind(options);

options.IsEnabled = options.ConfigurationExists();
});
Expand Down
12 changes: 6 additions & 6 deletions src/docs/reference/modules/Email.Azure/README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Azure Email (`OrchardCore.Email.Azure`)
# Azure Communication Email (`OrchardCore.Email.Azure`)

This module provides an Email provider for sending emails through [Azure Communication Services Email](https://learn.microsoft.com/en-us/azure/communication-services/concepts/email/email-overview).
This module provides Email providers for sending emails through [Azure Communication Services](https://learn.microsoft.com/en-us/azure/communication-services/concepts/email/email-overview).
MikeAlhayek marked this conversation as resolved.
Show resolved Hide resolved

## Azure Communication Service Settings
## **Azure Communication** Provider Configuration

Enabling this module will introduce a new tab labeled 'Azure' within the email settings, allowing you to configure the service. To access these settings, navigate to `Configuration` → `Settings` → `Email` and click on the 'Azure' tab. The following are the available settings
Enabling this module will introduce a new tab labeled **Azure Communication** within the email settings, allowing you to configure the service. To access these settings, navigate to `Configuration` → `Settings` → `Email` and click on the **Azure Communication** tab. The following are the available settings

| Setting | Description |
| --- | --- |
| `ConnectionString` | The ACS connection string that will be used to deliver the email.
| `DefaultSender` | The email of the sender. This will override the `DefaultSender` setting in [`OrchardCore.Email`](../Email/README.md). |
| `ConnectionString` | The ACS connection string that will be used to deliver the email.

## Default Azure Communication Service Configuration
## **Default Azure Communication** Provider Configuration

You may configure the Default Azure Email Service provider by the configuration provider using the following settings:

Expand Down
4 changes: 2 additions & 2 deletions src/docs/reference/modules/Sms.Azure/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Azure SMS (`OrchardCore.Sms.Azure`)
# Azure Communication SMS (`OrchardCore.Sms.Azure`)

This feature provides SMS providers for sending SMS through [Azure Communication Services SMS](https://learn.microsoft.com/en-us/azure/communication-services/concepts/sms/concepts).

Expand All @@ -17,7 +17,7 @@ Enabling this feature will introduce a new tab labeled **Azure** within the SMS
You may configure the **Default Azure Communication** using any configuration provider via the following settings:

```json
"OrchardCore_Sms_AzureCommunicationServices": {
"OrchardCore_Sms_AzureCommunication": {
"PhoneNumber": "",
"ConnectionString": ""
}
Expand Down
4 changes: 4 additions & 0 deletions src/docs/releases/2.1.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ Release date: Not yet released
### New 'Azure Communication SMS' feature

A new feature was added to allow you to send SMS messages using Azure Communication Services (ACS). Simply enable it then navigate to the admin dashboard > `Configurations` >> `Settings` >> `SMS` to configure the provider. For more information you can refer to the [docs](../reference/modules/Sms.Azure/README.md).

### The 'Azure Communication Email' feature

The feature 'Azure Email Provider' was renamed to 'Azure Communication Email'.