From 112dffbd1eca9307d8a233bd01812a0517d9518e Mon Sep 17 00:00:00 2001
From: Eric <eashaw@sailsjs.com>
Date: Wed, 11 Jan 2023 11:11:43 -0600
Subject: [PATCH] Website: Update license key generator action and helper
 inputs (#9265)

Changes:
- Updated the `expiresAt` input description in
`api/controllers/admin/generate-license-key.js` and
`api/helpers/create-license-key.js`
- Updated timestamps sent to `generate-license-key` and
`create-license-key` to be in seconds.

 . .

Co-authored-by: Mike McNeil <mikermcneil@users.noreply.github.com>
---
 website/api/controllers/admin/generate-license-key.js |  2 +-
 website/api/helpers/create-license-key.js             | 11 ++++++-----
 .../assets/js/pages/admin/generate-license.page.js    |  5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/website/api/controllers/admin/generate-license-key.js b/website/api/controllers/admin/generate-license-key.js
index e199d5c5f8..f330639845 100644
--- a/website/api/controllers/admin/generate-license-key.js
+++ b/website/api/controllers/admin/generate-license-key.js
@@ -21,7 +21,7 @@ module.exports = {
     expiresAt: {
       type: 'number',
       required: true,
-      description: 'A JS timestamp representing when this license will expire.'
+      description: 'A JS timestamp representing when this license will expire.',
     }
   },
 
diff --git a/website/api/helpers/create-license-key.js b/website/api/helpers/create-license-key.js
index 1a0f1667dd..a4970c87d3 100644
--- a/website/api/helpers/create-license-key.js
+++ b/website/api/helpers/create-license-key.js
@@ -22,7 +22,7 @@ module.exports = {
     expiresAt: {
       type: 'number',
       required: true,
-      description: 'A JS Timestamp representing when this license will expire.'
+      description: 'A JS timestamp representing when this license will expire.'
     }
 
   },
@@ -37,16 +37,17 @@ module.exports = {
   },
 
 
-  fn: async function (inputs) {
+  fn: async function ({numberOfHosts, organization, expiresAt}) {
 
     let jwt = require('jsonwebtoken');
 
+    let expirationTimestampInSeconds = (expiresAt / 1000);
     let token = jwt.sign(
       {
         iss: 'Fleet Device Management Inc.',
-        exp: inputs.expiresAt,
-        sub: inputs.organization,
-        devices: inputs.numberOfHosts,
+        exp: expirationTimestampInSeconds,
+        sub: organization,
+        devices: numberOfHosts,
         note: 'Created with Fleet License key dispenser',
         tier: 'premium',
       },
diff --git a/website/assets/js/pages/admin/generate-license.page.js b/website/assets/js/pages/admin/generate-license.page.js
index f0932c7c5b..b7f2409561 100644
--- a/website/assets/js/pages/admin/generate-license.page.js
+++ b/website/assets/js/pages/admin/generate-license.page.js
@@ -41,11 +41,12 @@ parasails.registerPage('generate-license', {
   methods: {
     handleSubmittingForm: async function() {
       let validToDate = new Date(this.formData.expiresAt);
-      let validToTimestamp = validToDate.getTime();
+      let licenseExpiresAt = validToDate.getTime();
+
       this.generatedLicenseKey = await Cloud.generateLicenseKey.with({
         numberOfHosts: this.formData.numberOfHosts,
         organization: this.formData.organization,
-        expiresAt: validToTimestamp
+        expiresAt: licenseExpiresAt
       });
     },