Skip to content

Migrate FluentEmail.Graph to Microsoft.Graph 5.x (fixes #380) #394

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.

Sign up for GitHub

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

Open
SENESO wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate FluentEmail.Graph to Microsoft.Graph 5.x (fixes #380) #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/Senders/FluentEmail.Graph/FluentEmail.Graph.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Graph" Version="3.22.0" />
<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.5" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.25.0" />
<PackageReference Include="Microsoft.Graph" Version="5.105.0" />
<PackageReference Include="Azure.Identity" Version="1.21.0" />
</ItemGroup>

<ItemGroup>
Expand Down
33 changes: 14 additions & 19 deletions src/Senders/FluentEmail.Graph/GraphSender.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using FluentEmail.Core;
using Azure.Identity;
using FluentEmail.Core;
using FluentEmail.Core.Interfaces;
using FluentEmail.Core.Models;
using Microsoft.Graph;
using Microsoft.Graph.Auth;
using Microsoft.Identity.Client;
using Microsoft.Graph.Models;
using Microsoft.Graph.Users.Item.SendMail;
using System;
using System.Collections.Generic;
using System.IO;
Expand All @@ -19,9 +20,7 @@ public class GraphSender : ISender
private readonly string _graphSecret;
private bool _saveSent;

private ClientCredentialProvider _authProvider;
private GraphServiceClient _graphClient;
private IConfidentialClientApplication _clientApp;

public GraphSender(
string GraphEmailAppId,
Expand All @@ -34,15 +33,8 @@ public GraphSender(
_graphSecret = GraphEmailSecret;
_saveSent = SaveSentItems;

_clientApp = ConfidentialClientApplicationBuilder
.Create(_appId)
.WithTenantId(_tenantId)
.WithClientSecret(_graphSecret)
.Build();

_authProvider = new ClientCredentialProvider(_clientApp);

_graphClient = new GraphServiceClient(_authProvider);
var credential = new ClientSecretCredential(_tenantId, _appId, _graphSecret);
_graphClient = new GraphServiceClient(credential);
}

public SendResponse Send(IFluentEmail email, CancellationToken? token = null)
Expand Down Expand Up @@ -77,7 +69,7 @@ public async Task<SendResponse> SendAsync(IFluentEmail email, CancellationToken?
email.Data.ToAddresses.ForEach(r => toRecipients.Add(new Recipient
{
EmailAddress = new EmailAddress
{
{
Address = r.EmailAddress.ToString(),
Name = r.Name
}
Expand Down Expand Up @@ -120,7 +112,7 @@ public async Task<SendResponse> SendAsync(IFluentEmail email, CancellationToken?

if(email.Data.Attachments != null && email.Data.Attachments.Count > 0)
{
message.Attachments = new MessageAttachmentsCollectionPage();
message.Attachments = new List<Microsoft.Graph.Models.Attachment>();

email.Data.Attachments.ForEach(a =>
{
Expand Down Expand Up @@ -154,9 +146,12 @@ public async Task<SendResponse> SendAsync(IFluentEmail email, CancellationToken?
try
{
await _graphClient.Users[email.Data.FromAddress.EmailAddress]
.SendMail(message, _saveSent)
.Request()
.PostAsync();
.SendMail
.PostAsync(new SendMailPostRequestBody
{
Message = message,
SaveToSentItems = _saveSent
}, cancellationToken: token ?? CancellationToken.None);

return new SendResponse
{
Expand Down