.

buildalon · Aug 15, 2024 · 151d462 · 151d462
1 parent 9304379
commit 151d462
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -28627,8 +28627,8 @@ async function Activate() {
                 await licenseClient.ActivateLicenseWithConfig(servicesConfig);
             }
             else {
-                const username = core.getInput('username', { required: true });
-                const password = core.getInput('password', { required: true });
+                const username = core.getInput('username', { required: true }).trim();
+                const password = core.getInput('password', { required: true }).trim();
                 const serial = core.getInput('serial', { required: license.toLowerCase().startsWith('pro') });
                 await licenseClient.ActivateLicense(username, password, serial);
             }
@@ -28858,6 +28858,7 @@ async function ShowEntitlements() {
 async function ActivateLicense(username, password, serial) {
     const args = [`--activate-ulf`, `--username`, username, `--password`, password];
     if (serial !== undefined && serial.length > 0) {
+        serial = serial.trim();
         args.push(`--serial`, serial);
         const maskedSerial = serial.slice(0, -4) + `XXXX`;
         core.setSecret(maskedSerial);

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/activate.ts b/src/activate.ts
@@ -27,8 +27,8 @@ async function Activate(): Promise<void> {
                 const servicesConfig = core.getInput('services-config', { required: true });
                 await licenseClient.ActivateLicenseWithConfig(servicesConfig);
             } else {
-                const username = core.getInput('username', { required: true });
-                const password = core.getInput('password', { required: true });
+                const username = core.getInput('username', { required: true }).trim();
+                const password = core.getInput('password', { required: true }).trim();
                 const serial = core.getInput('serial', { required: license.toLowerCase().startsWith('pro') });
                 await licenseClient.ActivateLicense(username, password, serial);
             }

diff --git a/src/licensing-client.ts b/src/licensing-client.ts
@@ -154,6 +154,7 @@ async function ShowEntitlements(): Promise<string[]> {
 async function ActivateLicense(username: string, password: string, serial: string): Promise<void> {
     const args = [`--activate-ulf`, `--username`, username, `--password`, password];
     if (serial !== undefined && serial.length > 0) {
+        serial = serial.trim();
         args.push(`--serial`, serial);
         const maskedSerial = serial.slice(0, -4) + `XXXX`;
         core.setSecret(maskedSerial);