open-source-mirrors
/
Ombi
mirror of https://github.com/Ombi-app/Ombi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Using Mailkit to fix #204

Browse Source
pull/226/head
tidusjar 9 years ago
parent 86fa887bce
commit 4fd3db1ae5
3 changed files with 52 additions and 40 deletions
Show Stats Download Patch File Download Diff File

64
PlexRequests.Services/Notification/EmailMessageNotification.cs
Unescape View File

@ -28,12 +28,13 @@ using System;
using System.Net;
using System.Net.Mail;
using System.Threading.Tasks;
using MimeKit;
using NLog;
using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.Services.Interfaces;
using SmtpClient = MailKit.Net.Smtp.SmtpClient;
namespace PlexRequests.Services.Notification
{
@ -111,28 +112,28 @@ namespace PlexRequests.Services.Notification
private async Task EmailNewRequest(NotificationModel model, EmailNotificationSettings settings)
{
var message = new MailMessage
var message = new MimeMessage
{
IsBodyHtml = true,
To = { new MailAddress(settings.RecipientEmail) },
Body = $"Hello! The user '{model.User}' has requested {model.Title}! Please log in to approve this request. Request Date: {model.DateTime.ToString("f")}",
From = new MailAddress(settings.EmailSender),
Body = new TextPart("plain") { Text = $"Hello! The user '{model.User}' has requested {model.Title}! Please log in to approve this request. Request Date: {model.DateTime.ToString("f")}" },
Subject = $"Plex Requests: New request for {model.Title}!"
};
message.From.Add(new MailboxAddress(settings.EmailSender, settings.EmailSender));
message.To.Add(new MailboxAddress(settings.RecipientEmail, settings.RecipientEmail));
await Send(message, settings);
}
private async Task EmailIssue(NotificationModel model, EmailNotificationSettings settings)
{
var message = new MailMessage
var message = new MimeMessage
{
IsBodyHtml = true,
To = { new MailAddress(settings.RecipientEmail) },
Body = $"Hello! The user '{model.User}' has reported a new issue {model.Body} for the title {model.Title}!",
From = new MailAddress(settings.EmailSender),
Body = new TextPart("plain") { Text = $"Hello! The user '{model.User}' has reported a new issue {model.Body} for the title {model.Title}!" },
Subject = $"Plex Requests: New issue for {model.Title}!"
};
message.From.Add(new MailboxAddress(settings.EmailSender, settings.EmailSender));
message.To.Add(new MailboxAddress(settings.RecipientEmail, settings.RecipientEmail));
await Send(message, settings);
}
@ -144,33 +145,35 @@ namespace PlexRequests.Services.Notification
await Task.FromResult(false);
}
var message = new MailMessage
var message = new MimeMessage
{
IsBodyHtml = true,
To = { new MailAddress(model.UserEmail) },
Body = $"Hello! You requested {model.Title} on PlexRequests! This is now available on Plex! :)",
From = new MailAddress(settings.EmailSender),
Body = new TextPart("plain") { Text = $"Hello! You requested {model.Title} on PlexRequests! This is now available on Plex! :)" },
Subject = $"Plex Requests: {model.Title} is now available!"
};
message.From.Add(new MailboxAddress(settings.EmailSender, settings.EmailSender));
message.To.Add(new MailboxAddress(model.UserEmail, model.UserEmail));
await Send(message, settings);
}
private async Task Send(MailMessage message, EmailNotificationSettings settings)
private async Task Send(MimeMessage message, EmailNotificationSettings settings)
{
try
{
using (var smtp = new SmtpClient(settings.EmailHost, settings.EmailPort))
using (var client = new SmtpClient())
{
smtp.Credentials = new NetworkCredential(settings.EmailUsername, settings.EmailPassword);
smtp.EnableSsl = settings.Ssl;
await smtp.SendMailAsync(message).ConfigureAwait(false);
client.Connect(settings.EmailHost, settings.EmailPort, settings.Ssl);
// Note: since we don't have an OAuth2 token, disable
// the XOAUTH2 authentication mechanism.
client.AuthenticationMechanisms.Remove("XOAUTH2");
client.Authenticate(settings.EmailUsername, settings.EmailPassword);
await client.SendAsync(message);
await client.DisconnectAsync(true);
}
}
catch (SmtpException smtp)
{
Log.Error(smtp);
}
catch (Exception e)
{
Log.Error(e);
@ -179,14 +182,13 @@ namespace PlexRequests.Services.Notification
private async Task EmailTest(NotificationModel model, EmailNotificationSettings settings)
{
var message = new MailMessage
var message = new MimeMessage
{
IsBodyHtml = true,
To = { new MailAddress(settings.RecipientEmail) },
Body = "This is just a test! Success!",
From = new MailAddress(settings.EmailSender),
Subject = "Plex Requests: Test Message!"
Body = new TextPart("plain") {Text= "This is just a test! Success!"},
Subject = "Plex Requests: Test Message!",
};
message.From.Add(new MailboxAddress(settings.EmailSender, settings.EmailSender));
message.To.Add(new MailboxAddress(settings.RecipientEmail, settings.RecipientEmail));
await Send(message, settings);
}

26
PlexRequests.UI/Modules/BaseAuthModule.cs
Unescape View File

@ -56,12 +56,22 @@ namespace PlexRequests.UI.Modules
}
}
protected bool IsAdmin { get {
var claims = Context.CurrentUser.Claims.ToList();
if(claims.Contains(UserClaims.Admin) || claims.Contains(UserClaims.PowerUser)){
return true;}
return false;
} }
protected bool IsAdmin
{
get
{
if (Context.CurrentUser == null)
{
return false;
}
var claims = Context.CurrentUser.Claims.ToList();
if (claims.Contains(UserClaims.Admin) || claims.Contains(UserClaims.PowerUser))
{
return true;
}
return false;
}
}
protected int DateTimeOffset
{
@ -96,8 +106,8 @@ namespace PlexRequests.UI.Modules
var redirectPath = string.IsNullOrEmpty(baseUrl) ? "~/userlogin" : $"~/{baseUrl}/userlogin";
return Session[SessionKeys.UsernameKey] == null
? Context.GetRedirect(redirectPath)
return Session[SessionKeys.UsernameKey] == null
? Context.GetRedirect(redirectPath)
: null;
}
}

2
PlexRequests.UI/Views/Admin/Authentication.cshtml
Unescape View File

@ -164,7 +164,7 @@
return;
}
if (response.users.length > 1) {
$(response).each(function () {
$(response.users).each(function () {
$('#users').append("<option>" + this + "</option>");
});
} else {

Write Preview
Loading…
Cancel
Save