mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-25 04:34:06 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Prevent invocations of 'GET /rest/license' from returning an error when ephemeral licenses are used (#6154)

Browse source 
* fix: Prevent error when invoking  with an ephemeral license

* add tests
This commit is contained in:
Cornelius Suermann 2023-05-03 10:43:13 +02:00 committed by GitHub
parent 8862e1e7df
commit a3d26eff79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/cli/src/License.ts
View file

@ -168,8 +168,7 @@ export class License {
} }
return entitlements.find( return entitlements.find(
(entitlement) => (entitlement) => (entitlement.productMetadata?.terms as { isMainPlan?: boolean })?.isMainPlan,
(entitlement.productMetadata.terms as unknown as { isMainPlan: boolean }).isMainPlan,
); );
} }

43
packages/cli/test/unit/License.test.ts
View file

@ -10,7 +10,7 @@ const MOCK_RENEW_OFFSET = 259200;
const MOCK_INSTANCE_ID = 'instance-id'; const MOCK_INSTANCE_ID = 'instance-id';
const MOCK_ACTIVATION_KEY = 'activation-key'; const MOCK_ACTIVATION_KEY = 'activation-key';
const MOCK_FEATURE_FLAG = 'feat:mock'; const MOCK_FEATURE_FLAG = 'feat:mock';
const MOCK_MAIN_PLAN_ID = 1234; const MOCK_MAIN_PLAN_ID = '1b765dc4-d39d-4ffe-9885-c56dd67c4b26';
describe('License', () => { describe('License', () => {
beforeAll(() => { beforeAll(() => {
@ -82,12 +82,21 @@ describe('License', () => {
expect(LicenseManager.prototype.getManagementJwt).toHaveBeenCalled(); expect(LicenseManager.prototype.getManagementJwt).toHaveBeenCalled();
}); });
test('check main plan', async () => { test('getMainPlan() returns the right entitlement', async () => {
// mock entitlements response // mock entitlements response
License.prototype.getCurrentEntitlements = jest.fn().mockReturnValue([ License.prototype.getCurrentEntitlements = jest.fn().mockReturnValue([
{
id: '84a9c852-1349-478d-9ad1-b3f55510e477',
productId: '670650f2-72d8-4397-898c-c249906e2cc2',
productMetadata: {},
features: {},
featureOverrides: {},
validFrom: new Date(),
validTo: new Date(),
},
{ {
id: MOCK_MAIN_PLAN_ID, id: MOCK_MAIN_PLAN_ID,
productId: '', productId: '670650f2-72d8-4397-898c-c249906e2cc2',
productMetadata: { productMetadata: {
terms: { terms: {
isMainPlan: true, isMainPlan: true,
@ -104,4 +113,32 @@ describe('License', () => {
const mainPlan = license.getMainPlan(); const mainPlan = license.getMainPlan();
expect(mainPlan?.id).toBe(MOCK_MAIN_PLAN_ID); expect(mainPlan?.id).toBe(MOCK_MAIN_PLAN_ID);
}); });
test('getMainPlan() returns undefined if there is no main plan', async () => {
// mock entitlements response
License.prototype.getCurrentEntitlements = jest.fn().mockReturnValue([
{
id: '84a9c852-1349-478d-9ad1-b3f55510e477',
productId: '670650f2-72d8-4397-898c-c249906e2cc2',
productMetadata: {}, // has no `productMetadata.terms.isMainPlan`!
features: {},
featureOverrides: {},
validFrom: new Date(),
validTo: new Date(),
},
{
id: 'c1aae471-c24e-4874-ad88-b97107de486c',
productId: '670650f2-72d8-4397-898c-c249906e2cc2',
productMetadata: {}, // has no `productMetadata.terms.isMainPlan`!
features: {},
featureOverrides: {},
validFrom: new Date(),
validTo: new Date(),
},
]);
jest.fn(license.getMainPlan).mockReset();
const mainPlan = license.getMainPlan();
expect(mainPlan).toBeUndefined();
});
}); });