@appsemble/cli 0.36.3-test.5 → 0.36.3

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.36.3-test.5/config/assets/logo.svg) Appsemble CLI
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.36.3/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.36.3-test.5/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.36.3-test.5)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.36.3/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.36.3)
 [![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.36.3-test.5/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.36.3/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/commands/app/patch.d.ts

@@ -1,4 +1,4 @@
-import { type AppLock, type AppVisibility } from '@appsemble/types';
+import { type AppLock, type AppTotp, type AppVisibility } from '@appsemble/types';
 import { type Argv } from 'yargs';
 import { type BaseArguments } from '../../types.js';
 interface PatchAppArguments extends BaseArguments {
@@ -11,6 +11,7 @@ interface PatchAppArguments extends BaseArguments {
     template?: boolean;
     demoMode?: boolean;
     locked?: AppLock;
+    totp?: AppTotp;
     showAppsembleOAuth2Login?: boolean;
     showAppsembleLogin?: boolean;
     displayAppMemberName?: boolean;

package/commands/app/patch.js

@@ -34,6 +34,11 @@ export function builder(yargs) {
         description: 'Change the value of AppLock for your app.',
         type: 'string',
         choices: ['fullLock', 'studioLock', 'unlocked'],
+    })
+        .option('totp', {
+        description: 'The TOTP (two-factor authentication) setting for the app. Use "disabled" to turn off, "enabled" to make it optional, or "required" to enforce for all app members. WARNING: Setting "required" will lock out existing users who have not yet enabled 2FA.',
+        type: 'string',
+        choices: ['disabled', 'enabled', 'required'],
     })
         .option('showAppsembleOAuth2Login', {
         description: 'Whether the Appsemble OAuth2 login method should be shown',

package/commands/app/publish.d.ts

@@ -1,5 +1,5 @@
 import { type ReadStream } from 'node:fs';
-import { type AppVisibility } from '@appsemble/types';
+import { type AppTotp, type AppVisibility } from '@appsemble/types';
 import { type Argv } from 'yargs';
 import { type BaseArguments } from '../../types.js';
 interface PublishAppArguments extends BaseArguments {
@@ -18,6 +18,7 @@ interface PublishAppArguments extends BaseArguments {
     assetsClonable: boolean;
     modifyContext: boolean;
     visibility: AppVisibility;
+    totp: AppTotp;
     sentryDsn: string;
     sentryEnvironment: string;
     googleAnalyticsId: string;

package/commands/app/publish.js

@@ -43,6 +43,10 @@ export function builder(yargs) {
         .option('demo-mode', {
         describe: 'Whether the app should be used in demo mode.',
         type: 'boolean',
+    })
+        .option('totp', {
+        describe: 'The TOTP (two-factor authentication) setting for the app. Use "disabled" to turn off, "enabled" to make it optional, or "required" to enforce for all app members. WARNING: Setting "required" will lock out existing users who have not yet enabled 2FA.',
+        choices: ['disabled', 'enabled', 'required'],
     })
         .option('dry-run', {
         describe: 'Whether the API should be called to run without actually creating the app.',

package/commands/app/update.d.ts

@@ -1,5 +1,5 @@
 import { type ReadStream } from 'node:fs';
-import { type AppVisibility } from '@appsemble/types';
+import { type AppTotp, type AppVisibility } from '@appsemble/types';
 import { type Argv } from 'yargs';
 import { type BaseArguments } from '../../types.js';
 interface UpdateAppArguments extends BaseArguments {
@@ -11,6 +11,7 @@ interface UpdateAppArguments extends BaseArguments {
     id: number;
     template: boolean;
     demoMode: boolean;
+    totp: AppTotp;
     resources: boolean;
     assets: boolean;
     assetsClonable: boolean;

package/commands/app/update.js

@@ -46,6 +46,10 @@ export function builder(yargs) {
         .option('demo-mode', {
         describe: 'Whether the app should be used in demo mode.',
         type: 'boolean',
+    })
+        .option('totp', {
+        describe: 'The TOTP (two-factor authentication) setting for the app. Use "disabled" to turn off, "enabled" to make it optional, or "required" to enforce for all app members. WARNING: Setting "required" will lock out existing users who have not yet enabled 2FA.',
+        choices: ['disabled', 'enabled', 'required'],
     })
         .option('resources', {
         describe: 'Whether the resources from the `resources` directory should replace the seed resources of the app being updated. The names of sub-directories are used as the name of the resource, otherwise the names of top level resource .json files are used instead.',

package/lib/app.d.ts

@@ -1,5 +1,5 @@
 import { type ReadStream } from 'node:fs';
-import { type App, type AppLock, type AppsembleContext, type AppsembleRC, type AppVisibility, type ValueFromDefinition, type ValueFromProcess } from '@appsemble/types';
+import { type App, type AppLock, type AppsembleContext, type AppsembleRC, type AppTotp, type AppVisibility, type ValueFromDefinition, type ValueFromProcess } from '@appsemble/types';
 import FormData from 'form-data';
 /**
  * Traverses an app directory and appends the files it finds to the given FormData object.
@@ -181,6 +181,10 @@ interface PublishAppParams {
      * The password of the external app database.
      */
     dbPassword?: string;
+    /**
+     * The TOTP (two-factor authentication) setting for the app.
+     */
+    totp?: AppTotp;
 }
 /**
  * Publish a new app.
@@ -305,6 +309,10 @@ interface UpdateAppParams {
      * The password of the external app database.
      */
     dbPassword?: string;
+    /**
+     * The TOTP (two-factor authentication) setting for the app.
+     */
+    totp?: AppTotp;
 }
 /**
  * Update an existing app.
@@ -381,6 +389,10 @@ interface PatchAppParams {
      * Whether the app is currently locked.
      */
     locked?: AppLock;
+    /**
+     * The TOTP (two-factor authentication) setting for the app.
+     */
+    totp?: AppTotp;
 }
 export declare function patchApp({ id, remote, ...options }: PatchAppParams): Promise<void>;
 export {};

package/lib/app.js

@@ -820,6 +820,7 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
     const dbPort = appsembleContext.dbPort ?? options.dbPort;
     const dbUser = appsembleContext.dbUser ?? options.dbUser;
     const skipGroupInvites = appsembleContext.skipGroupInvites ?? options.skipGroupInvites ?? false;
+    const totp = appsembleContext.totp ?? options.totp;
     const { dbPassword } = options;
     logger.verbose(`App remote: ${remote}`);
     logger.verbose(`App organization: ${organizationId}`);
@@ -883,6 +884,10 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
         logger.info('Using MS Clarity');
         formData.append('msClarityID', msClarityId);
     }
+    if (totp) {
+        logger.info(`Setting TOTP to ${totp}`);
+        formData.append('totp', totp);
+    }
     let authScope = 'apps:write';
     if (resources) {
         authScope += ' resources:write';
@@ -1033,6 +1038,7 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
     const dbHost = appsembleContext.dbHost ?? options.dbHost;
     const dbPort = appsembleContext.dbPort ?? options.dbPort;
     const dbUser = appsembleContext.dbUser ?? options.dbUser;
+    const totp = appsembleContext.totp ?? options.totp;
     const { dbPassword } = options;
     logger.info(`App id: ${id}`);
     logger.verbose(`App remote: ${remote}`);
@@ -1098,6 +1104,10 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
         logger.info('Using MS Clarity');
         formData.append('msClarityID', msClarityId);
     }
+    if (totp) {
+        logger.info(`Setting TOTP to ${totp}`);
+        formData.append('totp', totp);
+    }
     let authScope = 'apps:write';
     if (resources) {
         authScope += ' resources:write';
@@ -1216,6 +1226,10 @@ export async function patchApp({ id, remote, ...options }) {
         logger.info(`Setting enableSelfRegistration to ${options.enableSelfRegistration}`);
         formData.append('enableSelfRegistration', String(options.enableSelfRegistration));
     }
+    if (options.totp !== undefined) {
+        logger.info(`Setting totp to ${options.totp}`);
+        formData.append('totp', options.totp);
+    }
     try {
         if (!formData.getLengthSync() && options.locked === undefined) {
             logger.warn('Nothing to patch. Need at least one additional argument to patch app.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.36.3-test.5",
+  "version": "0.36.3",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -44,10 +44,10 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.36.3-test.5",
-    "@appsemble/types": "0.36.3-test.5",
-    "@appsemble/lang-sdk": "0.36.3-test.5",
-    "@appsemble/utils": "0.36.3-test.5",
+    "@appsemble/node-utils": "0.36.3",
+    "@appsemble/types": "0.36.3",
+    "@appsemble/lang-sdk": "0.36.3",
+    "@appsemble/utils": "0.36.3",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "@koa/cors": "^5.0.0",
     "@odata/parser": "^0.2.0",
@@ -89,8 +89,8 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.36.3-test.5",
-    "@appsemble/server": "0.36.3-test.5",
+    "@appsemble/types": "0.36.3",
+    "@appsemble/server": "0.36.3",
     "axios-test-instance": "7.0.0",
     "bcrypt": "5.1.1",
     "big-integer": "1.6.52",

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

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

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

@@ -5,7 +5,7 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/sdk": "0.36.3-test.5",
+    "@appsemble/sdk": "0.36.3",
     "mini-jsx": "^4.0.0"
   }
 }

package/templates/blocks/preact/package.json

@@ -5,8 +5,8 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/preact": "0.36.3-test.5",
-    "@appsemble/sdk": "0.36.3-test.5",
+    "@appsemble/preact": "0.36.3",
+    "@appsemble/sdk": "0.36.3",
     "preact": "^10.0.0"
   }
 }

package/templates/blocks/vanilla/package.json

@@ -5,6 +5,6 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/sdk": "0.36.3-test.5"
+    "@appsemble/sdk": "0.36.3"
   }
 }