@appsemble/cli 0.30.3 → 0.30.8

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.30.3/config/assets/logo.svg) Appsemble CLI
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.30.8/config/assets/logo.svg) Appsemble CLI
 
 > Manage apps and blocks from the command line.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/cli)](https://www.npmjs.com/package/@appsemble/cli)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.30.3/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.30.3)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.30.8/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.30.8)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -199,7 +199,7 @@ appsemble app import <path-of-zip-file> --organization <organizationId>
 ```
 
 For a more in depth explanation of how to build apps, use our
-[app building guide](https://appsemble.app/docs/02-guides).
+[app building guide](https://appsemble.app/docs/guides).
 
 ### Blocks
 
@@ -248,7 +248,7 @@ npm install webpack@webpack-4 @appsemble/webpack-config
 ```
 
 For a more in-depth explanation of how to build apps, use our
-[block development guide](https://appsemble.app/docs/04-development/developing-blocks).
+[block development guide](https://appsemble.app/docs/development/developing-blocks).
 
 ### Groups
 
@@ -323,5 +323,5 @@ appsemble run-cronjobs --interval 30
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.30.3/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.30.8/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/commands/group/member/invite.d.ts

@@ -6,9 +6,10 @@ interface InviteGroupArguments extends BaseArguments {
     user: string;
     context: string;
     app: string;
+    role: string;
 }
 export declare const command = "invite <user>";
 export declare const description = "Invite a new member to an existing group from an app.";
 export declare function builder(yargs: Argv): Argv<any>;
-export declare function handler({ app, appId, clientCredentials, context, id, remote, user, }: InviteGroupArguments): Promise<void>;
+export declare function handler({ app, appId, clientCredentials, context, id, remote, role, user, }: InviteGroupArguments): Promise<void>;
 export {};

package/commands/group/member/invite.js

@@ -20,13 +20,17 @@ export function builder(yargs) {
         .option('context', {
         describe: 'If specified, use the specified context from .appsemblerc.yaml',
         demandOption: 'app',
+    })
+        .option('role', {
+        describe: 'The user will be invited to the group with this role',
+        demandOption: true,
     })
         .positional('user', {
         describe: 'The ID or email address of the user you want to invite.',
         demandOption: true,
     });
 }
-export async function handler({ app, appId, clientCredentials, context, id, remote, user, }) {
+export async function handler({ app, appId, clientCredentials, context, id, remote, role, user, }) {
     const [resolvedAppId, resolvedRemote] = await resolveAppIdAndRemote(app, context, remote, appId);
     await authenticate(resolvedRemote, 'groups:write', clientCredentials);
     await inviteMember({
@@ -34,6 +38,7 @@ export async function handler({ app, appId, clientCredentials, context, id, remo
         appId: resolvedAppId,
         user,
         remote: resolvedRemote,
+        role,
     });
 }
 //# sourceMappingURL=invite.js.map

package/commands/serve.js

@@ -54,6 +54,7 @@ export function builder(yargs) {
     });
 }
 export async function handler(argv) {
+    var _a;
     setArgv(argv);
     const appPath = join(process.cwd(), argv.path);
     const [, , , appsembleApp] = await traverseAppDirectory(appPath, 'development', new FormData());
@@ -65,18 +66,17 @@ export async function handler(argv) {
             : new AppsembleError('This app does not support roles');
     }
     const appSecurity = appsembleApp.definition.security;
-    const appMembers = [
-        {
-            sub: '1',
-            name: 'dev',
-            email: 'dev@example.com',
-            email_verified: true,
-            role: passedUserRole || (appSecurity === null || appSecurity === void 0 ? void 0 : appSecurity.default.role),
-            demo: false,
-            zoneinfo: '',
-            properties: {},
-        },
-    ];
+    const appMemberInfo = {
+        sub: '1',
+        name: 'dev',
+        email: 'dev@example.com',
+        email_verified: true,
+        role: passedUserRole || ((_a = appSecurity === null || appSecurity === void 0 ? void 0 : appSecurity.default) === null || _a === void 0 ? void 0 : _a.role),
+        demo: false,
+        zoneinfo: '',
+        properties: {},
+    };
+    const appMembers = [appMemberInfo];
     const allowedGroupRoles = ['manager', 'member'];
     const passedGroupRole = argv['group-role'];
     if (passedGroupRole && !allowedGroupRoles.includes(passedGroupRole)) {
@@ -90,12 +90,6 @@ export async function handler(argv) {
             annotations: {},
         },
     ];
-    const appUserInfo = {
-        email: 'dev@example.com',
-        email_verified: true,
-        name: 'dev',
-        sub: '1',
-    };
     const appName = normalize(appsembleApp.definition.name);
     const appId = 1;
     setAppName(appName);
@@ -243,7 +237,7 @@ export async function handler(argv) {
             ...(appSecurity
                 ? {
                     appMembers,
-                    appUserInfo,
+                    appMemberInfo,
                     appGroups,
                 }
                 : {}),
@@ -269,7 +263,7 @@ export async function handler(argv) {
             ...(appSecurity
                 ? {
                     appMembers,
-                    appUserInfo,
+                    appMemberInfo,
                     appGroups,
                 }
                 : {}),

package/lib/group.d.ts

@@ -25,6 +25,12 @@ interface SharedGroupMemberParams extends SharedExistingGroupParams {
      */
     user: string;
 }
+interface InviteGroupMemberParams extends SharedGroupMemberParams {
+    /**
+     * The role to invite the group member with.
+     */
+    role: AppRole;
+}
 interface UpdateGroupMemberParams extends SharedGroupMemberParams {
     /**
      * The new role of the group member.
@@ -55,7 +61,7 @@ export declare function resolveAnnotations(annotations: string[]): Record<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 inviteMember({ id, remote, role, user, }: InviteGroupMemberParams): 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

@@ -35,9 +35,9 @@ export async function updateGroup({ annotations = [], id, name, remote, }) {
     }, { baseURL: remote });
     logger.info(`Successfully updated group ${id}`);
 }
-export async function inviteMember({ id, remote, user }) {
+export async function inviteMember({ id, remote, role, user, }) {
     logger.info(`Inviting ${user} to group ${id}`);
-    await axios.post(`/api/groups/${id}/invites`, [{ email: user, role: 'Member' }], {
+    await axios.post(`/api/groups/${id}/invites`, [{ email: user, role }], {
         baseURL: remote,
     });
     logger.info(`Successfully invited ${user} to group ${id}`);

package/lib/group.test.js

@@ -312,10 +312,6 @@ describe('group', () => {
                     name: 'Test App',
                     defaultPage: 'Test Page',
                     security: {
-                        groups: {
-                            join: 'anyone',
-                            invite: [],
-                        },
                         default: {
                             role: 'Reader',
                             policy: 'everyone',
@@ -338,7 +334,7 @@ describe('group', () => {
                 email: user.primaryEmail,
                 AppId: app.id,
                 UserId: user.id,
-                role: 'Manager',
+                role: 'Reader',
                 name: user.name,
             });
             await authorizeCLI('groups:write', testApp);
@@ -347,6 +343,7 @@ describe('group', () => {
                 id: group.id,
                 remote: testApp.defaults.baseURL,
                 user: user.primaryEmail,
+                role: 'Reader',
             });
             const invite = await GroupInvite.findOne();
             expect(invite.dataValues).toMatchInlineSnapshot({
@@ -357,7 +354,7 @@ describe('group', () => {
         "created": 1970-01-01T00:00:00.000Z,
         "email": "test@example.com",
         "key": Any<String>,
-        "role": "Member",
+        "role": "Reader",
         "updated": 1970-01-01T00:00:00.000Z,
       }
     `);
@@ -392,6 +389,7 @@ describe('group', () => {
                 id: 10,
                 remote: testApp.defaults.baseURL,
                 user: user.primaryEmail,
+                role: 'Reader',
             })).rejects.toThrow('Request failed with status code 400');
         });
     });
@@ -402,16 +400,15 @@ describe('group', () => {
                     name: 'Test App',
                     defaultPage: 'Test Page',
                     security: {
-                        groups: {
-                            join: 'anyone',
-                            invite: [],
-                        },
                         default: {
                             role: 'Reader',
                             policy: 'everyone',
                         },
                         roles: {
                             Reader: {},
+                            Updater: {
+                                inherits: ['Manager'],
+                            },
                         },
                     },
                 },
@@ -428,24 +425,25 @@ describe('group', () => {
                 email: user.primaryEmail,
                 AppId: app.id,
                 UserId: user.id,
-                role: 'Manager',
+                role: 'Updater',
                 name: user.name,
             });
             const groupMember = await GroupMember.create({
                 GroupId: group.id,
                 AppMemberId: member.id,
+                role: 'Reader',
             });
             await authorizeCLI('groups:write', testApp);
             await updateMember({
                 appId: app.id,
                 remote: testApp.defaults.baseURL,
                 user: groupMember.id,
-                role: 'GroupMembersManager',
+                role: 'Updater',
                 id: group.id,
             });
-            expect(groupMember.role).toBe('Member');
+            expect(groupMember.role).toBe('Reader');
             await groupMember.reload();
-            expect(groupMember.role).toBe('GroupMembersManager');
+            expect(groupMember.role).toBe('Updater');
         });
         it('should throw an error if the user is not a GroupMember', async () => {
             const app = await App.create({
@@ -463,6 +461,9 @@ describe('group', () => {
                         },
                         roles: {
                             Reader: {},
+                            Updater: {
+                                inherits: ['Manager'],
+                            },
                         },
                     },
                 },
@@ -479,7 +480,7 @@ describe('group', () => {
                 email: user.primaryEmail,
                 AppId: app.id,
                 UserId: user.id,
-                role: 'Manager',
+                role: 'Updater',
                 name: user.name,
             });
             await authorizeCLI('groups:write', testApp);
@@ -487,7 +488,7 @@ describe('group', () => {
                 appId: app.id,
                 remote: testApp.defaults.baseURL,
                 user: user.id,
-                role: 'GroupMembersManager',
+                role: 'Updater',
                 id: group.id,
             })).rejects.toThrow('Request failed with status code 404');
         });
@@ -509,6 +510,9 @@ describe('group', () => {
                         },
                         roles: {
                             Reader: {},
+                            Updater: {
+                                inherits: ['Maintainer'],
+                            },
                         },
                     },
                 },
@@ -525,7 +529,7 @@ describe('group', () => {
                 email: user.primaryEmail,
                 AppId: app.id,
                 UserId: user.id,
-                role: 'Maintainer',
+                role: 'Updater',
                 name: user.name,
             });
             await authorizeCLI('groups:write', testApp);
@@ -534,10 +538,12 @@ describe('group', () => {
             await GroupMember.create({
                 GroupId: group.id,
                 AppMemberId: member.id,
+                role: 'Updater',
             });
             const { id: groupMemberId } = await GroupMember.create({
                 GroupId: group.id,
                 AppMemberId: member2.id,
+                role: 'Reader',
             });
             await deleteMember({
                 id: group.id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.30.3",
+  "version": "0.30.8",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -42,9 +42,9 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.30.3",
-    "@appsemble/types": "0.30.3",
-    "@appsemble/utils": "0.30.3",
+    "@appsemble/node-utils": "0.30.8",
+    "@appsemble/types": "0.30.8",
+    "@appsemble/utils": "0.30.8",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "@koa/cors": "^4.0.0",
     "@odata/parser": "^0.2.0",
@@ -87,8 +87,8 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.30.3",
-    "@appsemble/server": "0.30.3",
+    "@appsemble/types": "0.30.8",
+    "@appsemble/server": "0.30.8",
     "bcrypt": "^5.0.0",
     "axios-test-instance": "^7.0.0",
     "@types/concat-stream": "^2.0.0",

package/server/controllers/apps/members/current/groups/getCurrentAppMemberGroups.d.ts

@@ -0,0 +1,2 @@
+import { type Middleware } from 'koa';
+export declare const getCurrentAppMemberGroups: Middleware;

package/server/controllers/apps/members/current/groups/getCurrentAppMemberGroups.js

@@ -0,0 +1,4 @@
+import { createGetCurrentAppMemberGroupsController } from '@appsemble/node-utils';
+import { options } from '../../../../../options/options.js';
+export const getCurrentAppMemberGroups = createGetCurrentAppMemberGroupsController(options);
+//# sourceMappingURL=getCurrentAppMemberGroups.js.map

package/server/controllers/apps/members/current/groups/index.d.ts

@@ -0,0 +1 @@
+export { getCurrentAppMemberGroups } from './getCurrentAppMemberGroups.js';

package/server/controllers/apps/members/current/groups/index.js

@@ -0,0 +1,2 @@
+export { getCurrentAppMemberGroups } from './getCurrentAppMemberGroups.js';
+//# sourceMappingURL=index.js.map

package/server/controllers/apps/members/current/index.d.ts

@@ -1 +1,2 @@
 export { getCurrentAppMember } from './getCurrentAppMember.js';
+export * from './groups/index.js';

package/server/controllers/apps/members/current/index.js

@@ -1,2 +1,3 @@
 export { getCurrentAppMember } from './getCurrentAppMember.js';
+export * from './groups/index.js';
 //# sourceMappingURL=index.js.map

package/server/options/getAppAsset.d.ts

@@ -0,0 +1,2 @@
+import { type AppAsset, type GetAppAssetParams } from '@appsemble/node-utils';
+export declare function getAppAsset({ context, id: filename }: GetAppAssetParams): Promise<AppAsset>;

package/server/options/getAppAsset.js

@@ -0,0 +1,13 @@
+import { readFile } from 'node:fs/promises';
+export function getAppAsset({ context, id: filename }) {
+    const assetFound = context.appAssets.find((asset) => asset.filename === filename);
+    const assetPromise = async () => {
+        const data = await readFile(assetFound.filename);
+        return {
+            ...assetFound,
+            data,
+        };
+    };
+    return Promise.resolve(assetPromise());
+}
+//# sourceMappingURL=getAppAsset.js.map

package/server/options/getCurrentAppMemberGroups.d.ts

@@ -0,0 +1,3 @@
+import { type GetAppSubEntityParams } from '@appsemble/node-utils';
+import { type Group } from '@appsemble/types';
+export declare const getCurrentAppMemberGroups: ({ context }: GetAppSubEntityParams) => Promise<Group[]>;

package/server/options/getCurrentAppMemberGroups.js

@@ -0,0 +1,2 @@
+export const getCurrentAppMemberGroups = ({ context }) => Promise.resolve(context.appGroups);
+//# sourceMappingURL=getCurrentAppMemberGroups.js.map

package/server/options/index.d.ts

@@ -20,6 +20,7 @@ export * from './createAppResourcesWithAssets.js';
 export * from './updateAppResource.js';
 export * from './deleteAppResource.js';
 export * from './parseQuery.js';
+export * from './getAppAsset.js';
 export * from './getAppAssets.js';
 export * from './createAppAsset.js';
 export * from './getBlockMessages.js';
@@ -29,6 +30,7 @@ export * from './email.js';
 export * from './sendNotifications.js';
 export * from './applyAppServiceSecrets.js';
 export * from './getCurrentAppMember.js';
+export * from './getCurrentAppMemberGroups.js';
 export * from './getAppGroups.js';
 export * from './getAppReadmes.js';
 export * from './getAppVariables.js';

package/server/options/index.js

@@ -20,6 +20,7 @@ export * from './createAppResourcesWithAssets.js';
 export * from './updateAppResource.js';
 export * from './deleteAppResource.js';
 export * from './parseQuery.js';
+export * from './getAppAsset.js';
 export * from './getAppAssets.js';
 export * from './createAppAsset.js';
 export * from './getBlockMessages.js';
@@ -29,6 +30,7 @@ export * from './email.js';
 export * from './sendNotifications.js';
 export * from './applyAppServiceSecrets.js';
 export * from './getCurrentAppMember.js';
+export * from './getCurrentAppMemberGroups.js';
 export * from './getAppGroups.js';
 export * from './getAppReadmes.js';
 export * from './getAppVariables.js';

package/server/options/options.js

@@ -1,4 +1,4 @@
-import { applyAppServiceSecrets, checkAppMemberAppPermissions, checkAppPermissions, checkAuthSubjectAppPermissions, checkUserOrganizationPermissions, createAppAsset, createAppResourcesWithAssets, createSettings, createTheme, deleteAppAsset, deleteAppResource, email, getApp, getAppAssets, getAppBlockStyles, getAppDetails, getAppGroups, getAppIcon, getAppMessages, getAppReadmes, getAppResource, getAppResources, getAppScreenshots, getAppStyles, getAppUrl, getAppVariables, getBlockAsset, getBlockMessages, getBlocksAssetsPaths, getCsp, getCurrentAppMember, getDbUpdated, getHost, getTheme, parseQuery, reloadUser, sendNotifications, updateAppResource, } from './index.js';
+import { applyAppServiceSecrets, checkAppMemberAppPermissions, checkAppPermissions, checkAuthSubjectAppPermissions, checkUserOrganizationPermissions, createAppAsset, createAppResourcesWithAssets, createSettings, createTheme, deleteAppAsset, deleteAppResource, email, getApp, getAppAsset, getAppAssets, getAppBlockStyles, getAppDetails, getAppGroups, getAppIcon, getAppMessages, getAppReadmes, getAppResource, getAppResources, getAppScreenshots, getAppStyles, getAppUrl, getAppVariables, getBlockAsset, getBlockMessages, getBlocksAssetsPaths, getCsp, getCurrentAppMember, getCurrentAppMemberGroups, getDbUpdated, getHost, getTheme, parseQuery, reloadUser, sendNotifications, updateAppResource, } from './index.js';
 export const options = {
     applyAppServiceSecrets,
     createAppAsset,
@@ -9,6 +9,7 @@ export const options = {
     deleteAppResource,
     email,
     getApp,
+    getAppAsset,
     getAppAssets,
     getAppBlockStyles,
     getAppDetails,
@@ -38,5 +39,6 @@ export const options = {
     checkAppMemberAppPermissions,
     checkAuthSubjectAppPermissions,
     getCurrentAppMember,
+    getCurrentAppMemberGroups,
 };
 //# sourceMappingURL=options.js.map

package/templates/apps/empty/app-definition.yaml

@@ -6,7 +6,7 @@ pages:
   - name: Example Page A
     blocks:
       - type: action-button
-        version: 0.30.3
+        version: 0.30.8
         parameters:
           icon: arrow-right
         actions:
@@ -17,7 +17,7 @@ pages:
   - name: Example Page B
     blocks:
       - type: action-button
-        version: 0.30.3
+        version: 0.30.8
         parameters:
           icon: arrow-left
         actions:

package/templates/blocks/mini-jsx/package.json

@@ -2,7 +2,7 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@appsemble/sdk": "0.30.3",
+    "@appsemble/sdk": "0.30.8",
     "mini-jsx": "^4.0.0"
   }
 }

package/templates/blocks/preact/package.json

@@ -2,8 +2,8 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@appsemble/preact": "0.30.3",
-    "@appsemble/sdk": "0.30.3",
+    "@appsemble/preact": "0.30.8",
+    "@appsemble/sdk": "0.30.8",
     "preact": "^10.0.0"
   }
 }

package/templates/blocks/vanilla/package.json

@@ -2,6 +2,6 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@appsemble/sdk": "0.30.3"
+    "@appsemble/sdk": "0.30.8"
   }
 }

package/vitest.setup.js

@@ -14,10 +14,10 @@ beforeAll(async () => {
 beforeEach(async () => {
     await testDB.truncate({ truncate: true, cascade: true, force: true, restartIdentity: true });
 });
-afterAll(async () => {
-    await testDB.close();
+afterAll(() => {
+    testDB.close();
     // We need to drop the test database from the root database
     // testDB.drop() doesn't actually delete the database
-    await rootDB.query(`DROP DATABASE ${testDB.getDatabaseName()}`);
+    rootDB.query(`DROP DATABASE ${testDB.getDatabaseName()}`);
 });
 //# sourceMappingURL=vitest.setup.js.map