Change the shape of LicenseKeyValidationResult

Author: yuanqing

packages/monetization/src/gumroad/private/script.js

@@ -1,4 +1,10 @@
 async function main() {
+  const emptyLicense = {
+    email: null,
+    licenseKey: null,
+    purchaseTimestamp: null,
+    validationTimestamp: null
+  }
   async function validateLicenseKeyAsync() {
     try {
       const response = await window.fetch(
@@ -23,7 +29,7 @@ async function main() {
         purchase.disputed === true ||
         purchase.refunded === true
       ) {
-        return { result: 'INVALID' }
+        return { ...emptyLicense, result: 'INVALID' }
       }
       return {
         email: purchase.email,
@@ -33,7 +39,7 @@ async function main() {
         validationTimestamp: '__validationTimestamp__'
       }
     } catch {
-      return { result: 'ENDPOINT_DOWN' }
+      return { ...emptyLicense, result: 'ENDPOINT_DOWN' }
     }
   }
   window.parent.postMessage(

packages/monetization/src/gumroad/validate-gumroad-license-key-main-async.ts

@@ -1,5 +1,12 @@
 import { LicenseKeyValidationResult } from '../utilities/types.js'
 
+const emptyLicense = {
+  email: null,
+  licenseKey: null,
+  purchaseTimestamp: null,
+  validationTimestamp: null
+}
+
 export async function validateGumroadLicenseKeyMainAsync(options: {
   incrementUsesCount: boolean
   licenseKey: string
@@ -8,10 +15,10 @@ export async function validateGumroadLicenseKeyMainAsync(options: {
   const { incrementUsesCount, licenseKey, productPermalink } = options
   const trimmedLicenseKey = licenseKey.trim()
   if (trimmedLicenseKey === '') {
-    return { result: 'EMPTY' }
+    return { ...emptyLicense, result: 'INVALID_EMPTY' }
   }
   if (trimmedLicenseKey.length !== 35) {
-    return { result: 'INVALID' }
+    return { ...emptyLicense, result: 'INVALID' }
   }
   const onmessage = figma.ui.onmessage // Keep a reference to the previous `figma.ui.onmessage`
   return new Promise(function (
@@ -24,7 +31,7 @@ export async function validateGumroadLicenseKeyMainAsync(options: {
     }
     const validationTimestamp = new Date().toISOString()
     // The script below is inserted via `scripts/interpolate-gumroad-script.ts`
-    const __html__ = `<script>async function main(){async function n(){try{const t=await(await window.fetch("https://api.gumroad.com/v2/licenses/verify",{body:"increment_uses_count=${incrementUsesCount}&license_key="+encodeURIComponent("${trimmedLicenseKey}")+"&product_permalink="+encodeURIComponent("${productPermalink}"),headers:{"Content-Type":"application/x-www-form-urlencoded;charset=UTF-8"},method:"POST"})).json(),{purchase:e,success:s}=t;return s===!1||e.chargebacked===!0||e.disputed===!0||e.refunded===!0?{result:"INVALID"}:{email:e.email,licenseKey:"${trimmedLicenseKey}",purchaseTimestamp:e.sale_timestamp,result:"VALID",validationTimestamp:"${validationTimestamp}"}}catch{return{result:"ENDPOINT_DOWN"}}}window.parent.postMessage({pluginMessage:await n()},"*")}main();</script>`
+    const __html__ = `<script>async function main(){const n={email:null,licenseKey:null,purchaseTimestamp:null,validationTimestamp:null};async function t(){try{const s=await(await window.fetch("https://api.gumroad.com/v2/licenses/verify",{body:"increment_uses_count=${incrementUsesCount}&license_key="+encodeURIComponent("${trimmedLicenseKey}")+"&product_permalink="+encodeURIComponent("${productPermalink}"),headers:{"Content-Type":"application/x-www-form-urlencoded;charset=UTF-8"},method:"POST"})).json(),{purchase:e,success:a}=s;return a===!1||e.chargebacked===!0||e.disputed===!0||e.refunded===!0?{...n,result:"INVALID"}:{email:e.email,licenseKey:"${trimmedLicenseKey}",purchaseTimestamp:e.sale_timestamp,result:"VALID",validationTimestamp:"${validationTimestamp}"}}catch{return{...n,result:"ENDPOINT_DOWN"}}}window.parent.postMessage({pluginMessage:await t()},"*")}main();</script>`
     figma.showUI(__html__, { visible: false })
   })
 }

packages/monetization/src/gumroad/validate-gumroad-license-key-ui-async.ts

@@ -1,5 +1,12 @@
 import { LicenseKeyValidationResult } from '../utilities/types.js'
 
+const emptyLicense = {
+  email: null,
+  licenseKey: null,
+  purchaseTimestamp: null,
+  validationTimestamp: null
+}
+
 export async function validateGumroadLicenseKeyUiAsync(options: {
   incrementUsesCount: boolean
   licenseKey: string
@@ -8,10 +15,10 @@ export async function validateGumroadLicenseKeyUiAsync(options: {
   const { incrementUsesCount, licenseKey, productPermalink } = options
   const trimmedLicenseKey = licenseKey.trim()
   if (trimmedLicenseKey === '') {
-    return { result: 'EMPTY' }
+    return { ...emptyLicense, result: 'INVALID_EMPTY' }
   }
   if (trimmedLicenseKey.length !== 35) {
-    return { result: 'INVALID' }
+    return { ...emptyLicense, result: 'INVALID' }
   }
   try {
     const response = await window.fetch(
@@ -38,7 +45,7 @@ export async function validateGumroadLicenseKeyUiAsync(options: {
       purchase.disputed === true ||
       purchase.refunded === true
     ) {
-      return { result: 'INVALID' }
+      return { ...emptyLicense, result: 'INVALID' }
     }
     return {
       email: purchase.email,
@@ -48,6 +55,6 @@ export async function validateGumroadLicenseKeyUiAsync(options: {
       validationTimestamp: new Date().toISOString()
     }
   } catch {
-    return { result: 'ENDPOINT_DOWN' }
+    return { ...emptyLicense, result: 'ENDPOINT_DOWN' }
   }
 }

packages/monetization/src/utilities/types.ts

@@ -1,6 +1,10 @@
 export type LicenseKeyValidationResult =
   | {
-      result: 'EMPTY' | 'ENDPOINT_DOWN' | 'INVALID'
+      result: 'ENDPOINT_DOWN' | 'INVALID' | 'INVALID_EMPTY'
+      email: null
+      licenseKey: null
+      purchaseTimestamp: null
+      validationTimestamp: null
     }
   | {
       result: 'VALID'