Skip to content

Commit 9fcb67f

Browse files
authored
Merge 24dfe56 into 738a75f
2 parents 738a75f + 24dfe56 commit 9fcb67f

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

Rnwood.Smtp4dev/ClientApp/src/ApiClient/MessagesController.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,12 +214,12 @@ export default class MessagesController {
214214
}
215215

216216
// put: api/Messages
217-
public import_url(mailboxName: string): string {
218-
return `${this.apiBaseUrl}?mailboxName=${encodeURIComponent(mailboxName)}`;
217+
public import_url(mailboxName: string, folderName: string = "INBOX"): string {
218+
return `${this.apiBaseUrl}?mailboxName=${encodeURIComponent(mailboxName)}&folderName=${encodeURIComponent(folderName)}`;
219219
}
220220

221-
public async import(emlContent: string, mailboxName: string): Promise<string> {
222-
return (await axios.put(this.import_url(mailboxName), emlContent, {
221+
public async import(emlContent: string, mailboxName: string, folderName: string = "INBOX"): Promise<string> {
222+
return (await axios.put(this.import_url(mailboxName, folderName), emlContent, {
223223
headers: {
224224
'Content-Type': 'message/rfc822'
225225
}

Rnwood.Smtp4dev/ClientApp/src/components/messagelist.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@
396396
const emlContent = await this.readFileAsText(file);
397397
398398
// Call the import API for this single file
399-
const messageId = await new MessagesController().import(emlContent, this.selectedMailbox);
399+
const messageId = await new MessagesController().import(emlContent, this.selectedMailbox, this.selectedFolder);
400400
401401
successCount++;
402402
importedIds.push(messageId);

Rnwood.Smtp4dev/Controllers/MessagesController.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,12 +529,13 @@ public async Task Delete(Guid id)
529529
/// Imports a single EML file as a new message.
530530
/// </summary>
531531
/// <param name="mailboxName">Mailbox name to import the message into</param>
532+
/// <param name="folderName">Folder name to import the message into (e.g. INBOX, Sent). Defaults to INBOX.</param>
532533
/// <returns>The ID of the imported message</returns>
533534
[HttpPut]
534535
[Consumes("message/rfc822")]
535536
[SwaggerResponse(System.Net.HttpStatusCode.OK, typeof(Guid), Description = "ID of the imported message")]
536537
[SwaggerResponse(System.Net.HttpStatusCode.BadRequest, typeof(void), Description = "If the EML content is invalid")]
537-
public async Task<ActionResult<Guid>> ImportMessage(string mailboxName = MailboxOptions.DEFAULTNAME)
538+
public async Task<ActionResult<Guid>> ImportMessage(string mailboxName = MailboxOptions.DEFAULTNAME, string folderName = MailboxFolder.INBOX)
538539
{
539540
try
540541
{
@@ -601,7 +602,7 @@ public async Task<ActionResult<Guid>> ImportMessage(string mailboxName = Mailbox
601602
}
602603

603604
dbMessage.Mailbox = mailbox;
604-
dbMessage.MailboxFolder = await dbContext.MailboxFolders.FirstOrDefaultAsync(f => f.Mailbox.Name == mailboxName && f.Name == MailboxFolder.INBOX);
605+
dbMessage.MailboxFolder = await dbContext.MailboxFolders.FirstOrDefaultAsync(f => f.Mailbox.Name == mailboxName && f.Name == folderName);
605606
dbMessage.IsUnread = true;
606607

607608
// Add to database

0 commit comments

Comments
 (0)