Merge pull request #276 from strapi/fix-users-content-type

Add support for user content type and file content type

src/clean-data.js

@@ -151,12 +151,13 @@ export const cleanAttributes = (attributes, currentSchema, schemas) => {
  * @param {Object} ctx
  * @returns {Object}
  */
-export const cleanData = ({ id, attributes }, ctx) => {
+export const cleanData = ({ id, attributes, ...rest }, ctx) => {
  const { schemas, contentTypeUid } = ctx;
  const currentContentTypeSchema = getContentTypeSchema(schemas, contentTypeUid);
 
  return {
  id,
+ ...rest,
  ...cleanAttributes(attributes, currentContentTypeSchema, schemas),
  };
 };

src/download-media-files.js

@@ -47,7 +47,7 @@ const extractFiles = (text, apiURL) => {
  * @param {Object} ctx
  * @returns {String} node Id
  */
-const downloadFile = async (file, ctx) => {
+export const downloadFile = async (file, ctx) => {
  const {
  actions: { createNode, touchNode },
  cache,

src/fetch.js

@@ -66,15 +66,17 @@ const fetchEntities = async ({ endpoint, queryParams, uid }, ctx) => {
  `Starting to fetch data from Strapi - ${opts.url} with ${JSON.stringify(opts.params)}`
  );
 
- const {
- data: { data, meta },
- } = await axiosInstance(opts);
+ const { data: response } = await axiosInstance(opts);
 
- const page = parseInt(meta.pagination.page);
+ const data = response?.data || response;
+ const meta = response?.meta;
 
- const pagesToGet = Array.from({ length: parseInt(meta.pagination.pageCount, 10) - page }).map(
- (_, i) => i + page + 1
- );
+ const page = parseInt(meta?.pagination.page || 1, 10);
+ const pageCount = parseInt(meta?.pagination.pageCount || 1, 10);
+
+ const pagesToGet = Array.from({
+ length: pageCount - page,
+ }).map((_, i) => i + page + 1);
 
  const arrayOfPromises = pagesToGet.map((page) => {
  return (async () => {