gsadmin/sencho
1
0
Fork 0
mirror of https://github.com/Studio-Saelix/sencho.git synced 2026-08-06 08:58:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(licensing): resolve variant from product_name when variant_name lacks tier info (#382)

Browse Source 
Lemon Squeezy variant names describe billing periods ("Lifetime",
"Monthly", "Annual") without containing the tier name. resolveVariantType
now checks both variant_name and product_name (e.g. "Sencho Admiral") to
correctly identify the tier. Fixes Admiral licenses being misidentified
as Skipper when the LS variant name is just "Lifetime".
This commit is contained in:
Anso
2026-04-05 19:56:59 -04:00
committed by GitHub
parent ebb696e382
commit b08f698e8f
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/__tests__/license-service.test.ts
+20
View File
@@ -94,6 +94,26 @@ describe('LicenseService.getVariant()', () => {
setLicenseState({ license_status: 'active', license_variant_name: 'Unknown Variant' });
expect(svc.getVariant()).toBe('skipper');
});
it('resolves from product_name when variant_name has no tier info (Admiral)', () => {
setLicenseState({
license_status: 'active',
license_variant_name: 'Lifetime',
license_product_name: 'Sencho Admiral',
});
expect(svc.getVariant()).toBe('admiral');
expect(DatabaseService.getInstance().getSystemState('license_variant_type')).toBe('admiral');
});
it('resolves from product_name when variant_name has no tier info (Skipper)', () => {
setLicenseState({
license_status: 'active',
license_variant_name: 'Monthly',
license_product_name: 'Sencho Skipper',
});
expect(svc.getVariant()).toBe('skipper');
expect(DatabaseService.getInstance().getSystemState('license_variant_type')).toBe('skipper');
});
});
describe('LicenseService.getTier()', () => {
backend/src/services/LicenseService.ts
+13 -10
View File
@@ -194,21 +194,23 @@ export class LicenseService {
}
/**
* Resolve a Lemon Squeezy variant name string to the internal variant type.
* Handles legacy names ("Team", "Personal") and current names ("Admiral", "Skipper").
* Resolve Lemon Squeezy metadata to the internal variant type.
* Checks both variant_name and product_name since LS variant names may only
* describe the billing period (e.g. "Lifetime", "Monthly") while the product
* name contains the tier (e.g. "Sencho Admiral").
*/
private resolveVariantType(variantName: string): 'skipper' | 'admiral' {
const lower = variantName.toLowerCase();
if (lower.includes('team') || lower.includes('admiral')) return 'admiral';
if (lower.includes('personal') || lower.includes('skipper')) return 'skipper';
private resolveVariantType(variantName: string, productName?: string): 'skipper' | 'admiral' {
const combined = `${variantName} ${productName || ''}`.toLowerCase();
if (combined.includes('team') || combined.includes('admiral')) return 'admiral';
if (combined.includes('personal') || combined.includes('skipper')) return 'skipper';
return 'skipper';
}
/** Persist variant metadata from Lemon Squeezy response to DB. */
private storeVariantMeta(db: DatabaseService, meta: { variant_name?: string; variant_id?: number }): void {
private storeVariantMeta(db: DatabaseService, meta: { variant_name?: string; variant_id?: number; product_name?: string }): void {
if (meta.variant_name) {
db.setSystemState('license_variant_name', meta.variant_name);
db.setSystemState('license_variant_type', this.resolveVariantType(meta.variant_name));
db.setSystemState('license_variant_type', this.resolveVariantType(meta.variant_name, meta.product_name));
}
if (meta.variant_id) {
db.setSystemState('license_variant_id', String(meta.variant_id));
@@ -231,10 +233,11 @@ export class LicenseService {
const storedType = db.getSystemState('license_variant_type');
if (isLicenseVariant(storedType)) return storedType;
// Backward compat: resolve from variant name for pre-existing installs
// Backward compat: resolve from variant/product name for pre-existing installs
const variantName = db.getSystemState('license_variant_name');
if (!variantName) return null;
const resolved = this.resolveVariantType(variantName);
const productName = db.getSystemState('license_product_name') || undefined;
const resolved = this.resolveVariantType(variantName, productName);
db.setSystemState('license_variant_type', resolved);
return resolved;
}