@appsemble/cli 0.27.12 → 0.28.0

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.27.12/config/assets/logo.svg) Appsemble CLI
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.28.0/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.27.12/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.27.12)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.28.0/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.28.0)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -323,5 +323,5 @@ appsemble run-cronjobs --interval 30
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.27.12/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.28.0/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/commands/app/delete.js

@@ -1,5 +1,4 @@
-import { authenticate, logger } from '@appsemble/node-utils';
-import axios from 'axios';
+import { deleteApp } from '../../lib/app.js';
 export const command = 'delete';
 export const description = 'Delete an app using the app id.';
 export function builder(yargs) {
@@ -9,13 +8,6 @@ export function builder(yargs) {
     });
 }
 export async function handler({ clientCredentials, id, remote, }) {
-    await authenticate(remote, 'apps:delete', clientCredentials);
-    const response = await axios.get(`/api/apps/${id}`);
-    const { name } = response.data;
-    logger.warn(`Deleting app: ${name}`);
-    axios.delete(`/api/apps/${id}`, {
-        baseURL: remote,
-    });
-    logger.info(`Successfully deleted ${name} app.`);
+    await deleteApp({ id, remote, clientCredentials });
 }
 //# sourceMappingURL=delete.js.map

package/commands/app/export.js

@@ -1,5 +1,5 @@
 import { join } from 'node:path';
-import { authenticate, logger } from '@appsemble/node-utils';
+import { logger } from '@appsemble/node-utils';
 import { exportAppAsZip } from '../../lib/app.js';
 export const command = 'export';
 export const description = `Export an app as a zip file using app id.
@@ -24,9 +24,8 @@ export function builder(yargs) {
 export async function handler(args) {
     const { assets = false, clientCredentials, id: appId, path: outputDirectory, remote, resources = false, } = args;
     const defaultOutputDirectory = join(process.cwd(), 'apps');
-    await authenticate(remote, 'apps:export', clientCredentials);
     logger.info(`Exporting app with id: ${appId}`);
-    await exportAppAsZip(appId, assets, resources, outputDirectory || defaultOutputDirectory, remote);
+    await exportAppAsZip(clientCredentials, appId, assets, resources, outputDirectory || defaultOutputDirectory, remote);
     logger.info('Export completed successfully');
 }
 //# sourceMappingURL=export.js.map

package/commands/block/delete.js

@@ -1,4 +1,4 @@
-import { authenticate, logger } from '@appsemble/node-utils';
+import { logger } from '@appsemble/node-utils';
 import { deleteBlock } from '../../lib/block.js';
 export const command = 'delete <block>';
 export const description = 'Delete a specific block version. Using this outside local development is discouraged.';
@@ -13,9 +13,8 @@ export function builder(yargs) {
     });
 }
 export async function handler({ block, clientCredentials, organization, remote, }) {
-    await authenticate(remote, 'blocks:delete', clientCredentials);
     const [blockName, blockVersion] = block.split(':');
     logger.info(`Deleting Block ${block}`);
-    await deleteBlock({ organization, blockName, blockVersion, remote });
+    await deleteBlock({ organization, blockName, blockVersion, remote, clientCredentials });
 }
 //# sourceMappingURL=delete.js.map

package/commands/team/create.js

@@ -1,4 +1,3 @@
-import { authenticate } from '@appsemble/node-utils';
 import { resolveAppIdAndRemote } from '../../lib/app.js';
 import { createTeam } from '../../lib/team.js';
 export const command = 'create <name>';
@@ -28,12 +27,12 @@ export function builder(yargs) {
 }
 export async function handler({ annotation, app, appId, clientCredentials, context, name, remote, }) {
     const [resolvedAppId, resolvedRemote] = await resolveAppIdAndRemote(app, context, remote, appId);
-    await authenticate(resolvedRemote, 'teams:write', clientCredentials);
     await createTeam({
         name,
         appId: resolvedAppId,
         annotations: annotation,
         remote: resolvedRemote,
+        clientCredentials,
     });
 }
 //# sourceMappingURL=create.js.map

package/commands/team/delete.js

@@ -1,4 +1,3 @@
-import { authenticate } from '@appsemble/node-utils';
 import { resolveAppIdAndRemote } from '../../lib/app.js';
 import { deleteTeam } from '../../lib/team.js';
 export const command = 'delete';
@@ -24,11 +23,11 @@ export function builder(yargs) {
 }
 export async function handler({ app, appId, clientCredentials, context, id, remote, }) {
     const [resolvedAppId, resolvedRemote] = await resolveAppIdAndRemote(app, context, remote, appId);
-    await authenticate(resolvedRemote, 'teams:write', clientCredentials);
     await deleteTeam({
         id,
         appId: resolvedAppId,
         remote: resolvedRemote,
+        clientCredentials,
     });
 }
 //# sourceMappingURL=delete.js.map

package/lib/app.d.ts

@@ -15,13 +15,14 @@ export declare function traverseAppDirectory(path: string, context: string, form
 /**
  * Export an app as a zip file.
  *
+ * @param clientCredentials The OAuth2 client credentials to use
  * @param appId Id of the app to be exported.
  * @param assets Boolean representing whether to include assets in the exported zip file.
  * @param resources Boolean representing whether to include resources in the zip file.
  * @param path Path of the folder where you want to put your downloaded file.
  * @param remote The remote to fetch the app from.
  */
-export declare function exportAppAsZip(appId: number, assets: boolean, resources: boolean, path: string, remote: string): Promise<void>;
+export declare function exportAppAsZip(clientCredentials: string, appId: number, assets: boolean, resources: boolean, path: string, remote: string): Promise<void>;
 /**
  * Upload messages for an app.
  *
@@ -31,6 +32,12 @@ export declare function exportAppAsZip(appId: number, assets: boolean, resources
  * @param force Whether or not to force the update for locked apps.
  */
 export declare function uploadMessages(path: string, appId: number, remote: string, force: boolean): Promise<void>;
+interface DeleteAppArgs {
+    remote: string;
+    id: number;
+    clientCredentials: string;
+}
+export declare function deleteApp({ clientCredentials, id, remote }: DeleteAppArgs): Promise<void>;
 export declare function publishSeedResources(path: string, app: App, remote: string): Promise<void>;
 export declare function publishSeedAssets(path: string, app: App, remote: string, assetsClonable: boolean): Promise<void>;
 export declare function parseValues(type: string, name: string, valuesToParse: Record<string, ValueFromDefinition>[]): [Record<string, ValueFromProcess>, boolean];

package/lib/app.js

@@ -152,6 +152,13 @@ export async function traverseAppDirectory(path, context, formData) {
         : maskableIconPath;
     return [discoveredContext, rc, yaml, gatheredData];
 }
+function extractFilenameFromContentDisposition(contentDisposition) {
+    const match = contentDisposition.match(/filename="(.+?)"/);
+    if (match && match.length > 1) {
+        return match[1];
+    }
+    return null;
+}
 async function retrieveContext(path, context) {
     let rc;
     let discoveredContext;
@@ -190,20 +197,20 @@ async function retrieveContext(path, context) {
 /**
  * Export an app as a zip file.
  *
+ * @param clientCredentials The OAuth2 client credentials to use
  * @param appId Id of the app to be exported.
  * @param assets Boolean representing whether to include assets in the exported zip file.
  * @param resources Boolean representing whether to include resources in the zip file.
  * @param path Path of the folder where you want to put your downloaded file.
  * @param remote The remote to fetch the app from.
  */
-export async function exportAppAsZip(appId, assets, resources, path, remote) {
-    const app = await axios.get(`/api/apps/${appId}`);
-    const { name } = app.data.definition;
+export async function exportAppAsZip(clientCredentials, appId, assets, resources, path, remote) {
+    await authenticate(remote, 'apps:export', clientCredentials);
     const response = await axios.get(`/api/apps/${appId}/export?resources=${resources}&assets=${assets}`, {
         baseURL: remote,
         responseType: 'stream',
     });
-    const zipFileName = join(path, `${name}_${appId}.zip`);
+    const zipFileName = join(path, String(extractFilenameFromContentDisposition(response.headers['content-disposition'])));
     const writeStream = createWriteStream(zipFileName);
     response.data.pipe(writeStream);
     logger.info(`Successfully downloaded file: ${zipFileName}`);
@@ -236,6 +243,16 @@ export async function uploadMessages(path, appId, remote, force) {
         logger.info(`Successfully uploaded messages for language “${language.language}” 🎉`);
     }
 }
+export async function deleteApp({ clientCredentials, id, remote }) {
+    await authenticate(remote, 'apps:delete', clientCredentials);
+    const response = await axios.get(`/api/apps/${id}`);
+    const { name } = response.data;
+    logger.warn(`Deleting app: ${name}`);
+    await axios.delete(`/api/apps/${id}`, {
+        baseURL: remote,
+    });
+    logger.info(`Successfully deleted app with id ${id}`);
+}
 export async function publishSeedResources(path, app, remote) {
     var _a, _b;
     const resourcesPath = join(path, 'resources');