@strapi/admin 5.0.0-beta.2 → 5.0.0-beta.3

package/dist/server/index.mjs

@@ -542,7 +542,7 @@ const apiTokenAuthStrategy = {
   verify: verify$2
 };
 const register$1 = ({ strapi: strapi2 }) => {
-  const passportMiddleware = strapi2.admin?.services.passport.init();
+  const passportMiddleware = strapi2.service("admin::passport").init();
   strapi2.server.api("admin").use(passportMiddleware);
   strapi2.get("auth").register("admin", adminAuthStrategy);
   strapi2.get("auth").register("content-api", apiTokenAuthStrategy);
@@ -1482,7 +1482,7 @@ const isAPluginName = yup.string().test("is-a-plugin-name", "is not a plugin nam
   return [void 0, "admin", ...Object.keys(strapi.plugins)].includes(value) ? true : this.createError({ path: this.path, message: `${this.path} is not an existing plugin` });
 });
 const arrayOfConditionNames = yup.array().of(yup.string()).test("is-an-array-of-conditions", "is not a plugin name", function(value) {
-  const ids = strapi.admin.services.permission.conditionProvider.keys();
+  const ids = strapi.service("admin::permission").conditionProvider.keys();
   return _$1.isUndefined(value) || _$1.difference(value, ids).length === 0 ? true : this.createError({ path: this.path, message: `contains conditions that don't exist` });
 });
 const permissionsAreEquals = (a, b) => a.action === b.action && (a.subject === b.subject || _$1.isNil(a.subject) && _$1.isNil(b.subject));
@@ -2211,19 +2211,19 @@ const authEventsMapper = {
 };
 const valueIsFunctionType = ([, value]) => isFunction(value);
 const keyIsValidEventName = ([key]) => {
-  return Object.keys(strapi.admin.services.passport.authEventsMapper).includes(key);
+  return Object.keys(strapi.service("admin::passport").authEventsMapper).includes(key);
 };
 const getPassportStrategies = () => [createLocalStrategy(strapi)];
 const registerAuthEvents = () => {
   const { events = {} } = strapi.config.get("admin.auth", {});
-  const { authEventsMapper: authEventsMapper2 } = strapi.admin.services.passport;
+  const { authEventsMapper: authEventsMapper2 } = strapi.service("admin::passport");
   const eventList = Object.entries(events).filter(keyIsValidEventName).filter(valueIsFunctionType);
   for (const [eventName, handler] of eventList) {
     strapi.eventHub.on(authEventsMapper2[eventName], handler);
   }
 };
 const init = () => {
-  strapi.admin.services.passport.getPassportStrategies().forEach((strategy) => passport$1.use(strategy));
+  strapi.service("admin::passport").getPassportStrategies().forEach((strategy) => passport$1.use(strategy));
   registerAuthEvents();
   return passport$1.initialize();
 };
@@ -3858,7 +3858,7 @@ const flattenTokenPermissions = (token2) => {
   };
 };
 const assertTokenPermissionsValidity = (attributes) => {
-  const permissionService = strapi.admin.services.transfer.permission;
+  const permissionService = strapi.service("admin::transfer").permission;
   const validPermissions = permissionService.providers.action.keys();
   const invalidPermissions = difference(attributes.permissions, validPermissions);
   if (!isEmpty(invalidPermissions)) {
@@ -3930,10 +3930,10 @@ const parseFilesData = async (files) => {
       if (!file) {
         return;
       }
-      const getStream = () => fs.createReadStream(file.path);
+      const getStream = () => fs.createReadStream(file.filepath);
       formatedFilesData[inputName] = await strapi.plugin("upload").service("upload").formatFileInfo({
-        filename: file.name,
-        type: file.type,
+        filename: file.originalFilename,
+        type: file.mimetype,
         size: file.size
       });
       Object.assign(
@@ -3942,7 +3942,7 @@ const parseFilesData = async (files) => {
       );
       Object.assign(formatedFilesData[inputName], {
         stream: getStream(),
-        tmpPath: file.path,
+        tmpPath: file.filepath,
         // TODO
         // @ts-expect-error define the correct return type
         provider: strapi.config.get("plugin::upload").provider
@@ -4064,8 +4064,8 @@ const updateProjectSettings = z.object({
   authLogo: z.string().nullish()
 }).strict();
 const updateProjectSettingsLogo = z.object({
-  name: z.string().nullish(),
-  type: z.enum(["image/jpeg", "image/png", "image/svg+xml"]),
+  originalFilename: z.string().nullish(),
+  mimetype: z.enum(["image/jpeg", "image/png", "image/svg+xml"]),
   size: z.number().max(MAX_IMAGE_FILE_SIZE).nullish()
 });
 const updateProjectSettingsFiles = z.object({
@@ -4562,7 +4562,7 @@ const roleCreateSchema = yup.object().shape({
 const rolesDeleteSchema = yup.object().shape({
   ids: yup.array().of(yup.strapiID()).min(1).required().test("roles-deletion-checks", "Roles deletion checks have failed", async function(ids) {
     try {
-      await strapi.admin.services.role.checkRolesIdForDeletion(ids);
+      await strapi.service("admin::role").checkRolesIdForDeletion(ids);
     } catch (e) {
       return this.createError({ path: "ids", message: e.message });
     }
@@ -4571,7 +4571,7 @@ const rolesDeleteSchema = yup.object().shape({
 }).noUnknown();
 const roleDeleteSchema = yup.strapiID().required().test("no-admin-single-delete", "Role deletion checks have failed", async function(id) {
   try {
-    await strapi.admin.services.role.checkRolesIdForDeletion([id]);
+    await strapi.service("admin::role").checkRolesIdForDeletion([id]);
   } catch (e) {
     return this.createError({ path: "id", message: e.message });
   }
@@ -4873,7 +4873,7 @@ const user = {
   },
   async find(ctx) {
     const userService = getService("user");
-    const permissionsManager = strapi.admin.services.permission.createPermissionsManager({
+    const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
       ability: ctx.state.userAbility,
       model: "admin::user"
     });
@@ -4964,12 +4964,12 @@ const updateWebhookValidator = webhookValidator.shape({
 });
 const webhooks = {
   async listWebhooks(ctx) {
-    const webhooks2 = await strapi.webhookStore.findWebhooks();
+    const webhooks2 = await strapi.get("webhookStore").findWebhooks();
     ctx.send({ data: webhooks2 });
   },
   async getWebhook(ctx) {
     const { id } = ctx.params;
-    const webhook = await strapi.webhookStore.findWebhook(id);
+    const webhook = await strapi.get("webhookStore").findWebhook(id);
     if (!webhook) {
       return ctx.notFound("webhook.notFound");
     }
@@ -4978,36 +4978,36 @@ const webhooks = {
   async createWebhook(ctx) {
     const { body } = ctx.request;
     await validateYupSchema(webhookValidator)(body);
-    const webhook = await strapi.webhookStore.createWebhook(body);
-    strapi.webhookRunner.add(webhook);
+    const webhook = await strapi.get("webhookStore").createWebhook(body);
+    strapi.get("webhookRunner").add(webhook);
     ctx.created({ data: webhook });
   },
   async updateWebhook(ctx) {
     const { id } = ctx.params;
     const { body } = ctx.request;
     await validateYupSchema(updateWebhookValidator)(body);
-    const webhook = await strapi.webhookStore.findWebhook(id);
+    const webhook = await strapi.get("webhookStore").findWebhook(id);
     if (!webhook) {
       return ctx.notFound("webhook.notFound");
     }
-    const updatedWebhook = await strapi.webhookStore.updateWebhook(id, {
+    const updatedWebhook = await strapi.get("webhookStore").updateWebhook(id, {
       ...webhook,
       ...body
     });
     if (!updatedWebhook) {
       return ctx.notFound("webhook.notFound");
     }
-    strapi.webhookRunner.update(updatedWebhook);
+    strapi.get("webhookRunner").update(updatedWebhook);
     ctx.send({ data: updatedWebhook });
   },
   async deleteWebhook(ctx) {
     const { id } = ctx.params;
-    const webhook = await strapi.webhookStore.findWebhook(id);
+    const webhook = await strapi.get("webhookStore").findWebhook(id);
     if (!webhook) {
       return ctx.notFound("webhook.notFound");
     }
-    await strapi.webhookStore.deleteWebhook(id);
-    strapi.webhookRunner.remove(webhook);
+    await strapi.get("webhookStore").deleteWebhook(id);
+    strapi.get("webhookRunner").remove(webhook);
     ctx.body = { data: webhook };
   },
   async deleteWebhooks(ctx) {
@@ -5016,22 +5016,18 @@ const webhooks = {
       return ctx.badRequest("ids must be an array of id");
     }
     for (const id of ids) {
-      const webhook = await strapi.webhookStore.findWebhook(id);
+      const webhook = await strapi.get("webhookStore").findWebhook(id);
       if (webhook) {
-        await strapi.webhookStore.deleteWebhook(id);
-        strapi.webhookRunner.remove(webhook);
+        await strapi.get("webhookStore").deleteWebhook(id);
+        strapi.get("webhookRunner").remove(webhook);
       }
     }
     ctx.send({ data: ids });
   },
   async triggerWebhook(ctx) {
     const { id } = ctx.params;
-    const webhook = await strapi.webhookStore.findWebhook(id);
-    const response = await strapi.webhookRunner.run(
-      webhook,
-      "trigger-test",
-      {}
-    );
+    const webhook = await strapi.get("webhookStore").findWebhook(id);
+    const response = await strapi.get("webhookRunner").run(webhook, "trigger-test", {});
     ctx.body = { data: response };
   }
 };