@appsemble/cli 0.29.11 → 0.30.1

package/lib/app.js

@@ -278,7 +278,7 @@ export async function publishSeedResources(path, app, remote) {
     if (existsSync(resourcesPath)) {
         logger.info(`Deleting existing seed resources from app ${app.id}`);
         try {
-            await axios.delete(`/api/apps/${app.id}/seed-resources`, { baseURL: remote });
+            await axios.delete(`/api/apps/${app.id}/resources`, { baseURL: remote });
             const resourceFiles = await readdir(resourcesPath, { withFileTypes: true });
             const resourcesToPublish = [];
             const publishedResourcesIds = {};
@@ -328,7 +328,11 @@ export async function publishSeedAssets(path, app, remote, assetsClonable) {
     if (existsSync(assetsPath)) {
         logger.info(`Deleting existing seed assets from app ${app.id}`);
         try {
-            await axios.delete(`/api/apps/${app.id}/seed-assets`, { baseURL: remote });
+            await axios.delete(`/api/apps/${app.id}/assets`, {
+                data: [],
+                baseURL: remote,
+                params: { seed: true },
+            });
             const assetFiles = await readdir(assetsPath);
             const normalizedPaths = assetFiles.map((assetFile) => normalizePath(join(assetsPath, assetFile)));
             const files = await fg(normalizedPaths, { absolute: true, onlyFiles: true });
@@ -804,6 +808,9 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
     if (resources) {
         authScope += ' resources:write';
     }
+    if (assets) {
+        authScope += ' assets:write';
+    }
     await authenticate(remote, authScope, clientCredentials);
     let data;
     try {
@@ -852,7 +859,7 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
     if (Array.isArray(rcCollections)) {
         for (const collectionId of rcCollections) {
             try {
-                await axios.post(`/api/appCollections/${collectionId}/apps`, { AppId: data.id }, {
+                await axios.post(`/api/app-collections/${collectionId}/apps`, { AppId: data.id }, {
                     baseURL: remote,
                 });
                 logger.info(`Successfully added app to collection ${collectionId}`);
@@ -961,6 +968,9 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
     if (resources) {
         authScope += ' resources:write';
     }
+    if (assets) {
+        authScope += ' assets:write';
+    }
     await authenticate(remote, authScope, clientCredentials);
     if (appLock) {
         logger.info(`Setting AppLock to ${appLock}`);

package/lib/app.test.js

@@ -1,6 +1,7 @@
 import { writeFile } from 'node:fs/promises';
 import { readFixture, resolveFixture } from '@appsemble/node-utils';
 import { createServer, createTestUser, models, setArgv, useTestDatabase } from '@appsemble/server';
+import { PredefinedOrganizationRole } from '@appsemble/types';
 import { ISODateTimePattern } from '@appsemble/utils';
 import { setTestApp } from 'axios-test-instance';
 import FormData from 'form-data';
@@ -32,7 +33,7 @@ beforeEach(async () => {
     await OrganizationMember.create({
         OrganizationId: organization.id,
         UserId: user.id,
-        role: 'Owner',
+        role: PredefinedOrganizationRole.Owner,
     });
     await Organization.create({ id: 'appsemble', name: 'Appsemble' });
     await BlockVersion.create({
@@ -212,7 +213,7 @@ describe('publishApp', () => {
     });
     it('should publish app with resources and assets', async () => {
         vi.useRealTimers();
-        const clientCredentials = await authorizeCLI('apps:write resources:write', testApp);
+        const clientCredentials = await authorizeCLI('apps:write resources:write assets:write', testApp);
         await publishApp({
             path: resolveFixture('apps/test'),
             organization: organization.id,
@@ -367,7 +368,7 @@ describe('publishApp', () => {
             visibility: 'public',
         });
         vi.useRealTimers();
-        const clientCredentials = await authorizeCLI('apps:write resources:write', testApp);
+        const clientCredentials = await authorizeCLI('apps:write resources:write assets:write', testApp);
         await publishApp({
             path: resolveFixture('apps/test'),
             organization: organization.id,
@@ -526,7 +527,7 @@ describe('publishApp', () => {
     });
     it('should publish app with app variant patches applied', async () => {
         vi.useRealTimers();
-        const clientCredentials = await authorizeCLI('apps:write resources:write', testApp);
+        const clientCredentials = await authorizeCLI('apps:write resources:write assets:write', testApp);
         await publishApp({
             path: resolveFixture('apps/test'),
             organization: organization.id,
@@ -752,6 +753,7 @@ describe('publishApp', () => {
         });
         expect(appSamlSecret.toJSON()).toStrictEqual({
             emailAttribute: 'email',
+            emailVerifiedAttribute: null,
             entityId: 'http://localhost:1234',
             icon: 'redhat',
             id: 1,
@@ -987,7 +989,7 @@ describe('updateApp', () => {
     });
     it('should update app with resources and assets', async () => {
         vi.useRealTimers();
-        const clientCredentials = await authorizeCLI('apps:write resources:write', testApp);
+        const clientCredentials = await authorizeCLI('apps:write resources:write assets:write', testApp);
         await updateApp({
             id: app.id,
             path: resolveFixture('apps/test'),
@@ -1143,7 +1145,7 @@ describe('updateApp', () => {
             visibility: 'public',
         });
         vi.useRealTimers();
-        const clientCredentials = await authorizeCLI('apps:write resources:write', testApp);
+        const clientCredentials = await authorizeCLI('apps:write resources:write assets:write', testApp);
         await updateApp({
             path: resolveFixture('apps/test'),
             id: app.id,
@@ -1304,7 +1306,7 @@ describe('updateApp', () => {
     });
     it('should update app with app variant patches applied', async () => {
         vi.useRealTimers();
-        const clientCredentials = await authorizeCLI('apps:write resources:write', testApp);
+        const clientCredentials = await authorizeCLI('apps:write resources:write assets:write', testApp);
         await updateApp({
             path: resolveFixture('apps/test'),
             id: app.id,
@@ -1532,6 +1534,7 @@ describe('updateApp', () => {
         });
         expect(appSamlSecret.toJSON()).toStrictEqual({
             emailAttribute: 'email',
+            emailVerifiedAttribute: null,
             entityId: 'http://localhost:1234',
             icon: 'redhat',
             id: 1,

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 { 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';
@@ -29,7 +30,7 @@ beforeEach(async () => {
     await OrganizationMember.create({
         OrganizationId: organization.id,
         UserId: user.id,
-        role: 'Owner',
+        role: PredefinedOrganizationRole.Owner,
     });
     await Organization.create({ id: 'appsemble', name: 'Appsemble' });
 });
@@ -63,6 +64,7 @@ describe('publishAsset', () => {
       {
         "AppId": 1,
         "AppMemberId": null,
+        "GroupId": null,
         "ResourceId": null,
         "clonable": false,
         "created": 1970-01-01T00:00:00.000Z,

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 { 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';
@@ -31,7 +32,7 @@ beforeEach(async () => {
     await OrganizationMember.create({
         OrganizationId: organization.id,
         UserId: user.id,
-        role: 'Owner',
+        role: PredefinedOrganizationRole.Owner,
     });
     await Organization.create({ id: 'appsemble', name: 'Appsemble' });
 });

package/lib/createServers.js

@@ -36,7 +36,9 @@ export function createApiServer({ context }) {
         app.use(compress());
     }
     app.use(compose([
-        conditional((ctx) => ctx.path.startsWith('/api') || ctx.path === '/oauth2/token', cors()),
+        conditional((ctx) => ctx.path.startsWith('/api') ||
+            ctx.path === '/auth/oauth2/token' ||
+            /\/apps\/\d+\/auth\/oauth2\/token/.test(ctx.path), cors()),
         koas(api(version, argv), [
             parameters(),
             bodyParser(),

package/lib/group.d.ts

@@ -0,0 +1,61 @@
+import { type AppRole } from '@appsemble/types';
+interface SharedGroupParams {
+    /**
+     * The ID of the app to create the group for.
+     */
+    appId: number;
+    /**
+     * The remote server to create the group on.
+     */
+    remote: string;
+    /**
+     * The client credentials used to authenticate
+     */
+    clientCredentials?: string;
+}
+interface SharedExistingGroupParams extends SharedGroupParams {
+    /**
+     * The ID of the group.
+     */
+    id: number;
+}
+interface SharedGroupMemberParams extends SharedExistingGroupParams {
+    /**
+     * The ID or email address of the group member.
+     */
+    user: string;
+}
+interface UpdateGroupMemberParams extends SharedGroupMemberParams {
+    /**
+     * The new role of the group member.
+     */
+    role: AppRole;
+}
+interface UpdateGroupParams extends SharedExistingGroupParams {
+    /**
+     * The new name of the group.
+     */
+    name?: string;
+    /**
+     * The list of annotations to apply in key=value format.
+     */
+    annotations?: string[];
+}
+interface CreateGroupParams extends SharedGroupParams {
+    /**
+     * The name of the group.
+     */
+    name: string;
+    /**
+     * The list of annotations to apply in key=value format.
+     */
+    annotations?: string[];
+}
+export declare function resolveAnnotations(annotations: string[]): Record<string, string>;
+export declare function createGroup({ annotations, appId, clientCredentials, name, remote, }: CreateGroupParams): Promise<void>;
+export declare function deleteGroup({ clientCredentials, id, remote, }: SharedExistingGroupParams): Promise<void>;
+export declare function updateGroup({ annotations, id, name, remote, }: UpdateGroupParams): Promise<void>;
+export declare function inviteMember({ id, remote, user }: SharedGroupMemberParams): Promise<void>;
+export declare function updateMember({ id, remote, role, user, }: UpdateGroupMemberParams): Promise<void>;
+export declare function deleteMember({ id, user }: SharedGroupMemberParams): Promise<void>;
+export {};

package/lib/group.js

@@ -0,0 +1,55 @@
+import { AppsembleError, authenticate, logger } from '@appsemble/node-utils';
+import axios from 'axios';
+export function resolveAnnotations(annotations) {
+    const annotationRegex = /^\w+=.+$/;
+    if (annotations.some((a) => !annotationRegex.test(a))) {
+        throw new AppsembleError('One of the annotations did not follow the pattern of key=value');
+    }
+    return annotations.length
+        ? Object.fromEntries(annotations.map((annotation) => {
+            const [key, ...value] = annotation.split('=');
+            return [key, value.join('=')];
+        }))
+        : undefined;
+}
+export async function createGroup({ annotations = [], appId, clientCredentials, name, remote, }) {
+    logger.info(`Creating group ${name}`);
+    await authenticate(remote, 'groups:write', clientCredentials);
+    const { data: { id }, } = await axios.post(`/api/apps/${appId}/groups`, {
+        name,
+        annotations: resolveAnnotations(annotations),
+    }, { baseURL: remote });
+    logger.info(`Successfully created group ${name} with ID ${id}`);
+}
+export async function deleteGroup({ clientCredentials, id, remote, }) {
+    await authenticate(remote, 'groups:write', clientCredentials);
+    logger.info(`Deleting group ${id}`);
+    await axios.delete(`/api/groups/${id}`, { baseURL: remote });
+    logger.info(`Successfully deleted group ${id}`);
+}
+export async function updateGroup({ annotations = [], id, name, remote, }) {
+    logger.info(`Updating group ${id}`);
+    await axios.patch(`/api/groups/${id}`, {
+        name,
+        annotations: resolveAnnotations(annotations),
+    }, { baseURL: remote });
+    logger.info(`Successfully updated group ${id}`);
+}
+export async function inviteMember({ id, remote, user }) {
+    logger.info(`Inviting ${user} to group ${id}`);
+    await axios.post(`/api/groups/${id}/invites`, [{ email: user, role: 'Member' }], {
+        baseURL: remote,
+    });
+    logger.info(`Successfully invited ${user} to group ${id}`);
+}
+export async function updateMember({ id, remote, role, user, }) {
+    logger.info(`Updating ${user}’s role in group ${id} to ${role}`);
+    await axios.put(`/api/group-members/${user}/role`, { role }, { baseURL: remote });
+    logger.info(`Successfully updated ${user} in group ${id}`);
+}
+export async function deleteMember({ id, user }) {
+    logger.info(`Deleting ${user} to group ${id}`);
+    await axios.delete(`/api/group-members/${user}?selectedGroupId=${id}`);
+    logger.info(`Successfully deleted ${user} from group ${id}`);
+}
+//# sourceMappingURL=group.js.map