integreat 0.7.38 → 0.7.40

package/index.d.ts

@@ -25,7 +25,7 @@ declare namespace integreat {
   }
 
   export interface Meta {
-    queue?: boolean
+    queue?: boolean | number
     ident?: Ident
     [key: string]: unknown
   }

package/lib/actions/get.js

@@ -3,50 +3,76 @@ const appendToAction = require('../utils/appendToAction')
 const createUnknownServiceError = require('../utils/createUnknownServiceError')
 
 const hasCollectionEndpoint = (endpoints) =>
-  endpoints.some((endpoint) => endpoint.match && endpoint.match.scope === 'members')
+  endpoints.some(
+    (endpoint) => endpoint.match && endpoint.match.scope === 'members'
+  )
 
 const getIndividualItems = async (ids, action, getService) => {
-  const responses = await Promise.all(ids.map((id) => get(appendToAction(action, { id }), { getService })))
-  if (responses.some((response) => response.status !== 'ok' && response.status !== 'notfound')) {
-    return { status: 'error', error: `One or more of the requests for ids ${ids} failed.` }
+  const responses = await Promise.all(
+    ids.map((id) => get(appendToAction(action, { id }), { getService }))
+  )
+  if (
+    responses.some(
+      (response) => response.status !== 'ok' && response.status !== 'notfound'
+    )
+  ) {
+    return {
+      status: 'error',
+      error: `One or more of the requests for ids ${ids} failed.`,
+    }
   }
   return {
     status: 'ok',
     data: responses.reduce(
       (data, response) => [...data, ...[].concat(response.data)],
       []
-    )
+    ),
   }
 }
 
-const getIdFromPayload = ({ id }) =>
-  (Array.isArray(id) && id.length === 1) ? id[0] : id
+const getIdFromData = (data) =>
+  Array.isArray(data)
+    ? data.length === 1 && data[0]
+      ? data[0].id
+      : undefined
+    : data
+    ? data.id
+    : undefined
 
-function filterResponseData (data, id) {
+const getIdFromPayload = ({ id, data }) =>
+  Array.isArray(id) && id.length === 1 ? id[0] : id ? id : getIdFromData(data)
+
+function filterResponseData(data, id) {
   if (!id || !Array.isArray(data)) {
     return data
   }
   const ids = [].concat(id)
-  return data.filter(data => ids.includes(data.id))
+  return data.filter((data) => ids.includes(data.id))
 }
 
+const removeData = ({ type, payload: { data, ...payload }, meta }) => ({
+  type,
+  payload,
+  meta,
+})
+
 /**
  * Get several items from a service, based on the given action object.
  * @param {Object} action - payload and ident from the action object
  * @param {Object} resources - Object with getService
  * @returns {array} Array of data from the service
  */
-async function get (action, { getService } = {}) {
+async function get(action, { getService } = {}) {
   const {
     type,
     service: serviceId = null,
     onlyMappedValues = false,
     endpoint,
-    filterWithId = false
+    filterWithId = false,
   } = action.payload
 
-  const service = (typeof getService === 'function')
-    ? getService(type, serviceId) : null
+  const service =
+    typeof getService === 'function' ? getService(type, serviceId) : null
   if (!service) {
     return createUnknownServiceError(type, serviceId, 'GET')
   }
@@ -58,16 +84,20 @@ async function get (action, { getService } = {}) {
     return getIndividualItems(id, action, getService)
   }
 
-  const endpointDebug = (endpoint) ? `endpoint '${endpoint}'` : `endpoint matching type '${type}' and id '${id}'`
+  const endpointDebug = endpoint
+    ? `endpoint '${endpoint}'`
+    : `endpoint matching type '${type}' and id '${id}'`
   debug('GET: Fetch from service %s at %s', service.id, endpointDebug)
 
-  const { response } = await service.send(appendToAction(action, { id, onlyMappedValues }))
+  const { response } = await service.send(
+    appendToAction(removeData(action), { id, onlyMappedValues })
+  )
 
   return filterWithId
     ? {
-      ...response,
-      data: filterResponseData(response.data, id)
-    }
+        ...response,
+        data: filterResponseData(response.data, id),
+      }
     : response
 }
 

package/lib/actions/sync.js

@@ -267,21 +267,15 @@ async function transformData(
   useIndividualTransform
 ) {
   if (useIndividualTransform) {
-    const responses = await Promise.all(
+    return await Promise.all(
       data
         .map((item) =>
           dispatch(createTransformAction(transformParams, item, meta))
         )
         .map((p) => pLimit(1)(() => p))
     )
-    return responses.flatMap((response, index) =>
-      response.status === 'ok' ? response.data : data[index]
-    )
   } else {
-    const transformResponse = await dispatch(
-      createTransformAction(transformParams, data, meta)
-    )
-    return transformResponse.status === 'ok' ? transformResponse.data : data
+    return [await dispatch(createTransformAction(transformParams, data, meta))]
   }
 }
 
@@ -344,7 +338,7 @@ async function sync({ payload, meta = {} }, { dispatch, getService }) {
 
   // Dispatch transform action
   if (transformParams) {
-    data = await transformData(
+    const transformResults = await transformData(
       data,
       dispatch,
       transformParams,
@@ -352,6 +346,16 @@ async function sync({ payload, meta = {} }, { dispatch, getService }) {
       payload.useIndividualTransform
     )
 
+    if (transformResults.some((result) => result.status !== 'ok')) {
+      return transformResults.length === 1
+        ? transformResults[0]
+        : createError(makeErrorString(transformResults))
+    }
+
+    data = flatten(transformResults.map((result) => result.data)).filter(
+      Boolean
+    )
+
     if (data.length === 0 && payload.syncNoData !== true) {
       return createError(
         `No items to update from service '${fromParams[0].service}' after transform action`,

package/lib/integreat.js

@@ -5,7 +5,7 @@ const setupMapping = require('./mapping')
 const setupDispatch = require('./dispatch')
 const builtinActions = require('./actions')
 
-const version = '0.7.38'
+const version = '0.7.40'
 
 /**
  * Return an Integreat instance with a dispatch method.

package/lib/service/authenticate.js

@@ -2,8 +2,8 @@ const is = require('@sindresorhus/is')
 
 const generateErrorResponse = (status, error, access, authError) => ({
   status,
-  error: (authError) ? `${error}: ${authError}` : error,
-  access: { ...access, status: 'refused', scheme: 'service' }
+  error: authError ? `${error}: ${authError}` : error,
+  access: { ...access, status: 'refused', scheme: 'service' },
 })
 
 const responseFromAuthentication = (authentication, response, { access }) => {
@@ -11,18 +11,38 @@ const responseFromAuthentication = (authentication, response, { access }) => {
     case 'granted':
       return undefined
     case 'refused':
-      return generateErrorResponse('noaccess', 'Authentication was refused', access)
+      return generateErrorResponse(
+        'noaccess',
+        'Authentication was refused',
+        access
+      )
     case 'error':
     case 'timeout':
-      return generateErrorResponse('autherror', 'Could not authenticate', access, authentication.error)
+      return generateErrorResponse(
+        'autherror',
+        'Could not authenticate',
+        access,
+        authentication.error
+      )
   }
 
-  return generateErrorResponse('autherror', 'Could not authenticate - unknown status from authenticator', access)
+  return generateErrorResponse(
+    'autherror',
+    'Could not authenticate - unknown status from authenticator',
+    access
+  )
 }
 
-const requestFromAuthentication = (authentication, authenticator, adapter, request) => {
+const requestFromAuthentication = (
+  authentication,
+  authenticator,
+  adapter,
+  request,
+  authOptions
+) => {
   if (authentication.status === 'granted') {
-    const fn = authenticator[adapter.authentication]
+    const method = authOptions.overrideAdapterMethod || adapter.authentication
+    const fn = authenticator[method]
     if (is.function(fn)) {
       const auth = fn(authentication)
       return { ...request, auth }
@@ -32,7 +52,12 @@ const requestFromAuthentication = (authentication, authenticator, adapter, reque
   return { ...request, auth: null }
 }
 
-const doAuthenticate = async (authenticator, authOptions, request, retries = 1) => {
+const doAuthenticate = async (
+  authenticator,
+  authOptions,
+  request,
+  retries = 1
+) => {
   const authentication = await authenticator.authenticate(authOptions, request)
 
   if (authentication.status === 'timeout' && retries > 0) {
@@ -42,28 +67,53 @@ const doAuthenticate = async (authenticator, authOptions, request, retries = 1)
   return authentication
 }
 
-function authenticate ({ authenticator, authOptions, setAuthentication = () => {}, adapter }) {
-  return (authenticator && authenticator.authenticate)
+function authenticate({
+  authenticator,
+  authOptions,
+  setAuthentication = () => {},
+  adapter,
+}) {
+  return authenticator && authenticator.authenticate
     ? async (args) => {
-      const { authentication, response, request } = args
+        const { authentication, response, request } = args
 
-      if (authentication && authenticator.isAuthenticated(authentication)) {
-        return {
-          ...args,
-          request: requestFromAuthentication(authentication, authenticator, adapter, request)
+        if (authentication && authenticator.isAuthenticated(authentication)) {
+          return {
+            ...args,
+            request: requestFromAuthentication(
+              authentication,
+              authenticator,
+              adapter,
+              request,
+              authOptions
+            ),
+          }
         }
-      }
 
-      const nextAuthentication = await doAuthenticate(authenticator, authOptions, request)
-      setAuthentication(nextAuthentication)
+        const nextAuthentication = await doAuthenticate(
+          authenticator,
+          authOptions,
+          request
+        )
+        setAuthentication(nextAuthentication)
 
-      return {
-        ...args,
-        authentication: nextAuthentication,
-        response: responseFromAuthentication(nextAuthentication, response, request),
-        request: requestFromAuthentication(nextAuthentication, authenticator, adapter, request)
+        return {
+          ...args,
+          authentication: nextAuthentication,
+          response: responseFromAuthentication(
+            nextAuthentication,
+            response,
+            request
+          ),
+          request: requestFromAuthentication(
+            nextAuthentication,
+            authenticator,
+            adapter,
+            request,
+            authOptions
+          ),
+        }
       }
-    }
     : async (args) => args
 }
 

package/lib/service/requestFromAction.js

@@ -6,9 +6,9 @@ const getPluralType = (type, schemas) =>
  * @param {Object} request - The request object to complete
  * @returns {Object} The completed request object
  */
-function requestFromAction (
+function requestFromAction(
   { type: action, payload, meta = {} },
-  { endpoint, schemas = {} } = {}
+  { endpoint, schemas = {}, auth } = {}
 ) {
   const { data, ...params } = payload
   const { ident = null, id } = meta
@@ -19,11 +19,12 @@ function requestFromAction (
     params,
     data,
     endpoint: (endpoint && endpoint.options) || null,
+    auth,
     access: { ident },
     meta: {
       id,
-      typePlural
-    }
+      typePlural,
+    },
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "integreat",
-  "version": "0.7.38",
+  "version": "0.7.40",
   "description": "Node.js integration layer",
   "author": "Kjell-Morten Bratsberg Thorsen <post@kjellmorten.no> (http://kjellmorten.no/)",
   "license": "ISC",
@@ -46,14 +46,14 @@
   },
   "dependencies": {
     "@sindresorhus/is": "^1.2.0",
-    "debug": "^4.3.3",
+    "debug": "^4.3.4",
     "got": "^9.6.0",
     "later": "^1.2.0",
     "map-any": "^0.2.1",
     "map-transform": "^0.3.12",
     "p-limit": "^2.3.0",
     "p-progress": "^0.5.1",
-    "ramda": "^0.27.1",
+    "ramda": "^0.27.2",
     "uuid": "^3.4.0"
   },
   "devDependencies": {
@@ -62,9 +62,9 @@
     "coveralls": "^3.1.1",
     "dotenv": "^10.0.0",
     "integreat-adapter-json": "^0.2.1",
-    "nock": "^13.2.1",
+    "nock": "^13.2.9",
     "nyc": "^15.1.0",
-    "prettier": "^2.5.1",
+    "prettier": "^2.8.1",
     "sinon": "^11.1.2"
   }
 }