@appsemble/cli 0.22.1 → 0.22.2

package/README.md

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

package/commands/app/update.js

@@ -1,8 +1,7 @@
-import { AppsembleError, logger } from '@appsemble/node-utils';
+import { AppsembleError, authenticate, logger } from '@appsemble/node-utils';
 import fg from 'fast-glob';
 import normalizePath from 'normalize-path';
 import { updateApp } from '../../lib/app.js';
-import { authenticate } from '../../lib/authentication.js';
 import { coerceFile } from '../../lib/coercers.js';
 export const command = 'update <paths...>';
 export const description = 'Update an app based on a specified YAML file or directory.';

package/commands/asset/publish.js

@@ -1,10 +1,9 @@
 import { parse } from 'node:path';
-import { AppsembleError, logger } from '@appsemble/node-utils';
+import { AppsembleError, authenticate, logger } from '@appsemble/node-utils';
 import fg from 'fast-glob';
 import normalizePath from 'normalize-path';
 import { resolveAppIdAndRemote } from '../../lib/app.js';
 import { publishAsset } from '../../lib/asset.js';
-import { authenticate } from '../../lib/authentication.js';
 export const command = 'publish <paths...>';
 export const description = 'Publish assets for an existing app.';
 export function builder(yargs) {

package/commands/block/delete.js

@@ -1,5 +1,4 @@
-import { logger } from '@appsemble/node-utils';
-import { authenticate } from '../../lib/authentication.js';
+import { authenticate, 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.';

package/commands/block/publish.js

@@ -1,7 +1,6 @@
-import { logger } from '@appsemble/node-utils';
+import { authenticate, logger } from '@appsemble/node-utils';
 import fg from 'fast-glob';
 import normalizePath from 'normalize-path';
-import { authenticate } from '../../lib/authentication.js';
 import { buildBlock, getBlockConfig, publishBlock } from '../../lib/block.js';
 export const command = 'publish <paths...>';
 export const description = 'Publish a block.';

package/commands/organization/create.js

@@ -1,4 +1,4 @@
-import { authenticate } from '../../lib/authentication.js';
+import { authenticate } from '@appsemble/node-utils';
 import { coerceFile } from '../../lib/coercers.js';
 import { createOrganization } from '../../lib/organization.js';
 export const command = 'create <id>';

package/commands/organization/index.js

@@ -1,5 +1,6 @@
 import * as create from './create.js';
 import * as update from './update.js';
+import * as upsert from './upsert.js';
 export { noop as handler } from '@appsemble/utils';
 export const command = 'organization';
 export const description = 'Commands related to organizations.';
@@ -7,6 +8,7 @@ export function builder(yargs) {
     return yargs
         .command(create)
         .command(update)
+        .command(upsert)
         .demandCommand(1);
 }
 //# sourceMappingURL=index.js.map

package/commands/organization/update.js

@@ -1,4 +1,4 @@
-import { authenticate } from '../../lib/authentication.js';
+import { authenticate } from '@appsemble/node-utils';
 import { coerceFile } from '../../lib/coercers.js';
 import { updateOrganization } from '../../lib/organization.js';
 export const command = 'update <id>';

package/commands/organization/upsert.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="node" resolution-mode="require"/>
+import { type ReadStream } from 'node:fs';
+import { type Argv } from 'yargs';
+import { type BaseArguments } from '../../types.js';
+interface UpsertOrganizationArguments extends BaseArguments {
+    description: string;
+    email: string;
+    id: string;
+    name: string;
+    website: string;
+    icon: ReadStream;
+}
+export declare const command = "upsert <id>";
+export declare const description = "Create a new organization for the given id or update if there exists one already.";
+export declare function builder(yargs: Argv): Argv<any>;
+export declare function handler({ clientCredentials, description: desc, email, icon, id, name, remote, website, }: UpsertOrganizationArguments): Promise<void>;
+export {};

package/commands/organization/upsert.js

@@ -0,0 +1,39 @@
+import { authenticate } from '@appsemble/node-utils';
+import { coerceFile } from '../../lib/coercers.js';
+import { upsertOrganization } from '../../lib/organization.js';
+export const command = 'upsert <id>';
+export const description = 'Create a new organization for the given id or update if there exists one already.';
+export function builder(yargs) {
+    return yargs
+        .positional('id', {
+        describe: 'Id of the organization to create or update',
+    })
+        .option('name', {
+        describe: 'The name of the organization',
+    })
+        .option('email', {
+        describe: 'The email address users may use to contact the organization',
+    })
+        .option('website', {
+        describe: 'The website of the organization',
+    })
+        .option('description', {
+        describe: 'A short of the organization',
+    })
+        .option('icon', {
+        describe: 'The file location of the icon representing the organization.',
+        coerce: coerceFile,
+    });
+}
+export async function handler({ clientCredentials, description: desc, email, icon, id, name, remote, website, }) {
+    await authenticate(remote, 'organizations:write', clientCredentials);
+    await upsertOrganization({
+        description: desc,
+        email,
+        icon,
+        id,
+        name,
+        website,
+    });
+}
+//# sourceMappingURL=upsert.js.map

package/commands/resource/publish.js

@@ -1,8 +1,7 @@
-import { AppsembleError, logger } from '@appsemble/node-utils';
+import { AppsembleError, authenticate, logger } from '@appsemble/node-utils';
 import fg from 'fast-glob';
 import normalizePath from 'normalize-path';
 import { resolveAppIdAndRemote } from '../../lib/app.js';
-import { authenticate } from '../../lib/authentication.js';
 import { publishResource } from '../../lib/resource.js';
 export const command = 'publish <resource-name> <paths...>';
 export const description = 'Publish resources based on a specified JSON file or directory.';

package/commands/resource/update.js

@@ -1,8 +1,7 @@
-import { AppsembleError, logger } from '@appsemble/node-utils';
+import { AppsembleError, authenticate, logger } from '@appsemble/node-utils';
 import fg from 'fast-glob';
 import normalizePath from 'normalize-path';
 import { resolveAppIdAndRemote } from '../../lib/app.js';
-import { authenticate } from '../../lib/authentication.js';
 import { updateResource } from '../../lib/resource.js';
 export const command = 'update <resource-name> <paths...>';
 export const description = 'Update resources based on a specified JSON file or directory. Entries without the property `id` will be skipped.';

package/commands/team/create.js

@@ -1,5 +1,5 @@
+import { authenticate } from '@appsemble/node-utils';
 import { resolveAppIdAndRemote } from '../../lib/app.js';
-import { authenticate } from '../../lib/authentication.js';
 import { createTeam } from '../../lib/team.js';
 export const command = 'create <name>';
 export const description = 'Create a new team for an app.';

package/commands/team/delete.js

@@ -1,5 +1,5 @@
+import { authenticate } from '@appsemble/node-utils';
 import { resolveAppIdAndRemote } from '../../lib/app.js';
-import { authenticate } from '../../lib/authentication.js';
 import { deleteTeam } from '../../lib/team.js';
 export const command = 'delete';
 export const description = 'Delete an existing team from an app.';

package/commands/team/member/delete.js

@@ -1,5 +1,5 @@
+import { authenticate } from '@appsemble/node-utils';
 import { resolveAppIdAndRemote } from '../../../lib/app.js';
-import { authenticate } from '../../../lib/authentication.js';
 import { deleteMember } from '../../../lib/team.js';
 export const command = 'delete <user>';
 export const description = 'Delete a new member to an existing team from an app.';

package/commands/team/member/invite.js

@@ -1,5 +1,5 @@
+import { authenticate } from '@appsemble/node-utils';
 import { resolveAppIdAndRemote } from '../../../lib/app.js';
-import { authenticate } from '../../../lib/authentication.js';
 import { inviteMember } from '../../../lib/team.js';
 export const command = 'invite <user>';
 export const description = 'Invite a new member to an existing team from an app.';

package/commands/team/member/update.js

@@ -1,6 +1,6 @@
+import { authenticate } from '@appsemble/node-utils';
 import { TeamRole } from '@appsemble/utils';
 import { resolveAppIdAndRemote } from '../../../lib/app.js';
-import { authenticate } from '../../../lib/authentication.js';
 import { updateMember } from '../../../lib/team.js';
 export const command = 'update <user> <role>';
 export const description = 'Update an existing team member.';

package/commands/team/update.js

@@ -1,5 +1,5 @@
+import { authenticate } from '@appsemble/node-utils';
 import { resolveAppIdAndRemote } from '../../lib/app.js';
-import { authenticate } from '../../lib/authentication.js';
 import { updateTeam } from '../../lib/team.js';
 export const command = 'update';
 export const description = 'Update an existing team for an app.';

package/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import process from 'node:process';
-import { configureLogger, handleError, version } from '@appsemble/node-utils';
+import { configureLogger, CREDENTIALS_ENV_VAR, handleError, version } from '@appsemble/node-utils';
 import { cosmiconfig } from 'cosmiconfig';
 import yargs from 'yargs';
 import * as app from './commands/app/index.js';
@@ -17,7 +17,6 @@ import * as runCronJobs from './commands/runCronJobs.js';
 import * as serve from './commands/serve.js';
 import * as start from './commands/start.js';
 import * as team from './commands/team/index.js';
-import { CREDENTIALS_ENV_VAR } from './lib/authentication.js';
 import { coerceRemote } from './lib/coercers.js';
 import { initAxios } from './lib/initAxios.js';
 process.title = 'appsemble';

package/lib/app.js

@@ -2,11 +2,10 @@ import { createReadStream, existsSync } from 'node:fs';
 import { mkdir, readdir, readFile, stat } from 'node:fs/promises';
 import { basename, join, parse, relative, resolve } from 'node:path';
 import { inspect } from 'node:util';
-import { AppsembleError, logger, opendirSafe, readData, writeData } from '@appsemble/node-utils';
+import { AppsembleError, authenticate, logger, opendirSafe, readData, writeData, } from '@appsemble/node-utils';
 import { extractAppMessages, has, normalizeBlockName } from '@appsemble/utils';
 import axios from 'axios';
 import FormData from 'form-data';
-import { authenticate } from './authentication.js';
 import { traverseBlockThemes } from './block.js';
 import { coerceRemote } from './coercers.js';
 import { printAxiosError } from './output.js';

package/lib/authentication.d.ts

@@ -1,13 +1,3 @@
 import { type BaseArguments } from '../types.js';
-export declare const CREDENTIALS_ENV_VAR = "APPSEMBLE_CLIENT_CREDENTIALS";
 export declare function login({ clientCredentials, remote }: BaseArguments): Promise<void>;
 export declare function remove({ remote }: BaseArguments): Promise<void>;
-/**
- * Login to the server using OAuth2 client credentials.
- *
- * @param remote Host to fetch token from.
- * @param scope The OAuth2 scope to request. This may be space separated to request
- *   multiple scopes.
- * @param inputCredentials Client credentials passed from the command line.
- */
-export declare function authenticate(remote: string, scope: string, inputCredentials: string): Promise<void>;

package/lib/authentication.js

@@ -1,18 +1,12 @@
 import { hostname } from 'node:os';
-import { AppsembleError, logger } from '@appsemble/node-utils';
-import axios from 'axios';
+import { AppsembleError, getKeytar, getService, logger } from '@appsemble/node-utils';
 import inquirer from 'inquirer';
 import Koa from 'koa';
 import open from 'open';
 import raw from 'raw-body';
-export const CREDENTIALS_ENV_VAR = 'APPSEMBLE_CLIENT_CREDENTIALS';
-const authorizedRemotes = new Set();
 function validate(credentials) {
     return /.+:.+/.test(credentials);
 }
-function getService(remote) {
-    return `appsemble://${new URL(remote).host}`;
-}
 function waitForCredentials(url) {
     return new Promise((resolve) => {
         const app = new Koa();
@@ -48,45 +42,6 @@ function waitForCredentials(url) {
         open(String(url));
     });
 }
-async function getKeytar() {
-    try {
-        const { default: keytar } = await import('keytar');
-        return keytar;
-    }
-    catch {
-        throw new AppsembleError('Couldn’t find module keytar. Either install libsecret and reinstall @appsemble/cli, or pass --client-credentials on the command line.');
-    }
-}
-async function getClientCredentials(remote, inputCredentials) {
-    if (inputCredentials) {
-        return inputCredentials;
-    }
-    const envCredentials = process.env[CREDENTIALS_ENV_VAR];
-    if (envCredentials) {
-        logger.info(`Detected client credentials from ${CREDENTIALS_ENV_VAR} environment variable`);
-        return envCredentials;
-    }
-    const { findCredentials } = await getKeytar();
-    const choices = await findCredentials(getService(remote));
-    if (choices.length === 0) {
-        throw new AppsembleError(`No client credentials found. Register them using:\n\nappsemble login --remote ${remote}`);
-    }
-    let choice;
-    if (choices.length === 1) {
-        [choice] = choices;
-    }
-    else {
-        ({ choice } = await inquirer.prompt([
-            {
-                name: 'choice',
-                message: 'Select client id to use',
-                choices: choices.map((value) => ({ name: value.account, value })),
-                type: 'list',
-            },
-        ]));
-    }
-    return `${choice.account}:${choice.password}`;
-}
 export async function login({ clientCredentials, remote }) {
     const { setPassword } = await getKeytar();
     const url = new URL('/settings/client-credentials', remote);
@@ -125,33 +80,4 @@ export async function remove({ remote }) {
         logger.info(`Successfully delete client id ${clientId}`);
     }));
 }
-/**
- * Login to the server using OAuth2 client credentials.
- *
- * @param remote Host to fetch token from.
- * @param scope The OAuth2 scope to request. This may be space separated to request
- *   multiple scopes.
- * @param inputCredentials Client credentials passed from the command line.
- */
-export async function authenticate(remote, scope, inputCredentials) {
-    const credentials = await getClientCredentials(remote, inputCredentials);
-    if (authorizedRemotes.has(remote)) {
-        logger.verbose(`Already logged in to ${remote}`);
-        return;
-    }
-    logger.verbose(`Logging in to ${remote}`);
-    const { data } = await axios.post('/oauth2/token', new URLSearchParams({ grant_type: 'client_credentials', scope }), {
-        headers: { authorization: `Basic ${Buffer.from(credentials).toString('base64')}` },
-        baseURL: remote,
-    });
-    authorizedRemotes.add(remote);
-    axios.interceptors.request.use((config) => {
-        if (config.baseURL === remote) {
-            config.headers.set('authorization', `Bearer ${data.access_token}`);
-        }
-        return config;
-    });
-    logger.info(`Logged in to ${remote} successfully`);
-    logger.verbose(`Login scope: ${scope}`);
-}
 //# sourceMappingURL=authentication.js.map

package/lib/organization.d.ts

@@ -1,14 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 import { type ReadStream } from 'node:fs';
-interface CreateOrganizationArguments {
-    description: string;
-    email: string;
-    id: string;
-    name: string;
-    website: string;
-    icon: ReadStream;
-}
-interface UpdateOrganizationArguments {
+interface OrganizationArguments {
     description: string;
     email: string;
     id: string;
@@ -16,6 +8,7 @@ interface UpdateOrganizationArguments {
     name: string;
     website: string;
 }
-export declare function createOrganization({ description, email, icon, id, name, website, }: CreateOrganizationArguments): Promise<void>;
-export declare function updateOrganization({ description, email, icon, id, name, website, }: UpdateOrganizationArguments): Promise<void>;
+export declare function createOrganization({ description, email, icon, id, name, website, }: OrganizationArguments): Promise<void>;
+export declare function updateOrganization({ description, email, icon, id, name, website, }: OrganizationArguments): Promise<void>;
+export declare function upsertOrganization({ description, email, icon, id, name, website, }: OrganizationArguments): Promise<void>;
 export {};

package/lib/organization.js

@@ -54,4 +54,18 @@ export async function updateOrganization({ description, email, icon, id, name, w
     await axios.patch(`/api/organizations/${id}`, formData);
     logger.info(`Successfully updated organization ${id}${name ? ` (${name})` : ''}`);
 }
+export async function upsertOrganization({ description, email, icon, id, name, website, }) {
+    try {
+        await axios.get(`/api/organizations/${id}`);
+        updateOrganization({ description, email, icon, id, name, website });
+    }
+    catch (error) {
+        if (axios.isAxiosError(error) && error.response && error.response.status === 404) {
+            createOrganization({ description, email, icon, id, name, website });
+        }
+        else {
+            logger.error(error);
+        }
+    }
+}
 //# sourceMappingURL=organization.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.22.1",
+  "version": "0.22.2",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -42,9 +42,9 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.22.1",
-    "@appsemble/types": "0.22.1",
-    "@appsemble/utils": "0.22.1",
+    "@appsemble/node-utils": "0.22.2",
+    "@appsemble/types": "0.22.2",
+    "@appsemble/utils": "0.22.2",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "@koa/cors": "^4.0.0",
     "@odata/parser": "^0.2.0",
@@ -85,7 +85,7 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.22.1",
+    "@appsemble/types": "0.22.2",
     "@types/concat-stream": "^2.0.0",
     "@types/inquirer": "^9.0.0",
     "@types/normalize-path": "^3.0.0",

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

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

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

@@ -2,7 +2,7 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@appsemble/sdk": "0.22.1",
+    "@appsemble/sdk": "0.22.2",
     "mini-jsx": "^3.0.0"
   }
 }

package/templates/blocks/preact/package.json

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

package/templates/blocks/vanilla/package.json

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