@strapi/strapi 0.0.0-e6cac9fe30 → 0.0.0-fd8e4c6bfa

package/README.md

@@ -13,7 +13,7 @@
     <img src="https://img.shields.io/npm/v/@strapi/strapi/latest.svg" alt="NPM Version" />
   </a>
   <a href="https://github.com/strapi/strapi/actions/workflows/tests.yml">
-    <img src="https://github.com/strapi/strapi/actions/workflows/tests.yml/badge.svg?branch=master" alt="Tests" />
+    <img src="https://github.com/strapi/strapi/actions/workflows/tests.yml/badge.svg?branch=main" alt="Tests" />
   </a>
   <a href="https://discord.strapi.io">
     <img src="https://img.shields.io/discord/811989166782021633?label=Discord" alt="Strapi on Discord" />

package/lib/core-api/service/index.d.ts

@@ -12,11 +12,14 @@ export interface SingleTypeService extends BaseService {
 
 export interface CollectionTypeService extends BaseService {
   find?(params: object): Promise<Entity[]> | Entity;
-  findOne?(entityId: string,params: object): Promise<Entity> | Entity;
+  findOne?(entityId: string, params: object): Promise<Entity> | Entity;
   create?(params: object): Promise<Entity> | Entity;
-  update?(entityId: string,params: object): Promise<Entity> | Entity;
-  delete?(entityId: string,params: object): Promise<Entity> | Entity;
+  update?(entityId: string, params: object): Promise<Entity> | Entity;
+  delete?(entityId: string, params: object): Promise<Entity> | Entity;
 }
 
 export type Service = SingleTypeService | CollectionTypeService;
 
+export type GenericService = Partial<Service> & {
+  [method: string | number | symbol]: <T = any>(...args: any) => T;
+};

package/lib/middlewares/body.js

@@ -23,12 +23,19 @@ function getFiles(ctx) {
 /**
  * @type {import('./').MiddlewareFactory}
  */
-module.exports = (config) => {
+
+module.exports = (config, { strapi }) => {
   const bodyConfig = defaultsDeep(defaults, config);
 
+  let gqlEndpoint;
+  if (strapi.plugin('graphql')) {
+    const { config: gqlConfig } = strapi.plugin('graphql');
+    gqlEndpoint = gqlConfig('endpoint');
+  }
+
   return async (ctx, next) => {
     // TODO: find a better way later
-    if (ctx.url === '/graphql') {
+    if (gqlEndpoint && ctx.url === gqlEndpoint) {
       await next();
     } else {
       try {

package/lib/middlewares/cors.js

@@ -33,7 +33,7 @@ module.exports = (config) => {
 
       const requestOrigin = ctx.accept.headers.origin;
       if (whitelist.includes('*')) {
-        return '*';
+        return credentials ? requestOrigin : '*';
       }
 
       if (!whitelist.includes(requestOrigin)) {

package/lib/middlewares/security.js

@@ -30,22 +30,28 @@ const defaults = {
 /**
  * @type {import('./').MiddlewareFactory}
  */
-module.exports = (config) => (ctx, next) => {
-  let helmetConfig = defaultsDeep(defaults, config);
 
-  if (
-    ctx.method === 'GET' &&
-    ['/graphql', '/documentation'].some((str) => ctx.path.startsWith(str))
-  ) {
-    helmetConfig = merge(helmetConfig, {
-      contentSecurityPolicy: {
-        directives: {
-          'script-src': ["'self'", "'unsafe-inline'", 'cdn.jsdelivr.net'],
-          'img-src': ["'self'", 'data:', 'cdn.jsdelivr.net', 'strapi.io'],
+module.exports =
+  (config, { strapi }) =>
+  (ctx, next) => {
+    let helmetConfig = defaultsDeep(defaults, config);
+    const specialPaths = ['/documentation'];
+
+    if (strapi.plugin('graphql')) {
+      const { config: gqlConfig } = strapi.plugin('graphql');
+      specialPaths.push(gqlConfig('endpoint'));
+    }
+
+    if (ctx.method === 'GET' && specialPaths.some((str) => ctx.path.startsWith(str))) {
+      helmetConfig = merge(helmetConfig, {
+        contentSecurityPolicy: {
+          directives: {
+            'script-src': ["'self'", "'unsafe-inline'", 'cdn.jsdelivr.net'],
+            'img-src': ["'self'", 'data:', 'cdn.jsdelivr.net', 'strapi.io'],
+          },
         },
-      },
-    });
-  }
+      });
+    }
 
-  return helmet(helmetConfig)(ctx, next);
-};
+    return helmet(helmetConfig)(ctx, next);
+  };

package/lib/services/entity-service/index.js

@@ -228,7 +228,19 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     // select / populate
     const query = transformParamsToQuery(uid, wrappedParams);
 
-    return db.query(uid).deleteMany(query);
+    const entitiesToDelete = await db.query(uid).findMany(query);
+
+    if (!entitiesToDelete.length) {
+      return null;
+    }
+
+    const deletedEntities = await db.query(uid).deleteMany(query);
+    await Promise.all(entitiesToDelete.map((entity) => deleteComponents(uid, entity)));
+
+    // Trigger webhooks. One for each entity
+    await Promise.all(entitiesToDelete.map((entity) => this.emitEvent(uid, ENTRY_DELETE, entity)));
+
+    return deletedEntities;
   },
 
   load(uid, entity, field, params = {}) {

package/lib/types/core/strapi/index.d.ts

@@ -2,7 +2,8 @@ import type Koa from 'koa';
 import { Database } from '@strapi/database';
 
 import type { StringMap } from './utils';
-import type { GenericController } from '../core-api/controller'
+import type { GenericController } from '../../../core-api/controller'
+import type { GenericService } from '../../../core-api/service'
 
 /**
  * The Strapi interface implemented by the main Strapi class.
@@ -33,12 +34,12 @@ export interface Strapi {
    *
    * It returns all the registered services
    */
-  readonly services: StringMap<Service>;
+  readonly services: StringMap<GenericService>;
 
   /**
    * Find a service using its unique identifier
    */
-  service<T extends Service = unknown>(uid: string): T | undefined;
+  service<T extends GenericService = GenericService>(uid: string): T | undefined;
 
   /**
    * Getter for the Strapi controllers container

package/lib/types/factories.d.ts

@@ -1,4 +1,4 @@
-import { Service } from '../core-api/service';
+import { Service,GenericService } from '../core-api/service';
 import { Controller, GenericController } from '../core-api/controller';
 import { Middleware } from '../middlewares';
 import { Policy } from '../core/registries/policies';
@@ -47,14 +47,14 @@ interface Router {
 type ControllerCallback<T extends GenericController = GenericController> = (params: {
   strapi: Strapi;
 }) => T;
-type ServiceCallback<T extends Service = Service> = (params: { strapi: Strapi }) => T;
+type ServiceCallback<T extends GenericService = GenericService> = (params: { strapi: Strapi }) => T;
 
 export function createCoreRouter(uid: string, cfg?: RouterConfig = {}): () => Router;
 export function createCoreController<T extends GenericController = GenericController>(
   uid: string,
   cfg?: ControllerCallback<T> | T = {}
 ): () => T & Controller;
-export function createCoreService<T extends Service = Service>(
+export function createCoreService<T extends GenericService = GenericService>(
   uid: string,
   cfg?: ServiceCallback<T> | T = {}
 ): () => T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "0.0.0-e6cac9fe30",
+  "version": "0.0.0-fd8e4c6bfa",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -80,17 +80,17 @@
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "0.0.0-e6cac9fe30",
-    "@strapi/database": "0.0.0-e6cac9fe30",
-    "@strapi/generate-new": "0.0.0-e6cac9fe30",
-    "@strapi/generators": "0.0.0-e6cac9fe30",
-    "@strapi/logger": "0.0.0-e6cac9fe30",
-    "@strapi/plugin-content-manager": "0.0.0-e6cac9fe30",
-    "@strapi/plugin-content-type-builder": "0.0.0-e6cac9fe30",
-    "@strapi/plugin-email": "0.0.0-e6cac9fe30",
-    "@strapi/plugin-upload": "0.0.0-e6cac9fe30",
-    "@strapi/typescript-utils": "0.0.0-e6cac9fe30",
-    "@strapi/utils": "0.0.0-e6cac9fe30",
+    "@strapi/admin": "0.0.0-fd8e4c6bfa",
+    "@strapi/database": "0.0.0-fd8e4c6bfa",
+    "@strapi/generate-new": "0.0.0-fd8e4c6bfa",
+    "@strapi/generators": "0.0.0-fd8e4c6bfa",
+    "@strapi/logger": "0.0.0-fd8e4c6bfa",
+    "@strapi/plugin-content-manager": "0.0.0-fd8e4c6bfa",
+    "@strapi/plugin-content-type-builder": "0.0.0-fd8e4c6bfa",
+    "@strapi/plugin-email": "0.0.0-fd8e4c6bfa",
+    "@strapi/plugin-upload": "0.0.0-fd8e4c6bfa",
+    "@strapi/typescript-utils": "0.0.0-fd8e4c6bfa",
+    "@strapi/utils": "0.0.0-fd8e4c6bfa",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -139,5 +139,5 @@
     "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "e6cac9fe309b80c9c59cde56d6b25fc6cd40bc8d"
+  "gitHead": "fd8e4c6bfa2fd687a3c62f8428e00f3b320c32c2"
 }