[email protected] (#6)

- Support loading user/pass from environment variables.
buildalon · Dec 12, 2024 · be07ab3 · be07ab3
1 parent 3c3dd72
commit be07ab3
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 12 deletions.
diff --git a/action.yml b/action.yml
@@ -10,11 +10,11 @@ inputs:
     default: 'Personal'
   username:
     description: 'The email address you use for your Unity Id. Required for `Personal` and `Professional` license activations.'
-    required: true
+    required: false
     default: ''
   password:
     description: 'The password you use for Unity Id access. Required for `Personal` and `Professional` license activations.'
-    required: true
+    required: false
     default: ''
   serial:
     description: 'The Serial number for the seat. Required for Professional license activations.'

diff --git a/dist/index.js b/dist/index.js
@@ -28598,6 +28598,7 @@ exports["default"] = _default;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Activate = Activate;
+const process_1 = __nccwpck_require__(7282);
 const licenseClient = __nccwpck_require__(8447);
 const core = __nccwpck_require__(2186);
 async function Activate() {
@@ -28627,9 +28628,24 @@ async function Activate() {
                 await licenseClient.ActivateLicenseWithConfig(servicesConfig);
             }
             else {
-                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') });
+                const pro = license.toLowerCase().startsWith('pro');
+                let username = core.getInput('username', { required: pro }).trim();
+                let password = core.getInput('password', { required: pro }).trim();
+                const serial = core.getInput('serial', { required: pro });
+                if (!username) {
+                    const encodedUsername = process_1.env['UNITY_USERNAME_BASE64'];
+                    if (!encodedUsername) {
+                        throw Error('Username is required for Unity License Activation!');
+                    }
+                    username = Buffer.from(encodedUsername, 'base64').toString('utf-8');
+                }
+                if (!password) {
+                    const encodedPassword = process_1.env['UNITY_PASSWORD_BASE64'];
+                    if (!encodedPassword) {
+                        throw Error('Password is required for Unity License Activation!');
+                    }
+                    password = Buffer.from(encodedPassword, 'base64').toString('utf-8');
+                }
                 await licenseClient.ActivateLicense(username, password, serial);
             }
             activeLicenses = await licenseClient.ShowEntitlements();
@@ -29091,6 +29107,14 @@ module.exports = require("perf_hooks");
 
 /***/ }),
 
+/***/ 7282:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("process");
+
+/***/ }),
+
 /***/ 3477:
 /***/ ((module) => {
 

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "activate-unity-license",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "A GitHub Action to activate a Unity Game Engine license for CI/CD workflows.",
   "author": "buildalon",
   "license": "MIT",

diff --git a/src/activate.ts b/src/activate.ts
@@ -1,3 +1,4 @@
+import { env } from 'process';
 import licenseClient = require('./licensing-client');
 import core = require('@actions/core');
 
@@ -27,9 +28,29 @@ 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 }).trim();
-                const password = core.getInput('password', { required: true }).trim();
-                const serial = core.getInput('serial', { required: license.toLowerCase().startsWith('pro') });
+                const pro = license.toLowerCase().startsWith('pro');
+                let username = core.getInput('username', { required: pro }).trim();
+                let password = core.getInput('password', { required: pro }).trim();
+                const serial = core.getInput('serial', { required: pro });
+
+                if (!username) {
+                    const encodedUsername = env['UNITY_USERNAME_BASE64'];
+                    if (!encodedUsername) {
+                        throw Error('Username is required for Unity License Activation!');
+                    }
+
+                    username = Buffer.from(encodedUsername, 'base64').toString('utf-8');
+                }
+
+                if (!password) {
+                    const encodedPassword = env['UNITY_PASSWORD_BASE64'];
+                    if (!encodedPassword) {
+                        throw Error('Password is required for Unity License Activation!');
+                    }
+
+                    password = Buffer.from(encodedPassword, 'base64').toString('utf-8');
+                }
+
                 await licenseClient.ActivateLicense(username, password, serial);
             }
             activeLicenses = await licenseClient.ShowEntitlements();