@appsemble/cli 0.29.11 → 0.30.2

package/lib/asset.js

@@ -12,8 +12,10 @@ export async function publishAsset({ appId, clonable, name, path, remote, seed,
         if (name) {
             formData.append('name', normalize(name));
         }
-        const endpoint = `/api/apps/${appId}/${seed ? 'seed-' : ''}assets`;
-        const { data: { id }, } = await axios.post(endpoint, formData, { baseURL: remote });
+        const { data: { id }, } = await axios.post(`/api/apps/${appId}/assets`, formData, {
+            baseURL: remote,
+            params: { seed },
+        });
         logger.info(`Published asset ${id}${name ? ` with name ${normalize(name)}` : ''}`);
     }
     catch (error) {

package/lib/asset.test.js

@@ -1,5 +1,6 @@
 import { resolveFixture } from '@appsemble/node-utils';
-import { createServer, createTestUser, models, setArgv, useTestDatabase } from '@appsemble/server';
+import { createServer, createTestUser, models, setArgv } from '@appsemble/server';
+import { PredefinedOrganizationRole } from '@appsemble/types';
 import { setTestApp } from 'axios-test-instance';
 import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 import { publishAsset } from './asset.js';
@@ -10,59 +11,60 @@ let user;
 let organization;
 let testApp;
 const { App, Asset, Organization, OrganizationMember } = models;
-useTestDatabase(import.meta);
-beforeAll(() => {
-    vi.useFakeTimers();
-    setArgv(argv);
-});
-beforeEach(async () => {
-    vi.clearAllTimers();
-    vi.setSystemTime(0);
-    const server = await createServer();
-    testApp = await setTestApp(server);
-    initAxios({ remote: testApp.defaults.baseURL });
-    user = await createTestUser();
-    organization = await Organization.create({
-        id: 'testorganization',
-        name: 'Test Organization',
-    });
-    await OrganizationMember.create({
-        OrganizationId: organization.id,
-        UserId: user.id,
-        role: 'Owner',
+describe('asset', () => {
+    beforeAll(() => {
+        vi.useFakeTimers();
+        setArgv(argv);
     });
-    await Organization.create({ id: 'appsemble', name: 'Appsemble' });
-});
-afterAll(() => {
-    vi.useRealTimers();
-});
-describe('publishAsset', () => {
-    it('should publish an asset from a file', async () => {
-        const app = await App.create({
-            path: 'test-app',
-            definition: { name: 'Test App', defaultPage: 'Test Page' },
-            vapidPublicKey: 'a',
-            vapidPrivateKey: 'b',
-            visibility: 'public',
-            OrganizationId: organization.id,
+    beforeEach(async () => {
+        vi.clearAllTimers();
+        vi.setSystemTime(0);
+        const server = await createServer();
+        testApp = await setTestApp(server);
+        initAxios({ remote: testApp.defaults.baseURL });
+        user = await createTestUser();
+        organization = await Organization.create({
+            id: 'testorganization',
+            name: 'Test Organization',
         });
-        await authorizeCLI('assets:write', testApp);
-        await publishAsset({
-            appId: app.id,
-            clonable: false,
-            name: 'test',
-            path: resolveFixture('apps/tux.png'),
-            remote: testApp.defaults.baseURL,
-            seed: false,
+        await OrganizationMember.create({
+            OrganizationId: organization.id,
+            UserId: user.id,
+            role: PredefinedOrganizationRole.Owner,
         });
-        const asset = await Asset.findOne();
-        expect(asset.dataValues).toMatchInlineSnapshot({
-            id: expect.any(String),
-            data: expect.any(Buffer),
-        }, `
+        await Organization.create({ id: 'appsemble', name: 'Appsemble' });
+    });
+    afterAll(() => {
+        vi.useRealTimers();
+    });
+    describe('publishAsset', () => {
+        it('should publish an asset from a file', async () => {
+            const app = await App.create({
+                path: 'test-app',
+                definition: { name: 'Test App', defaultPage: 'Test Page' },
+                vapidPublicKey: 'a',
+                vapidPrivateKey: 'b',
+                visibility: 'public',
+                OrganizationId: organization.id,
+            });
+            await authorizeCLI('assets:write', testApp);
+            await publishAsset({
+                appId: app.id,
+                clonable: false,
+                name: 'test',
+                path: resolveFixture('apps/tux.png'),
+                remote: testApp.defaults.baseURL,
+                seed: false,
+            });
+            const asset = await Asset.findOne();
+            expect(asset.dataValues).toMatchInlineSnapshot({
+                id: expect.any(String),
+                data: expect.any(Buffer),
+            }, `
       {
         "AppId": 1,
         "AppMemberId": null,
+        "GroupId": null,
         "ResourceId": null,
         "clonable": false,
         "created": 1970-01-01T00:00:00.000Z,
@@ -76,26 +78,27 @@ describe('publishAsset', () => {
         "updated": 1970-01-01T00:00:00.000Z,
       }
     `);
-    });
-    it('should throw an error if the app does not exist', async () => {
-        const app = await App.create({
-            path: 'test-app',
-            definition: { name: 'Test App', defaultPage: 'Test Page' },
-            vapidPublicKey: 'a',
-            vapidPrivateKey: 'b',
-            visibility: 'public',
-            OrganizationId: organization.id,
         });
-        await app.destroy();
-        await authorizeCLI('assets:write', testApp);
-        await expect(() => publishAsset({
-            appId: app.id,
-            clonable: false,
-            name: 'test',
-            path: resolveFixture('apps/tux.png'),
-            remote: testApp.defaults.baseURL,
-            seed: false,
-        })).rejects.toThrow('Request failed with status code 404');
+        it('should throw an error if the app does not exist', async () => {
+            const app = await App.create({
+                path: 'test-app',
+                definition: { name: 'Test App', defaultPage: 'Test Page' },
+                vapidPublicKey: 'a',
+                vapidPrivateKey: 'b',
+                visibility: 'public',
+                OrganizationId: organization.id,
+            });
+            await app.destroy();
+            await authorizeCLI('assets:write', testApp);
+            await expect(() => publishAsset({
+                appId: app.id,
+                clonable: false,
+                name: 'test',
+                path: resolveFixture('apps/tux.png'),
+                remote: testApp.defaults.baseURL,
+                seed: false,
+            })).rejects.toThrow('Request failed with status code 404');
+        });
     });
 });
 //# sourceMappingURL=asset.test.js.map

package/lib/block.test.js

@@ -1,5 +1,6 @@
 import { resolveFixture } from '@appsemble/node-utils';
-import { createServer, createTestUser, models, setArgv, useTestDatabase } from '@appsemble/server';
+import { createServer, createTestUser, models, setArgv } from '@appsemble/server';
+import { PredefinedOrganizationRole } from '@appsemble/types';
 import { setTestApp } from 'axios-test-instance';
 import concat from 'concat-stream';
 import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
@@ -7,52 +8,52 @@ import { deleteBlock, traverseBlockThemes } from './block.js';
 import { initAxios } from './initAxios.js';
 import { makeProjectPayload } from './project.js';
 import { authorizeCLI } from './testUtils.js';
-useTestDatabase(import.meta);
 const argv = { host: 'http://localhost', secret: 'test', aesSecret: 'testSecret' };
 let testApp;
 let user;
 let organization;
 const { App, AppBlockStyle, BlockVersion, Organization, OrganizationMember, Theme } = models;
-beforeAll(() => {
-    vi.useFakeTimers();
-    setArgv(argv);
-});
-beforeEach(async () => {
-    vi.clearAllTimers();
-    vi.setSystemTime(0);
-    const server = await createServer();
-    testApp = await setTestApp(server);
-    initAxios({ remote: testApp.defaults.baseURL });
-    user = await createTestUser();
-    organization = await Organization.create({
-        id: 'testorganization',
-        name: 'Test Organization',
-    });
-    await OrganizationMember.create({
-        OrganizationId: organization.id,
-        UserId: user.id,
-        role: 'Owner',
+describe('block', () => {
+    beforeAll(() => {
+        vi.useFakeTimers();
+        setArgv(argv);
     });
-    await Organization.create({ id: 'appsemble', name: 'Appsemble' });
-});
-afterAll(() => {
-    vi.useRealTimers();
-});
-describe('makeProjectPayload', () => {
-    it('should create a form-data payload', async () => {
-        const payload = await makeProjectPayload({
-            webpack: 'webpack.config',
-            name: '@org/block',
-            output: 'output',
-            version: '1.2.3',
-            dir: resolveFixture('makeProjectPayload/no-icon'),
+    beforeEach(async () => {
+        vi.clearAllTimers();
+        vi.setSystemTime(0);
+        const server = await createServer();
+        testApp = await setTestApp(server);
+        initAxios({ remote: testApp.defaults.baseURL });
+        user = await createTestUser();
+        organization = await Organization.create({
+            id: 'testorganization',
+            name: 'Test Organization',
         });
-        const [formData] = payload;
-        const boundary = formData.getBoundary();
-        const buffer = await new Promise((resolve) => {
-            formData.pipe(concat(resolve));
+        await OrganizationMember.create({
+            OrganizationId: organization.id,
+            UserId: user.id,
+            role: PredefinedOrganizationRole.Owner,
         });
-        expect(String(buffer)).toBe(`--${boundary}\r
+        await Organization.create({ id: 'appsemble', name: 'Appsemble' });
+    });
+    afterAll(() => {
+        vi.useRealTimers();
+    });
+    describe('makeProjectPayload', () => {
+        it('should create a form-data payload', async () => {
+            const payload = await makeProjectPayload({
+                webpack: 'webpack.config',
+                name: '@org/block',
+                output: 'output',
+                version: '1.2.3',
+                dir: resolveFixture('makeProjectPayload/no-icon'),
+            });
+            const [formData] = payload;
+            const boundary = formData.getBoundary();
+            const buffer = await new Promise((resolve) => {
+                formData.pipe(concat(resolve));
+            });
+            expect(String(buffer)).toBe(`--${boundary}\r
 Content-Disposition: form-data; name="actions"\r
 \r
 {"onClick":{}}\r
@@ -80,21 +81,21 @@ export const string = 'no-icon';
 \r
 --${boundary}--\r
 `);
-    });
-    it('should include an icon if one is present', async () => {
-        const payload = await makeProjectPayload({
-            webpack: 'webpack.config',
-            name: '@org/block',
-            output: 'output',
-            version: '1.2.3',
-            dir: resolveFixture('makeProjectPayload/with-icon'),
-        });
-        const [formData] = payload;
-        const boundary = formData.getBoundary();
-        const buffer = await new Promise((resolve) => {
-            formData.pipe(concat(resolve));
         });
-        expect(String(buffer)).toBe(`--${boundary}\r
+        it('should include an icon if one is present', async () => {
+            const payload = await makeProjectPayload({
+                webpack: 'webpack.config',
+                name: '@org/block',
+                output: 'output',
+                version: '1.2.3',
+                dir: resolveFixture('makeProjectPayload/with-icon'),
+            });
+            const [formData] = payload;
+            const boundary = formData.getBoundary();
+            const buffer = await new Promise((resolve) => {
+                formData.pipe(concat(resolve));
+            });
+            expect(String(buffer)).toBe(`--${boundary}\r
 Content-Disposition: form-data; name="actions"\r
 \r
 {"onClick":{}}\r
@@ -129,105 +130,106 @@ export const string = 'with-icon';
 \r
 --${boundary}--\r
 `);
-    });
-});
-describe('deleteBlock', () => {
-    it('should delete a block', async () => {
-        const block = await BlockVersion.create({
-            OrganizationId: organization.id,
-            name: 'test',
-            version: '0.0.0',
-        });
-        const clientCredentials = await authorizeCLI('blocks:delete', testApp);
-        await deleteBlock({
-            remote: testApp.defaults.baseURL,
-            clientCredentials,
-            blockName: block.name,
-            blockVersion: block.version,
-            organization: organization.id,
         });
-        const foundBlocks = await BlockVersion.findAll();
-        expect(foundBlocks).toStrictEqual([]);
     });
-});
-describe('traverseBlockThemes', () => {
-    it('should upload css from a file in the app directory', async () => {
-        const app = await App.create({
-            path: 'test-app',
-            definition: { name: 'Test App', defaultPage: 'Test Page' },
-            vapidPublicKey: 'a',
-            vapidPrivateKey: 'b',
-            visibility: 'public',
-            OrganizationId: organization.id,
+    describe('deleteBlock', () => {
+        it('should delete a block', async () => {
+            const block = await BlockVersion.create({
+                OrganizationId: organization.id,
+                name: 'test',
+                version: '0.0.0',
+            });
+            const clientCredentials = await authorizeCLI('blocks:delete', testApp);
+            await deleteBlock({
+                remote: testApp.defaults.baseURL,
+                clientCredentials,
+                blockName: block.name,
+                blockVersion: block.version,
+                organization: organization.id,
+            });
+            const foundBlocks = await BlockVersion.findAll();
+            expect(foundBlocks).toStrictEqual([]);
         });
-        await BlockVersion.create({
-            name: 'test',
-            OrganizationId: 'appsemble',
-            version: '0.0.0',
-            parameters: {
-                type: 'object',
-                properties: {
-                    foo: {
-                        type: 'number',
+    });
+    describe('traverseBlockThemes', () => {
+        it('should upload css from a file in the app directory', async () => {
+            const app = await App.create({
+                path: 'test-app',
+                definition: { name: 'Test App', defaultPage: 'Test Page' },
+                vapidPublicKey: 'a',
+                vapidPrivateKey: 'b',
+                visibility: 'public',
+                OrganizationId: organization.id,
+            });
+            await BlockVersion.create({
+                name: 'test',
+                OrganizationId: 'appsemble',
+                version: '0.0.0',
+                parameters: {
+                    type: 'object',
+                    properties: {
+                        foo: {
+                            type: 'number',
+                        },
                     },
                 },
-            },
+            });
+            await authorizeCLI('apps:write', testApp);
+            await traverseBlockThemes(resolveFixture('apps/test'), app.id, testApp.defaults.baseURL, false);
+            const style = await AppBlockStyle.findOne();
+            expect(style.dataValues).toMatchInlineSnapshot(`
+        {
+          "AppId": 1,
+          "block": "@appsemble/test",
+          "created": 1970-01-01T00:00:00.000Z,
+          "style": ".tux {
+          color: rgb(0 0 0);
+        }",
+          "updated": 1970-01-01T00:00:00.000Z,
+        }
+      `);
         });
-        await authorizeCLI('apps:write', testApp);
-        await traverseBlockThemes(resolveFixture('apps/test'), app.id, testApp.defaults.baseURL, false);
-        const style = await AppBlockStyle.findOne();
-        expect(style.dataValues).toMatchInlineSnapshot(`
-      {
-        "AppId": 1,
-        "block": "@appsemble/test",
-        "created": 1970-01-01T00:00:00.000Z,
-        "style": ".tux {
-        color: rgb(0 0 0);
-      }",
-        "updated": 1970-01-01T00:00:00.000Z,
-      }
-    `);
-    });
-    it('should throw if the block does not exist', async () => {
-        const app = await App.create({
-            path: 'test-app',
-            definition: { name: 'Test App', defaultPage: 'Test Page' },
-            vapidPublicKey: 'a',
-            vapidPrivateKey: 'b',
-            visibility: 'public',
-            OrganizationId: organization.id,
-        });
-        await authorizeCLI('apps:write', testApp);
-        await expect(() => traverseBlockThemes(resolveFixture('apps/test'), app.id, testApp.defaults.baseURL, false)).rejects.toThrow('Request failed with status code 404');
-        const style = await AppBlockStyle.findOne();
-        expect(style).toBeNull();
-    });
-    it('should not upload css from core and shared directories', async () => {
-        const app = await App.create({
-            path: 'test-app',
-            definition: { name: 'Test App', defaultPage: 'Test Page' },
-            vapidPublicKey: 'a',
-            vapidPrivateKey: 'b',
-            visibility: 'public',
-            OrganizationId: organization.id,
+        it('should throw if the block does not exist', async () => {
+            const app = await App.create({
+                path: 'test-app',
+                definition: { name: 'Test App', defaultPage: 'Test Page' },
+                vapidPublicKey: 'a',
+                vapidPrivateKey: 'b',
+                visibility: 'public',
+                OrganizationId: organization.id,
+            });
+            await authorizeCLI('apps:write', testApp);
+            await expect(() => traverseBlockThemes(resolveFixture('apps/test'), app.id, testApp.defaults.baseURL, false)).rejects.toThrow('Request failed with status code 404');
+            const style = await AppBlockStyle.findOne();
+            expect(style).toBeNull();
         });
-        await BlockVersion.create({
-            name: 'test',
-            OrganizationId: 'appsemble',
-            version: '0.0.0',
-            parameters: {
-                type: 'object',
-                properties: {
-                    foo: {
-                        type: 'number',
+        it('should not upload css from core and shared directories', async () => {
+            const app = await App.create({
+                path: 'test-app',
+                definition: { name: 'Test App', defaultPage: 'Test Page' },
+                vapidPublicKey: 'a',
+                vapidPrivateKey: 'b',
+                visibility: 'public',
+                OrganizationId: organization.id,
+            });
+            await BlockVersion.create({
+                name: 'test',
+                OrganizationId: 'appsemble',
+                version: '0.0.0',
+                parameters: {
+                    type: 'object',
+                    properties: {
+                        foo: {
+                            type: 'number',
+                        },
                     },
                 },
-            },
+            });
+            await authorizeCLI('apps:write', testApp);
+            await traverseBlockThemes(resolveFixture('apps/test'), app.id, testApp.defaults.baseURL, false);
+            const style = await Theme.findAll();
+            expect(style).toStrictEqual([]);
         });
-        await authorizeCLI('apps:write', testApp);
-        await traverseBlockThemes(resolveFixture('apps/test'), app.id, testApp.defaults.baseURL, false);
-        const style = await Theme.findAll();
-        expect(style).toStrictEqual([]);
     });
 });
 //# sourceMappingURL=block.test.js.map