@appsemble/node-utils 0.34.20 → 0.35.3-test.0

package/README.md

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

@@ -95,7 +95,7 @@ export async function deleteCompanionContainers(serviceName) {
 }
 export async function updateCompanionContainers(definitions, appName, appId, registry) {
     // If testing, don't create Kubernetes resources
-    if (process.env.TEST) {
+    if (process.env.NODE_ENV !== 'production') {
         return;
     }
     const { appsApi, coreApi } = getKubeConfig();

package/koa.js

@@ -14,6 +14,7 @@ function serializer() {
 }
 function bodyParser() {
     return koaBodyParser({
+        ignore: ['acceptPayment', 'acceptAppPayment'],
         parsers: {
             'application/scim+json': jsonParser,
             'application/x-www-form-urlencoded': xWwwFormUrlencodedParser,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/node-utils",
-  "version": "0.34.20",
+  "version": "0.35.3-test.0",
   "description": "NodeJS utilities used by Appsemble internally.",
   "keywords": [
     "app",
@@ -40,9 +40,9 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.34.20",
-    "@appsemble/utils": "0.34.20",
-    "@appsemble/lang-sdk": "0.34.20",
+    "@appsemble/types": "0.35.3-test.0",
+    "@appsemble/utils": "0.35.3-test.0",
+    "@appsemble/lang-sdk": "0.35.3-test.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

@@ -23,7 +23,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

@@ -11,7 +11,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

@@ -12,7 +12,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

@@ -7,7 +7,7 @@ export function createQueryAppResourcesController(options) {
         const { checkAppPermissions, getApp, getAppResources } = options;
         const app = await getApp({
             context: ctx,
-            query: { attributes: ['definition', 'demoMode', 'id'], where: { id: appId } },
+            query: { attributes: ['definition', 'demoMode', 'id', 'template'], where: { id: appId } },
         });
         const resourceDefinition = getResourceDefinition(app.definition, resourceType, ctx, view);
         const { order, where } = generateResourceQuery(ctx, options, resourceDefinition);
@@ -33,7 +33,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

@@ -5,13 +5,12 @@ export function createUpdateAppResourceController(options) {
         const { checkAppPermissions, getApp, getAppAssets, getAppResource, updateAppResource } = options;
         const app = await getApp({
             context: ctx,
-            query: { attributes: ['id', 'demoMode', 'definition'], where: { id: appId } },
+            query: { attributes: ['id', 'demoMode', 'definition', 'template'], where: { id: appId } },
         });
         const findOptions = {
             where: {
                 id: resourceId,
                 type: resourceType,
-                AppId: appId,
                 GroupId: selectedGroupId ?? null,
                 expires: { or: [{ gt: new Date() }, null] },
                 ...(app.demoMode ? { seed: false, ephemeral: true } : {}),

package/server/types.d.ts

@@ -65,6 +65,7 @@ declare module 'koas-parameters' {
         groupMemberId: string;
         appMemberId: string;
         organizationId: string;
+        organizationSubscriptionId: number;
         path: string;
         resourceId: number;
         resourceType: string;
@@ -91,14 +92,21 @@ declare module 'koas-parameters' {
         filter: string;
         $orderby?: string;
         $select: string;
+        organizationId: string;
         $top: number;
         $skip: number;
         code: string;
         count: number;
+        period: string;
+        subscriptionType: string;
+        price: string;
+        locale: string;
+        couponCode: string;
         startIndex: number;
         view: string;
         resources: boolean;
         assets: boolean;
+        organizationSubscriptionExpiresWithin: number;
         screenshots: boolean;
         readmes: boolean;
         roles?: string;
@@ -206,6 +214,7 @@ export interface GetCspParams {
 }
 export interface GetCurrentAppMemberParams {
     context: ParameterizedContext<DefaultState, DefaultContextInterface, any>;
+    app: App;
 }
 export interface GetCurrentAppMemberGroupsParams {
     context: ParameterizedContext<DefaultState, DefaultContextInterface, any>;
@@ -244,6 +253,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 }],
         },
     };