@appsemble/node-utils 0.24.8 → 0.24.10

package/README.md

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

package/app.js

@@ -42,6 +42,7 @@ export async function getRemapperContext(app, language, userInfo, options, conte
             return cache(message || `'{${id}}'`);
         },
         userInfo,
+        appMember: userInfo === null || userInfo === void 0 ? void 0 : userInfo.appMember,
         context: {},
         locale: (_b = (_a = userInfo === null || userInfo === void 0 ? void 0 : userInfo.locale) !== null && _a !== void 0 ? _a : app.definition.defaultLanguage) !== null && _b !== void 0 ? _b : defaultLocale,
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/node-utils",
-  "version": "0.24.8",
+  "version": "0.24.10",
   "description": "NodeJS utilities used by Appsemble internally.",
   "keywords": [
     "app",
@@ -38,8 +38,8 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.24.8",
-    "@appsemble/utils": "0.24.8",
+    "@appsemble/types": "0.24.10",
+    "@appsemble/utils": "0.24.10",
     "@formatjs/fast-memoize": "^2.0.0",
     "@fortawesome/fontawesome-free": "^6.0.0",
     "@koa/cors": "^4.0.0",

package/resource.d.ts

@@ -35,10 +35,14 @@ export declare function extractResourceBody(ctx: Context): [Record<string, unkno
  * @param definition The resource definition to use for processing the request body.
  * @param knownAssetIds A list of asset IDs that are already known to be linked to the resource.
  * @param knownExpires A previously known expires value.
+ * @param knownAssetNameIds A list of asset ids with asset names that already exist.
  * @returns A tuple which consists of:
  *
  *   1. One or more resources processed from the request body.
  *   2. A list of newly uploaded assets which should be linked to the resources.
  *   3. Asset IDs from the `knownAssetIds` array which are no longer used.
  */
-export declare function processResourceBody(ctx: Context, definition: ResourceDefinition, knownAssetIds?: string[], knownExpires?: Date): [Record<string, unknown> | Record<string, unknown>[], PreparedAsset[], string[]];
+export declare function processResourceBody(ctx: Context, definition: ResourceDefinition, knownAssetIds?: string[], knownExpires?: Date, knownAssetNameIds?: {
+    id: string;
+    name: string;
+}[]): [Record<string, unknown> | Record<string, unknown>[], PreparedAsset[], string[]];

package/resource.js

@@ -90,13 +90,14 @@ export function extractResourceBody(ctx) {
  * @param definition The resource definition to use for processing the request body.
  * @param knownAssetIds A list of asset IDs that are already known to be linked to the resource.
  * @param knownExpires A previously known expires value.
+ * @param knownAssetNameIds A list of asset ids with asset names that already exist.
  * @returns A tuple which consists of:
  *
  *   1. One or more resources processed from the request body.
  *   2. A list of newly uploaded assets which should be linked to the resources.
  *   3. Asset IDs from the `knownAssetIds` array which are no longer used.
  */
-export function processResourceBody(ctx, definition, knownAssetIds = [], knownExpires) {
+export function processResourceBody(ctx, definition, knownAssetIds = [], knownExpires, knownAssetNameIds = []) {
     const [resource, assets, preValidateProperty] = extractResourceBody(ctx);
     const validator = new Validator();
     const assetIdMap = new Map();
@@ -113,6 +114,11 @@ export function processResourceBody(ctx, definition, knownAssetIds = [], knownEx
             reusedAssets.add(input);
             return true;
         }
+        const assetNameId = knownAssetNameIds.find((idName) => idName.name === input);
+        if (assetNameId) {
+            reusedAssets.add(assetNameId.id);
+            return true;
+        }
         if (!/^\d+$/.test(input)) {
             return false;
         }

package/server/controllers/appMembers.js

@@ -1,11 +1,11 @@
 import { assertKoaError } from '../../koa.js';
 export function createGetAppMember({ getApp, getAppMembers }) {
     return async (ctx) => {
-        const { pathParams: { appId, memberId }, } = ctx;
+        const { pathParams: { appId, userId }, } = ctx;
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
         assertKoaError(!app, ctx, 404, 'App not found');
         assertKoaError(app.definition.security === undefined, ctx, 404, 'App does not have a security definition');
-        const appMembers = await getAppMembers({ context: ctx, app, memberId });
+        const appMembers = await getAppMembers({ context: ctx, app, userId });
         assertKoaError(appMembers.length !== 1, ctx, 404, 'App member not found');
         ctx.body = appMembers[0];
     };

package/server/controllers/resources.js

@@ -157,13 +157,14 @@ export function createGetResourceById(options) {
 export function createCreateResource(options) {
     return async (ctx) => {
         const { pathParams: { appId, resourceType }, } = ctx;
-        const { checkSeededResources, createAppResourcesWithAssets, getApp, verifyResourceActionPermission, } = options;
+        const { checkSeededResources, createAppResourcesWithAssets, getApp, getAppAssets, verifyResourceActionPermission, } = options;
         const action = 'create';
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
         const resourceSeeded = await checkSeededResources({ context: ctx, app, resourceType });
         const resourceDefinition = getResourceDefinition(app, resourceType, ctx);
         await verifyResourceActionPermission({ app, context: ctx, action, resourceType, options, ctx });
-        const [processedBody, preparedAssets] = processResourceBody(ctx, resourceDefinition);
+        const appAssets = await getAppAssets({ app, context: ctx });
+        const [processedBody, preparedAssets] = processResourceBody(ctx, resourceDefinition, undefined, undefined, appAssets.map((appAsset) => ({ id: appAsset.id, name: appAsset.name })));
         if (Array.isArray(processedBody) && !processedBody.length) {
             ctx.body = [];
             return;

package/server/controllers/resources.test.js

@@ -12,6 +12,7 @@ let mockGetAppUrl;
 let mockGetAppMessages;
 let mockCreateAppResourcesWithAssets;
 let mockCheckSeededResources;
+let mockGetAppAssets;
 let mockCtx;
 let mockCtxIs;
 describe('createQueryResources', () => {
@@ -429,6 +430,7 @@ describe('createCreateResource', () => {
         mockVerifyResourceActionPermission = vi.fn();
         mockCreateAppResourcesWithAssets = vi.fn();
         mockCheckSeededResources = vi.fn();
+        mockGetAppAssets = vi.fn();
         mockCtxIs = vi.fn();
         mockCtx = {
             pathParams: { appId: 1, resourceType: 'mockResourceType' },
@@ -452,11 +454,13 @@ describe('createCreateResource', () => {
         mockCtxIs.mockReturnValue('multipart/form-data');
         mockCreateAppResourcesWithAssets.mockResolvedValue(mockResources);
         mockCheckSeededResources.mockResolvedValue(false);
+        mockGetAppAssets.mockResolvedValue([]);
         const middleware = createCreateResource({
             getApp: mockGetApp,
             createAppResourcesWithAssets: mockCreateAppResourcesWithAssets,
             verifyResourceActionPermission: mockVerifyResourceActionPermission,
             checkSeededResources: mockCheckSeededResources,
+            getAppAssets: mockGetAppAssets,
         });
         await middleware(mockCtx, vi.fn());
         expect(mockGetApp).toHaveBeenCalledWith(expect.objectContaining({
@@ -511,11 +515,13 @@ describe('createCreateResource', () => {
         mockCtxIs.mockReturnValue('multipart/form-data');
         mockCreateAppResourcesWithAssets.mockResolvedValue(mockResources);
         mockCheckSeededResources.mockResolvedValue(false);
+        mockGetAppAssets.mockResolvedValue([]);
         const middleware = createCreateResource({
             getApp: mockGetApp,
             createAppResourcesWithAssets: mockCreateAppResourcesWithAssets,
             verifyResourceActionPermission: mockVerifyResourceActionPermission,
             checkSeededResources: mockCheckSeededResources,
+            getAppAssets: mockGetAppAssets,
         });
         await middleware(mockCtx, vi.fn());
         expect(mockGetApp).toHaveBeenCalledWith(expect.objectContaining({

package/server/types.d.ts

@@ -132,7 +132,7 @@ export interface GetAppMessagesParams extends GetAppSubEntityParams {
     merge?: string[] | string;
 }
 export interface GetAppMembersParams extends GetAppSubEntityParams {
-    memberId: string;
+    userId: string;
 }
 export interface GetAppUserInfoParams {
     context: ParameterizedContext<DefaultState, DefaultContextInterface, any>;