Merge pull request #2987: Update http to https for particular.net urls

Author: helenktsai

src/Frontend/src/components/LicenseNotifications.vue

@@ -44,7 +44,7 @@ function displayWarningMessage(licenseStatus: LicenseStatus) {
     case LicenseStatus.InvalidDueToExpiredTrial:
     case LicenseStatus.InvalidDueToExpiredSubscription:
     case LicenseStatus.InvalidDueToExpiredUpgradeProtection:
-      useShowToast(TYPE.ERROR, "Error", 'Your license has expired. Please contact Particular Software support at: <a href="http://particular.net/support">http://particular.net/support</a>', true);
+      useShowToast(TYPE.ERROR, "Error", 'Your license has expired. Please contact Particular Software support at: <a href="https://particular.net/support">https://particular.net/support</a>', true);
       break;
   }
 }

src/Frontend/test/specs/licensing/license-enforcement.spec.ts

@@ -64,7 +64,7 @@ describe("FEATURE: EXPIRED license detection", () => {
       const notification = (await getAlertNotifications()).find((n) => n.textMatches(/your license has expired\. please contact particular software support at:/i));
 
       expect(notification).not.toBeUndefined();
-      expect(notification?.hasLink({ caption: "http://particular.net/support", address: "http://particular.net/support" })).toBeTruthy();
+      expect(notification?.hasLink({ caption: "https://particular.net/support", address: "https://particular.net/support" })).toBeTruthy();
     });
 
     test("EXAMPLE: Expired platform subscription", async ({ driver }) => {
@@ -83,7 +83,7 @@ describe("FEATURE: EXPIRED license detection", () => {
       const notification = (await getAlertNotifications()).find((n) => n.textMatches(/your license has expired\. please contact particular software support at:/i));
 
       expect(notification).not.toBeUndefined();
-      expect(notification?.hasLink({ caption: "http://particular.net/support", address: "http://particular.net/support" })).toBeTruthy();
+      expect(notification?.hasLink({ caption: "https://particular.net/support", address: "https://particular.net/support" })).toBeTruthy();
     });
 
     test("EXAMPLE: Expired upgrade protection", async ({ driver }) => {
@@ -101,7 +101,7 @@ describe("FEATURE: EXPIRED license detection", () => {
       const notification = (await getAlertNotifications()).find((n) => n.textMatches(/your license has expired\. please contact particular software support at:/i));
 
       expect(notification).not.toBeUndefined();
-      expect(notification?.hasLink({ caption: "http://particular.net/support", address: "http://particular.net/support" })).toBeTruthy();
+      expect(notification?.hasLink({ caption: "https://particular.net/support", address: "https://particular.net/support" })).toBeTruthy();
     });
   });
 });

src/ServicePulse.Host.Tests/Owin/UrlHelperTests.cs

@@ -23,9 +23,9 @@ public void Should_replace_localhost_case_insensitive()
         [Test]
         public void Should_not_replace_other_names()
         {
-            var url = UrlHelper.RewriteLocalhostUrl("http://particular.net:8081/");
-            Assert.That(url, Is.EqualTo("http://particular.net:8081/"));
+            var url = UrlHelper.RewriteLocalhostUrl("http://customdomain.net:8081/");
+            Assert.That(url, Is.EqualTo("http://customdomain.net:8081/"));
         }
     }
 
-}
+}

src/Setup/ServicePulse.aip

@@ -14,13 +14,13 @@
     <ROW Property="AI_UNINSTALLER" Value="msiexec.exe"/>
     <ROW Property="ALLUSERS" Value="1"/>
     <ROW Property="ARPCOMMENTS" Value="Particular Software ServicePulse version [|ProductVersion] for NServiceBus" ValueLocId="*"/>
-    <ROW Property="ARPHELPLINK" Value="http://particular.net/support"/>
+    <ROW Property="ARPHELPLINK" Value="https://particular.net/support"/>
     <ROW Property="ARPNOMODIFY" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPPRODUCTICON" Value="Operations_1.exe" Type="8"/>
     <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
-    <ROW Property="ARPURLINFOABOUT" Value="http://particular.net/ServicePulse"/>
-    <ROW Property="ARPURLUPDATEINFO" Value="http://particular.net/downloads"/>
+    <ROW Property="ARPURLINFOABOUT" Value="https://particular.net/ServicePulse"/>
+    <ROW Property="ARPURLUPDATEINFO" Value="https://particular.net/downloads"/>
     <ROW Property="BannerBitmap" Value="banner" MultiBuildValue="DefaultBuild:banner.jpg" Type="1" MsiKey="BannerBitmap"/>
     <ROW Property="DEFAULT_SC_MONITORING_URI" Value="http://localhost:33633"/>
     <ROW Property="DEFAULT_SC_URI" Value="http://localhost:33333/api"/>

src/Setup/res/License.rtf

@@ -154,7 +154,7 @@ Third-Party Software: }{\rtlch\fcs1 \af0 \ltrch\fcs0 \f0\cf1\kerning36\insrsid12
 Licensee acknowledges that portions of the Software include Third-Party Software (including open source software) that may be subject to the terms and conditions imposed by the licensors of the Third-Party Software ("}{\rtlch\fcs1 \ab\af0 \ltrch\fcs0 
 \b\f0\cf1\kerning36\insrsid12546913\charrsid12546913 Third-Party Terms}{\rtlch\fcs1 \af0 \ltrch\fcs0 \f0\cf1\kerning36\insrsid12546913\charrsid12546913 
 "). In order to comply with the Third Party Terms a list of the Third Party-Software and related Third-Party Terms is available at}{\field\fldedit{\*\fldinst {\rtlch\fcs1 \ab\af0\afs48 \ltrch\fcs0 
-\b\f0\fs48\cf17\kerning36\insrsid12546913\charrsid12546913  HYPERLINK "http://particular.net/ThirdPartyLicenses" }}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 \f0\cf1\kerning36\insrsid12546913\charrsid12546913  }}}\sectd \ltrsect\linex0\sectdefaultcl\sftnbj 
+\b\f0\fs48\cf17\kerning36\insrsid12546913\charrsid12546913  HYPERLINK "https://particular.net/ThirdPartyLicenses" }}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 \f0\cf1\kerning36\insrsid12546913\charrsid12546913  }}}\sectd \ltrsect\linex0\sectdefaultcl\sftnbj 
 {\field\fldedit{\*\fldinst {\rtlch\fcs1 \ab\af0\afs48 \ltrch\fcs0 \b\f0\fs48\cf17\kerning36\insrsid12546913\charrsid12546913  HYPERLINK "https://particular.net/third-party-licenses" }}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 
 \f0\ul\cf18\kerning36\insrsid12546913\charrsid12546913 https://particular.net/third-party-licenses}}}\sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\rtlch\fcs1 \af0 \ltrch\fcs0 \f0\cf1\kerning36\insrsid12546913\charrsid12546913 
 . Licensee agrees (i) that its use of the Third-Party Software is subject to and governed by the Third-Party Terms; and (ii) to comply with all Third-P
@@ -370,4 +370,4 @@ ffffffffffffffffffffffffffffffff52006f006f007400200045006e0074007200790000000000
 db0777f7d501feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000105000000000000}}
+0000000000000000000000000000000000000000000000000105000000000000}}