@appsemble/node-utils 0.30.3 → 0.30.9

package/README.md

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

package/package.json

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

package/server/controllers/apps/members/current/groups/createGetCurrentAppMemberGroupsController.d.ts

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

package/server/controllers/apps/members/current/groups/createGetCurrentAppMemberGroupsController.js

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

package/server/controllers/apps/members/current/groups/index.d.ts

@@ -0,0 +1 @@
+export * from './createGetCurrentAppMemberGroupsController.js';

package/server/controllers/apps/members/current/groups/index.js

@@ -0,0 +1,2 @@
+export * from './createGetCurrentAppMemberGroupsController.js';
+//# sourceMappingURL=index.js.map

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

@@ -1 +1,2 @@
 export { createGetCurrentAppMemberController } from './createGetCurrentAppMemberController.js';
+export { createGetCurrentAppMemberGroupsController } from './groups/index.js';

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

@@ -1,2 +1,3 @@
 export { createGetCurrentAppMemberController } from './createGetCurrentAppMemberController.js';
+export { createGetCurrentAppMemberGroupsController } from './groups/index.js';
 //# sourceMappingURL=index.js.map

package/server/controllers/common/apps/assets/createGetAppAssetByIdController.d.ts

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

package/server/controllers/common/apps/assets/createGetAppAssetByIdController.js

@@ -1,14 +1,11 @@
 import { extension } from 'mime-types';
 import { assertKoaError } from '../../../../../koa.js';
-export function createGetAppAssetByIdController({ getApp, getAppAssets }) {
+export function createGetAppAssetByIdController({ getApp, getAppAsset }) {
     return async (ctx) => {
         const { pathParams: { appId, assetId }, } = ctx;
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
         assertKoaError(!app, ctx, 404, 'App not found');
-        const assets = await getAppAssets({ app, context: ctx });
-        // Pick asset id over asset name
-        const asset = assets.find((a) => a.id === assetId) || assets.find((a) => a.name === assetId);
-        assertKoaError(!asset, ctx, 404, 'Asset not found');
+        const asset = await getAppAsset({ app, context: ctx, id: assetId });
         if (assetId !== asset.id) {
             // Redirect to asset using current asset ID
             ctx.status = 302;

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

@@ -14,6 +14,7 @@ export function createCountAppResourcesController(options) {
         });
         const { where } = generateResourceQuery(ctx, options);
         const findOptions = {
+            attributes: ['id'],
             where: {
                 and: [
                     where || {},

package/server/types.d.ts

@@ -97,7 +97,7 @@ declare module 'koas-parameters' {
         assets: boolean;
         screenshots: boolean;
         readmes: boolean;
-        roles: string[] | string;
+        roles?: string;
         includeMessages: boolean;
         demo: boolean;
         selectedGroupId: number;
@@ -202,6 +202,10 @@ export interface GetCspParams {
 export interface GetCurrentAppMemberParams {
     context: ParameterizedContext<DefaultState, DefaultContextInterface, any>;
 }
+export interface GetCurrentAppMemberGroupsParams {
+    context: ParameterizedContext<DefaultState, DefaultContextInterface, any>;
+    app: App;
+}
 export type ResourceAction = 'create' | 'delete' | 'update';
 export type Action = ResourceAction | 'count' | 'get' | 'patch' | 'query';
 export interface ApplyAppServiceSecretsParams {
@@ -244,6 +248,9 @@ export interface GetAppResourceParams extends GetAppSubEntityParams {
     type: string;
     id: number | string;
 }
+export interface GetAppAssetParams extends GetAppSubEntityParams {
+    id: string;
+}
 export interface GetAppResourcesParams extends GetAppSubEntityParams {
     findOptions: FindOptions;
     type: string;
@@ -343,6 +350,7 @@ export interface ParsedQuery {
 export type ContentSecurityPolicy = Record<string, (string | false)[]>;
 export interface Options {
     getCurrentAppMember: (params: GetCurrentAppMemberParams) => Promise<AppMemberInfo>;
+    getCurrentAppMemberGroups: (params: GetCurrentAppMemberGroupsParams) => Promise<Group[]>;
     getApp: (params: GetAppParams) => Promise<App>;
     getAppDetails: (params: GetAppParams) => Promise<AppDetails>;
     getAppMessages: (params: GetAppMessagesParams) => Promise<AppMessages[]>;
@@ -374,7 +382,8 @@ export interface Options {
     createAppResourcesWithAssets: (params: CreateAppResourcesWithAssetsParams) => Promise<Resource[]>;
     updateAppResource: (params: UpdateAppResourceParams) => Promise<Resource | null>;
     deleteAppResource: (params: DeleteAppResourceParams) => Promise<void>;
-    getAppAssets: (params: GetAppSubEntityParams) => Promise<AppAsset[]>;
+    getAppAssets: (params: GetAppSubEntityParams) => Promise<Asset[]>;
+    getAppAsset: (params: GetAppAssetParams) => Promise<AppAsset>;
     createAppAsset: (params: CreateAppAssetParams) => Promise<AppAsset>;
     deleteAppAsset: (params: DeleteAppAssetParams) => Promise<number>;
     email: (params: EmailParams) => Promise<void>;

package/server/utils/resources.js

@@ -26,6 +26,7 @@ export async function deleteResourcesRecursively(type, app, options, context) {
         await deleteResourcesRecursively(referencingResourceType, app, options, context);
     }
     const resourcesToDeleteFindOptions = {
+        attributes: ['id'],
         where: {
             type,
             AppId: app.id,