URL Parsing fixes and Support for host:port format (#30)

* Add support for host:port format

* Update Task versions and packaging logging fix

* URL parsing fixes

Author: saikrishnav

Tasks/emailReportTask/EmailSender.ts

@@ -5,16 +5,34 @@ import { Report } from "./model/Report";
 import { MailError } from "./exceptions/MailError";
 import { isNullOrUndefined } from "util";
 const nodemailer = require("nodemailer");
+const url = require("url");
 
 export class EmailSender implements IReportSender {
   public async sendReportAsync(report: Report, htmlReportMessage: string, mailConfiguration: MailConfiguration): Promise<boolean> {
     const mailAddressViewModel = new MailAddressViewModel(report, mailConfiguration);
 
+    let smtpUrlProvided = mailConfiguration.$smtpConfig.$smtpHost;
+    console.log(`Using SmtpHost URL: ${smtpUrlProvided}`);
+    smtpUrlProvided = smtpUrlProvided.includes("://") ? smtpUrlProvided : "smtp://" + smtpUrlProvided;
+    console.log(`Parsed Url: ${smtpUrlProvided}`);
+    let smtpUrl = url.parse(smtpUrlProvided, true);
+
+    console.log(`Host: ${smtpUrl.host}`);
+    console.log(`HostName: ${smtpUrl.hostname}`);
+    console.log(`Port: ${smtpUrl.port}`);
+    console.log(`Protocol: ${smtpUrl.protocol}`);
+
+    const smtpHost = smtpUrl.hostname;
+    let smtpPort = smtpUrl.port;
+    smtpPort = isNullOrUndefined(smtpUrl.port) ? 587 : smtpUrl.port;
+
+    console.log(`Using HostName: ${smtpHost} and port: ${smtpPort}`);
+
     let transporter: any;
-    if(mailConfiguration.$smtpConfig.$enableTLS) {
+    if(mailConfiguration.$smtpConfig.$enableTLS) {      
       transporter = nodemailer.createTransport({
-        host: mailConfiguration.$smtpConfig.$smtpHost,
-        port: 587,
+        host: smtpHost,
+        port: smtpPort,
         tls: {
           maxVersion: 'TLSv1.2',
           minVersion: 'TLSv1.2',
@@ -29,8 +47,8 @@ export class EmailSender implements IReportSender {
     }
     else {
       transporter = nodemailer.createTransport({
-        host: mailConfiguration.$smtpConfig.$smtpHost,
-        port: 587,
+        host: smtpHost,
+        port: smtpPort,
         auth: {
           user: mailConfiguration.$smtpConfig.$userName,
           pass: mailConfiguration.$smtpConfig.$password

Tasks/emailReportTask/task.dev.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 2,
-    "Patch": 200
+    "Patch": 202
   },
   "groups": [
     {

Tasks/emailReportTask/task.prod.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 1,
-    "Patch": 2
+    "Patch": 5
   },
   "groups": [
     {

Tasks/emailReportTask/tests/__e_to_e_tests__/InvokeTest.ts

@@ -57,14 +57,14 @@ export class ReportCreatorWrapper implements IHTMLReportCreator {
 export class MockConfigProvider implements IConfigurationProvider {
 
   getPipelineConfiguration(): PipelineConfiguration {
-    return new PipelineConfiguration(PipelineType.Release, 13942411, "AzureDevOps", "AzureDevOps", 160977787, 9462, false, "https://dev.azure.com/{account}/", accessKey);
+    return new PipelineConfiguration(PipelineType.Release, 13942411, "ProjectId", "ProjectName", 160977787, 9462, false, "https://dev.azure.com/{account}/", accessKey);
   }
 
   getMailConfiguration(): MailConfiguration {
     return new MailConfiguration("[{environmentStatus}] {passPercentage} tests passed",
-      new RecipientsConfiguration("xyz@test.com", false, false, false, false),
+      new RecipientsConfiguration("xyz@email.com", false, false, false, false),
       new RecipientsConfiguration("", false, false, false, false),
-      new SmtpConfiguration(smtpUser, smtpPassword, "smtp.live.com", true), "test.m");
+      new SmtpConfiguration(smtpUser, smtpPassword, "smtp.live.com", true), "test.com");
   }
 
   getReportDataConfiguration(): ReportDataConfiguration {

Tasks/emailReportTask/vss-extension.json

@@ -2,7 +2,7 @@
   "manifestVersion": 1,
   "id": "EmailReportExtension",
   "name": "Email Report Extension",
-  "version": "1.1.0",
+  "version": "1.1.5",
   "publisher": "epsteam",
   "targets": [
     {

commands/package.js

@@ -25,7 +25,7 @@ exec(npmInstallCommand, function (error) {
     console.log(`NPM Install Error: ${error}`);
   } else {
     console.log("NPM Install Done");
-    
+
     var imagesDir = path.resolve(common.TaskSrcDir, "images");
     if (fs.existsSync(imagesDir)) {
       var files = fs.readdirSync(imagesDir);
@@ -37,7 +37,7 @@ exec(npmInstallCommand, function (error) {
         }
       });
 
-      if(fs.existsSync(path.resolve(imagesDir, "icon.png"))) {
+      if (fs.existsSync(path.resolve(imagesDir, "icon.png"))) {
         common.CopyFile(imagesDir, "icon.png", `${common.TaskOutDir}`);
       }
     }
@@ -52,10 +52,12 @@ exec(npmInstallCommand, function (error) {
           console.log(`Package create error: ${error}`);
         } else {
           console.log("Package created. Upload the VSIX to Visual Studio Marketplace if you wish to publish the extension.");
-          console.log(`If you want to upload to AzureDevOps account directly, then Navigate to ${common.TaskOutDir} and run the tfx upload command on the desired azure devops account to upload task directly. Command: 'tfx login && tfx build tasks upload --task-path .'`);
-          process.chdir(cwd);      
+          console.log(`If you want to upload to an AzureDevOps account directly, then Navigate to: \r\n${common.TaskOutDir}\r\n and run the following command: \r\n'tfx login && tfx build tasks upload --task-path .'\r\n`);
+          process.chdir(cwd);
         }
       });
+    } else {
+      console.log(`\r\nIf you want to upload to an AzureDevOps account directly, then Navigate to: \r\n${common.TaskOutDir}\r\n and run the following command: \r\n'tfx login && tfx build tasks upload --task-path .'\r\n`);
     }
   }
 });