@appsemble/node-utils 0.33.10 → 0.34.0

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.33.10/config/assets/logo.svg) Appsemble Node Utilities
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.34.0/config/assets/logo.svg) Appsemble Node Utilities
 
 > NodeJS utilities used by Appsemble internally.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/node-utils)](https://www.npmjs.com/package/@appsemble/node-utils)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.33.10/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.33.10)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.34.0/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.34.0)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -26,5 +26,5 @@ compatibility is not guaranteed.
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.33.10/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.34.0/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/app.js

@@ -34,7 +34,7 @@ export async function getRemapperContext(app, language, options, context) {
         language,
     });
     const appVariables = await getAppVariables({ context, app });
-    const appMemberInfo = await getCurrentAppMember({ context });
+    const appMemberInfo = await getCurrentAppMember({ context, app });
     const cache = objectCache((message) => new IntlMessageFormat(message, language, undefined, {
         formatters: {
             // XXX: idk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/node-utils",
-  "version": "0.33.10",
+  "version": "0.34.0",
   "description": "NodeJS utilities used by Appsemble internally.",
   "keywords": [
     "app",
@@ -40,9 +40,9 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.33.10",
-    "@appsemble/utils": "0.33.10",
-    "@appsemble/lang-sdk": "0.33.10",
+    "@appsemble/types": "0.34.0",
+    "@appsemble/utils": "0.34.0",
+    "@appsemble/lang-sdk": "0.34.0",
     "@formatjs/fast-memoize": "^2.0.0",
     "@fortawesome/fontawesome-free": "^6.0.0",
     "@kubernetes/client-node": "^0.22.2",

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

@@ -1,3 +1,3 @@
 import { type Middleware } from 'koa';
 import { type Options } from '../../../../types.js';
-export declare function createGetCurrentAppMemberController({ getCurrentAppMember }: Options): Middleware;
+export declare function createGetCurrentAppMemberController({ getApp, getCurrentAppMember, }: Options): Middleware;

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

@@ -1,6 +1,11 @@
-export function createGetCurrentAppMemberController({ getCurrentAppMember }) {
+export function createGetCurrentAppMemberController({ getApp, getCurrentAppMember, }) {
     return async (ctx) => {
-        ctx.body = await getCurrentAppMember({ context: ctx });
+        const { appId } = ctx.pathParams;
+        const app = await getApp({
+            context: ctx,
+            query: { where: { id: appId }, attributes: ['id'] },
+        });
+        ctx.body = await getCurrentAppMember({ context: ctx, app });
     };
 }
 //# sourceMappingURL=createGetCurrentAppMemberController.js.map

package/server/controllers/common/apps/resources/createCountAppResourcesController.js

@@ -20,7 +20,6 @@ export function createCountAppResourcesController(options) {
                     where || {},
                     {
                         type: resourceType,
-                        AppId: appId,
                         GroupId: selectedGroupId ?? null,
                         expires: { or: [{ gt: new Date() }, null] },
                         ...(app.demoMode ? { seed: false, ephemeral: true } : {}),

package/server/controllers/common/apps/resources/createDeleteAppResourceController.js

@@ -8,7 +8,6 @@ export function createDeleteAppResourceController(options) {
             where: {
                 id: resourceId,
                 type: resourceType,
-                AppId: appId,
                 GroupId: selectedGroupId ?? null,
                 expires: { or: [{ gt: new Date() }, { eq: null }] },
                 ...(app.demoMode ? { seed: false, ephemeral: true } : {}),

package/server/controllers/common/apps/resources/createGetAppResourceByIdController.js

@@ -9,7 +9,6 @@ export function createGetAppResourceByIdController(options) {
             where: {
                 id: resourceId,
                 type: resourceType,
-                AppId: appId,
                 GroupId: selectedGroupId ?? null,
                 expires: { or: [{ gt: new Date() }, null] },
                 ...(app.demoMode ? { seed: false, ephemeral: true } : {}),

package/server/controllers/common/apps/resources/createQueryAppResourcesController.js

@@ -30,7 +30,6 @@ export function createQueryAppResourcesController(options) {
                     where,
                     {
                         type: resourceType,
-                        AppId: appId,
                         GroupId: selectedGroupId ?? null,
                         expires: { or: [{ gt: new Date() }, null] },
                         ...(app.demoMode && !isSameOrigin ? { seed: false, ephemeral: true } : {}),

package/server/controllers/common/apps/resources/createUpdateAppResourceController.js

@@ -8,7 +8,6 @@ export function createUpdateAppResourceController(options) {
             where: {
                 id: resourceId,
                 type: resourceType,
-                AppId: appId,
                 GroupId: selectedGroupId ?? null,
                 expires: { or: [{ gt: new Date() }, null] },
                 ...(app.demoMode ? { seed: false, ephemeral: true } : {}),

package/server/routes/appRouter/serviceWorkerHandler.js

@@ -12,7 +12,7 @@ export function createServiceWorkerHandler({ getApp, getBlocksAssetsPaths }) {
         assertKoaCondition(app != null, ctx, 404, 'App does not exist.');
         const identifiableBlocks = getAppBlocks(app.definition);
         const blocksAssetsPaths = await getBlocksAssetsPaths({ identifiableBlocks, context: ctx });
-        ctx.body = `const blockAssets=${JSON.stringify(blocksAssetsPaths)};${serviceWorker}`;
+        ctx.body = `const appVersion = ${app.version};const blockAssets=${JSON.stringify(blocksAssetsPaths)};${serviceWorker}`;
         ctx.type = 'application/javascript';
     };
 }

package/server/types.d.ts

@@ -206,6 +206,7 @@ export interface GetCspParams {
 }
 export interface GetCurrentAppMemberParams {
     context: ParameterizedContext<DefaultState, DefaultContextInterface, any>;
+    app: App;
 }
 export interface GetCurrentAppMemberGroupsParams {
     context: ParameterizedContext<DefaultState, DefaultContextInterface, any>;
@@ -244,6 +245,7 @@ export interface ReloadUserParams {
     context: ParameterizedContext<DefaultState, DefaultContextInterface, any>;
 }
 export interface ParseQueryParams {
+    tableName: string;
     $filter: string;
     $orderby: string;
     resourceDefinition: ResourceDefinition;

package/server/utils/resources.js

@@ -9,6 +9,7 @@ export function generateResourceQuery(ctx, { parseQuery }, resourceDefinition) {
             $orderby: ctx.queryParams.$orderby,
             // @ts-expect-error 2322 null is not assignable to type (strictNullChecks)
             resourceDefinition,
+            tableName: 'Resource',
         });
     }
     catch (error) {
@@ -29,7 +30,6 @@ export async function deleteResourcesRecursively(type, app, options, context) {
         attributes: ['id'],
         where: {
             type,
-            AppId: app.id,
             or: [{ seed: true }, { ephemeral: true }],
         },
     };