mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(core): Display the last activated plan name when multiple are activated (#12835)
Some checks failed
Test Master / install-and-build (push) Has been cancelled
Details
Test Master / Unit tests (18.x) (push) Has been cancelled
Details
Test Master / Unit tests (20.x) (push) Has been cancelled
Details
Test Master / Unit tests (22.4) (push) Has been cancelled
Details
Test Master / Lint (push) Has been cancelled
Details
Test Master / Notify Slack on failure (push) Has been cancelled
Details

Browse source
This commit is contained in:
Cornelius Suermann 2025-01-25 16:33:40 +01:00 committed by GitHub
parent 6f44004354
commit 03365f096d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
packages/cli/src/__tests__/license.test.ts
View file

@ -16,6 +16,12 @@ const MOCK_ACTIVATION_KEY = 'activation-key';
const MOCK_FEATURE_FLAG = 'feat:sharing';
const MOCK_MAIN_PLAN_ID = '1b765dc4-d39d-4ffe-9885-c56dd67c4b26';
function makeDateWithHourOffset(offsetInHours: number): Date {
const date = new Date();
date.setHours(date.getHours() + offsetInHours);
return date;
}
const licenseConfig: GlobalConfig['license'] = {
serverUrl: MOCK_SERVER_URL,
autoRenewalEnabled: true,
@ -134,7 +140,7 @@ describe('License', () => {
expect(LicenseManager.prototype.getManagementJwt).toHaveBeenCalled();
});
test('getMainPlan() returns the right entitlement', async () => {
test('getMainPlan() returns the latest main entitlement', async () => {
// mock entitlements response
License.prototype.getCurrentEntitlements = jest.fn().mockReturnValue([
{
@ -143,8 +149,21 @@ describe('License', () => {
productMetadata: {},
features: {},
featureOverrides: {},
validFrom: new Date(),
validTo: new Date(),
validFrom: makeDateWithHourOffset(-3),
validTo: makeDateWithHourOffset(1),
},
{
id: '95b9c852-1349-478d-9ad1-b3f55510e488',
productId: '670650f2-72d8-4397-898c-c249906e2cc2',
productMetadata: {
terms: {
isMainPlan: true,
},
},
features: {},
featureOverrides: {},
validFrom: makeDateWithHourOffset(-2),
validTo: makeDateWithHourOffset(1),
},
{
id: MOCK_MAIN_PLAN_ID,
@ -156,8 +175,8 @@ describe('License', () => {
},
features: {},
featureOverrides: {},
validFrom: new Date(),
validTo: new Date(),
validFrom: makeDateWithHourOffset(-1), // this is the LATEST / newest plan
validTo: makeDateWithHourOffset(1),
},
]);
jest.fn(license.getMainPlan).mockReset();
@ -175,8 +194,8 @@ describe('License', () => {
productMetadata: {}, // has no `productMetadata.terms.isMainPlan`!
features: {},
featureOverrides: {},
validFrom: new Date(),
validTo: new Date(),
validFrom: makeDateWithHourOffset(-1),
validTo: makeDateWithHourOffset(1),
},
{
id: 'c1aae471-c24e-4874-ad88-b97107de486c',
@ -184,8 +203,8 @@ describe('License', () => {
productMetadata: {}, // has no `productMetadata.terms.isMainPlan`!
features: {},
featureOverrides: {},
validFrom: new Date(),
validTo: new Date(),
validFrom: makeDateWithHourOffset(-1),
validTo: makeDateWithHourOffset(1),
},
]);
jest.fn(license.getMainPlan).mockReset();

4
packages/cli/src/license.ts
View file

@ -330,7 +330,7 @@ export class License {
}
/**
* Helper function to get the main plan for a license
* Helper function to get the latest main plan for a license
*/
getMainPlan(): TEntitlement | undefined {
if (!this.manager) {
@ -342,6 +342,8 @@ export class License {
return undefined;
}
entitlements.sort((a, b) => b.validFrom.getTime() - a.validFrom.getTime());
return entitlements.find(
(entitlement) => (entitlement.productMetadata?.terms as { isMainPlan?: boolean })?.isMainPlan,
);