@dwp/govuk-casa 7.0.6 → 8.0.0-alpha1

package/middleware/page/journey-rails.js

@@ -1,102 +0,0 @@
-/**
- * Ensure the user is on the right track in their journey through the app. This
- * middleware prevents skipping pages in the journey without having filled in
- * required data in the preceding pages.
- *
- * Enhances `res.locals.casa` with:
- *  string journeyPreviousUrl = Absolute URL to the previous page in the journey
- *      (if applicable).
- */
-
-const createLogger = require('../../lib/Logger.js');
-const JourneyContext = require('../../lib/JourneyContext.js');
-const { createGetRequest } = require('../../lib/utils/index.js');
-
-module.exports = (mountUrl = '/', plan) => {
-  if (!plan) {
-    return (req, res, next) => next();
-  }
-
-  return (req, res, next) => {
-    const logger = createLogger('page.journey-rails');
-    logger.setSessionId(req.session.id);
-
-    req.casa = req.casa || Object.create(null);
-
-    // We can skip to next route handler if the waypoint doesn't feature in the
-    // defined user journey.
-    if (!plan.containsWaypoint(req.casa.journeyWaypointId)) {
-      next();
-      return;
-    }
-
-    // Traverse all routes from a given origin. This gives us the list of
-    // waypoints that the user could have legitimately visited.
-    const traversalOptions = {
-      startWaypoint: req.casa.journeyOrigin.waypoint,
-    };
-    const traversed = plan.traverse(
-      req.casa.journeyContext || new JourneyContext(),
-      traversalOptions,
-    );
-
-    // Common attributes for generating links
-    const requestAttributes = {
-      mountUrl,
-      editMode: req.inEditMode,
-      editOrigin: req.editOriginUrl,
-      contextId: req.casa.journeyContext.identity.id,
-    };
-
-    // The requested waypoint cannot be found in the list of traversed routes;
-    // send the user back to their last visited waypoint
-    const currentUrlIndex = traversed.indexOf(req.casa.journeyWaypointId);
-    if (currentUrlIndex === -1) {
-      const redirectUrl = createGetRequest({
-        ...requestAttributes,
-        waypoint: `${req.casa.journeyOrigin.originId || ''}/${traversed[traversed.length - 1]}`,
-      });
-      logger.debug('Traversal redirect: %s to %s', req.casa.journeyWaypointId, redirectUrl);
-      res.status(302).redirect(`${redirectUrl}#`);
-      return;
-    }
-
-    // The requested waypoint is reachable via the traversed routes; generate a
-    // previous waypoint URL that can be used to navigate back.
-    if (currentUrlIndex > 0) {
-      res.locals.casa.journeyPreviousUrl = createGetRequest({
-        ...requestAttributes,
-        waypoint: `${req.casa.journeyOrigin.originId || ''}/${traversed[currentUrlIndex - 1]}`,
-      });
-      next();
-      return;
-    }
-
-    // We're at the very first waypoint that is reachable from the given origin;
-    // check if there is a "prev" route available that points to a different
-    // origin, that we can use to generate a URL pointing to that waypoint.
-    // First, attempt to traverse backwards; this will ensure the route conditions
-    // are taken into account during that traversal.
-    // If no valid route is found with that method, fallback to using the first
-    // `prev` route that we can find.
-    const stopCondition = (r) => (r.label.targetOrigin !== undefined);
-    let [previousRoute] = plan.traversePrevRoutes(req.casa.journeyContext, {
-      startWaypoint: req.casa.journeyWaypointId,
-      stopCondition,
-    }).filter(stopCondition);
-
-    if (!previousRoute) {
-      [previousRoute] = plan.getPrevOutwardRoutes(req.casa.journeyWaypointId).filter(stopCondition);
-    }
-
-    if (previousRoute) {
-      res.locals.casa.journeyPreviousUrl = createGetRequest({
-        ...requestAttributes,
-        mountUrl,
-        waypoint: `${previousRoute.label.targetOrigin}/${previousRoute.target}`,
-      });
-    }
-
-    next();
-  };
-};

package/middleware/page/prepare-request.js

@@ -1,77 +0,0 @@
-/**
- * Enhances `req.casa` with:
- *  string journeyWaypointId = Converts requested URL into a string suitable for
- *      use as a journey waypoint ID (i.e. Remove trailing slashes)
- *  object journeyOrigin = The origin from which traversals should start
- *  Plan plan = The grand Plan.
- */
-
-const { parseRequest, createGetRequest } = require('../../lib/utils/index.js');
-
-function getSingleOriginMeta(origins, casaRequest) {
-  // Even though single-origin Plans won't generally generate URLs with the
-  // origin ID included, there is a chance that could happen. So here we're
-  // making sure to ignore it if it's there.
-  const [originOrWaypoint, waypoint] = casaRequest.waypoint.split('/');
-
-  return {
-    // Set blank originId to prevent generated URLs containing an origin
-    origin: { ...origins[0], originId: '' },
-    waypoint: originOrWaypoint === origins[0].originId ? waypoint : originOrWaypoint,
-  };
-}
-
-function getMultiOriginMeta(origins, casaRequest) {
-  const [originId, waypoint] = casaRequest.waypoint.split('/');
-
-  return {
-    origin: origins.find((o) => o.originId === originId),
-    waypoint,
-  };
-}
-
-module.exports = (mountUrl, plan) => {
-  // Prepare for extracting metadata from each request
-  const origins = plan.getOrigins();
-  const getOriginAndWaypoint = (origins.length === 1 ? getSingleOriginMeta : getMultiOriginMeta)
-    .bind(null, origins);
-
-  return (req, res, next) => {
-    // Extract the Plan origin and current waypoint from the request
-    const { origin, waypoint } = getOriginAndWaypoint(parseRequest(req));
-
-    // Define read-only properties
-    req.casa = req.casa || Object.create(null);
-    Object.defineProperty(req.casa, 'plan', {
-      value: plan,
-      configurable: false,
-      enumerable: true,
-      writable: false,
-    });
-    Object.defineProperty(req.casa, 'journeyOrigin', {
-      value: origin,
-      configurable: false,
-      enumerable: true,
-      writable: false,
-    });
-    Object.defineProperty(req.casa, 'journeyWaypointId', {
-      value: waypoint,
-      configurable: false,
-      enumerable: true,
-      writable: false,
-    });
-
-    // Utility function for creating links from within templates
-    res.locals.makeLink = (args) => (createGetRequest({
-      mountUrl,
-      waypoint: `${origin.originId}/${waypoint}`,
-      contextId: req.casa.journeyContext.isDefault() ? '' : req.casa.journeyContext.identity.id,
-      editMode: req.inEditMode,
-      editOrigin: req.editOriginUrl,
-      ...args,
-    }));
-
-    // Next middleware
-    next();
-  };
-};

package/middleware/page/render.js

@@ -1,75 +0,0 @@
-const createLogger = require('../../lib/Logger.js');
-const { executeHook } = require('./utils.js');
-
-module.exports = (pageMeta = {}) => (req, res, next) => {
-  const logger = createLogger('page.render');
-  logger.setSessionId(req.session.id);
-  const pageId = pageMeta.id;
-  const activeContextId = req.casa.journeyContext.isDefault()
-    ? undefined
-    : req.casa.journeyContext.identity.id;
-
-  req.casa = req.casa || Object.create(null);
-
-  function renderErrorCallback(err, templateString) {
-    if (err) {
-      logger.error(err);
-      next(err);
-    } else {
-      res.send(templateString);
-    }
-  }
-
-  function renderGET() {
-    res.render(pageMeta.view, {
-      formData: req.casa.journeyContext.getDataForPage(pageMeta),
-      inEditMode: req.inEditMode,
-      editOriginUrl: req.editOriginUrl,
-      editSearchParams: req.editSearchParams,
-      activeContextId,
-    }, renderErrorCallback);
-  }
-
-  function renderPOST() {
-    const errors = req.casa.journeyContext.getValidationErrorsForPage(pageId)
-      || Object.create(null);
-
-    // This is a convenience for the template. The `govukErrorSummary` macro
-    // requires the errors be in a particular format, so here we provide our
-    // errors in that format.
-    const govukErrors = Object.keys(errors).map((k) => ({
-      text: req.i18nTranslator.t(errors[k][0].summary, errors[k][0].variables),
-      href: errors[k][0].fieldHref,
-    }));
-
-    // We reflect all POSTed data in req.body rather than just the gathered
-    // journey data because the template may have custom fields that aren't part
-    // of the formal page data, but are important to how the page functions.
-    res.render(pageMeta.view, {
-      formData: req.body,
-      formErrors: Object.keys(errors).length ? errors : null,
-      formErrorsGovukArray: govukErrors.length ? govukErrors : null,
-      inEditMode: req.inEditMode,
-      editOriginUrl: req.editOriginUrl,
-      editSearchParams: req.editSearchParams,
-      activeContextId,
-    }, renderErrorCallback);
-  }
-
-  return executeHook(logger, req, res, pageMeta, 'prerender').then(() => {
-    logger.trace(
-      'Rendering view for %s (editmode=%s, method=%s, contextId=%s)',
-      pageId,
-      req.inEditMode ? 'true' : 'false',
-      req.method,
-      req.casa.journeyContext.identity.id,
-    );
-    if (req.method.toLowerCase() === 'post') {
-      renderPOST();
-    } else {
-      renderGET();
-    }
-  }).catch((err) => {
-    next(err);
-  });
-};

package/middleware/page/skip.js

@@ -1,72 +0,0 @@
-/**
- * Mark a waypoint as having been viewed, and the user having made an explicit
- * action to pass through it, onto a subsequent page.
- *
- * You may also need to modify the "follow" functions on each of the out-edges
- * leading away from the skipped waypoint, so they understand to allow the skip.
- *
- * It is important that this function overwrites _all_ other data on the
- * specified waypoint.
- *
- * NOTE: All waypoints up to the point of the one being marked must have been
- * visited beforehand, so this middleware must come after journey-rails.
- *
- * Format:
- *  /current-waypoint?skipto=next-waypoint.
- */
-
-const JourneyContext = require('../../lib/JourneyContext.js');
-const createLogger = require('../../lib/Logger.js');
-const { createGetRequest } = require('../../lib/utils/index.js');
-
-module.exports = (mountUrl) => (req, res, next) => {
-  const logger = createLogger('page.skip');
-  logger.setSessionId(req.session.id);
-
-  req.casa = req.casa || Object.create(null);
-
-  const { skipto } = req.query;
-  const { journeyOrigin = { originId: '' } } = req.casa;
-
-  // Validate arguments
-  if (skipto === undefined) {
-    next();
-    return;
-  }
-  if (typeof skipto !== 'string' || !skipto.match(/^[a-z0-9-]{1,200}$/i)) {
-    logger.error('Invalid skip waypoint');
-    res.status(400).send('Invalid waypoint');
-    return;
-  }
-
-  // Inject a special "__skipped__" data item into the waypoint's page data,
-  // overwriting all other data therein.
-  logger.info('Marking waypoint %s as skipped', req.casa.journeyWaypointId);
-  req.casa.journeyContext.clearValidationErrorsForPage(req.casa.journeyWaypointId);
-  req.casa.journeyContext.setDataForPage(req.casa.journeyWaypointId, {
-    __skipped__: true,
-  });
-
-  // Persist changes to session
-  JourneyContext.putContext(req.session, req.casa.journeyContext);
-
-  // Attach edit and contextId flags to the redirect URL, if applicable
-  // const redirectUrl
-  const redirectUrl = createGetRequest({
-    mountUrl,
-    waypoint: `${journeyOrigin.originId || ''}/${skipto}`,
-    editMode: req.inEditMode,
-    editOrigin: req.editOriginUrl,
-    contextId: req.casa.journeyContext.identity.id,
-  });
-
-  // Save session and send user on their way
-  req.session.save((err) => {
-    if (err) {
-      logger.error(err);
-      next(err);
-    } else {
-      res.status(302).redirect(redirectUrl);
-    }
-  });
-};

package/middleware/page/utils.js

@@ -1,206 +0,0 @@
-const { isObjectWithKeys, isObjectType, normalizeHtmlObjectPath } = require('../../lib/Util.js');
-const JourneyContext = require('../../lib/JourneyContext.js');
-
-/**
- * Converts an array of functions to a nested callback, eg:
- * [                                  |   function nested(req, res, next) {-
- *   function a(req, res, next) {-    |     a(req, res, () => {-
- *     ...                            |       ...
- *     next();                        |       b(req, res, () => {-
- *   },                               |         ...
- *   function b(req, res, next) {-    |         c(req, res, () => {-
- *     ...                            |           ...
- *     next();                        |           next();
- *   },                               |         });
- *   function c(req, res, next) {-    |       })
- *     ...                            |     });
- *     next();                        |   }
- *   },                               |
- * ]                                  |.
- *
- * @param  {object} logger Request-specific Logger instance.
- * @param  {string} hookName Name of the hook being called.
- * @param  {string} waypointId ID of waypoint.
- * @param  {Array} hooks Array of middleware like functions.
- * @returns {Function} Nested function.
- */
-function nestHooks(logger, hookName, waypointId, hooks) {
-  return hooks.reduce((inital, hook, hookNumber) => {
-    if (typeof hook === 'function') {
-      return (req, res, next) => {
-        inital(req, res, () => {
-          logger.trace('Running %s hook %d for %s', hookName, hookNumber + 1, waypointId);
-          hook(req, res, next);
-        })
-      }
-    }
-    return inital;
-  }, (req, res, next) => next());
-}
-
-/**
- * Generic wrapper for executing one of the page hooks.
- *
- * The returned Promise will always resolve unless the hook function ends the
- * response with something like `res.send()`.
- *
- * @param  {object} logger Request-specific Logger instance.
- * @param  {object} req Express request.
- * @param  {object} res Express response.
- * @param  {object} pageMeta Metadata of page being processed.
- * @param  {string} hookName Name of hook to execute.
- * @returns {Promise} Promise.
- */
-function executeHook(logger, req = {}, res = {}, pageMeta = {}, hookName = '') {
-  return new Promise((resolve, reject) => {
-    const hooks = pageMeta && pageMeta.hooks ? pageMeta.hooks : Object.create(null);
-    const { journeyWaypointId } = req.casa || Object.create(null);
-    if (Array.isArray(hooks[hookName])) {
-      const nestedHooks = nestHooks(logger, hookName, req.casa.journeyWaypointId, hooks[hookName]);
-      // Will not resolve if any hook executes `res.send()`
-      logger.trace('Running nested %s hooks for %s', hookName, journeyWaypointId);
-      nestedHooks(req, res, resolve);
-    } else if (typeof hooks[hookName] === 'function') {
-      logger.trace('Run %s hook for %s', hookName, journeyWaypointId);
-      hooks[hookName](req, res, (err) => {
-        // Will not resolve if hook executes `res.send()`
-        if (err) {
-          reject(err);
-        } else {
-          resolve();
-        }
-      });
-    } else {
-      logger.trace('No %s hook for %s', hookName, journeyWaypointId);
-      resolve();
-    }
-  });
-}
-
-/**
- * Apply the `sanitise()` method of each validator rule defined in the
- * fieldValidator. The output of each sanitisation is passed as input to the
- * next.
- *
- * `context` contains the `fieldName`, `waypointId` and `journeyContext`.
- *
- * @param {SimpleFieldValidatorConfig} fieldValidator Validator
- * @param {any} data Data to be sanitised
- * @param {any} context Data context
- * @returns {any} Sanitised data
- */
-function applyValidatorSanitiser(fieldValidator, data, context) {
-  // Apply each valdiator's `sanitise` method
-  let sanitisedData = data;
-  fieldValidator.validators.forEach((validatorObj) => {
-    sanitisedData = validatorObj.sanitise(sanitisedData, context);
-  });
-
-  return sanitisedData;
-}
-
-/**
- * Extract the data that will be saved to session, removing data that does not
- * have an associated field validator.
- *
- * Where no validators are defined for the requested waypoint, we will store
- * nothing in the session.
- *
- * @param {object} logger Request-specific logger instance.
- * @param {object} pageMeta Page meta object.
- * @param {object} data Data to be pruned.
- * @param {JourneyContext} journeyContext Request's journey context.
- * @returns {object} The pruned data.
- * @throws {TypeError} When given invalid argument types.
- */
-function extractSessionableData(
-  logger,
-  // pageWaypointId,
-  // fieldValidators = {},
-  pageMeta,
-  data = {},
-  journeyContext,
-) {
-  if (!isObjectWithKeys(logger, ['warn'])) {
-    throw new TypeError('Expected logger to be a configured logging object');
-  }
-
-  if (!isObjectType(pageMeta)) {
-    throw new TypeError('Expected pageMeta to be an object');
-  }
-
-  const { fieldValidators } = pageMeta;
-  if (!isObjectWithKeys(fieldValidators)) {
-    throw new TypeError('Expected pageMeta.fieldValidators to be an object');
-  }
-
-  if (!isObjectWithKeys(data)) {
-    throw new TypeError('Expected data to be an object');
-  }
-
-  if (Object.keys(fieldValidators).length === 0) {
-    logger.debug(
-      'No field validators defined for "%s" waypoint. Will use an empty object.',
-      pageMeta.id,
-    );
-    return Object.create(null);
-  }
-
-  // Prune data that does not have an associated field valdiator.
-  // Conditional functions expect the gathered data to be available via a
-  // JourneyContext instance. Therefore we need to create a duplicate of the
-  // `journeyContext`, and bundle `data` into it.
-  const journeyContextWrapper = JourneyContext.fromObject(journeyContext.toObject());
-  journeyContextWrapper.setDataForPage(pageMeta, data);
-  const prunedData = Object.create(null);
-  Object.keys(fieldValidators).forEach((k) => {
-    if (
-      typeof data[k] !== 'undefined'
-      && fieldValidators[k].condition({
-        fieldName: normalizeHtmlObjectPath(k),
-        waypointId: pageMeta.id,
-        journeyContext: journeyContextWrapper,
-      })
-    ) {
-      prunedData[k] = applyValidatorSanitiser(
-        fieldValidators[k],
-        data[k],
-        {
-          fieldName: normalizeHtmlObjectPath(k),
-          waypointId: pageMeta.id,
-          journeyContext: journeyContextWrapper,
-        },
-      );
-    }
-  });
-
-  return prunedData;
-}
-
-/**
- * Run modifying functions against the specified field.
- *
- * @param {object} fieldValue Value to modify.
- * @param {Array | Function} gatherModifiers Either an array of functions or a single function.
- * @returns {any} Modified value.
- */
-function runGatherModifiers(fieldValue, gatherModifiers = []) {
-  const modifiers = Array.isArray(gatherModifiers) ? gatherModifiers : [gatherModifiers];
-
-  let fValue = fieldValue;
-  modifiers.forEach((m) => {
-    fValue = typeof m === 'function' ? m({
-      fieldValue: fValue,
-    }) : fValue;
-  });
-
-  return fValue;
-}
-
-module.exports = {
-  applyValidatorSanitiser,
-  executeHook,
-  extractSessionableData,
-  nestHooks,
-  runGatherModifiers,
-};

package/middleware/page/validate.js

@@ -1,67 +0,0 @@
-const createLogger = require('../../lib/Logger');
-const Validation = require('../../lib/validation/index.js');
-const JourneyContext = require('../../lib/JourneyContext.js');
-const { executeHook } = require('./utils.js');
-
-module.exports = (pageMeta = {}) => (req, res, next) => {
-  const logger = createLogger('page.validate');
-  logger.setSessionId(req.session.id);
-  const pageId = pageMeta.id;
-
-  req.casa = req.casa || Object.create(null);
-
-  /**
-   * Run validation process.
-   *
-   * @returns {Promise} Promise.
-   */
-  function runValidation() {
-    let result;
-    if (pageMeta && pageMeta.fieldValidators) {
-      logger.trace('Run validation for %s', pageId);
-      result = Validation.processor({
-        waypointId: pageId,
-        pageMeta,
-        // fieldValidators: pageMeta.fieldValidators,
-        journeyContext: req.casa.journeyContext,
-        reduceErrors: true,
-      });
-    } else {
-      result = Promise.resolve();
-    }
-    return result;
-  }
-
-  // Promise
-  return executeHook(logger, req, res, pageMeta, 'prevalidate')
-    .then(runValidation)
-    .then(() => (executeHook(logger, req, res, pageMeta, 'postvalidate')))
-    .then(() => {
-      // Validation has passed, so clear any validation errors currently stored
-      // against the page and persist to session
-      req.casa.journeyContext.clearValidationErrorsForPage(pageId);
-      JourneyContext.putContext(req.session, req.casa.journeyContext);
-
-      // The next middleware handler is responsible for moving the user onto the
-      // correct next waypoint.
-      next();
-    })
-    .catch((errors) => {
-      // If it's a real error (i.e. thrown by interpreter rather than application)
-      // we want to capture that earlier. Otherwise, treat as a validation error
-      if (errors instanceof Error) {
-        logger.trace('Passing through system error on waypoint %s: %s', pageId, errors.message);
-        next(errors);
-        return;
-      }
-
-      // Store validation results so they can be used during future traversals
-      // TODO: Handle possible exceptions thrown by the below; e.g. if `errors`
-      // are not in valid format, an exception is thrown by `setValidationErrorsForPage`
-      logger.trace('Storing validation errors on waypoint %s', pageId);
-      req.casa.journeyContext.setValidationErrorsForPage(pageId, errors);
-      JourneyContext.putContext(req.session, req.casa.journeyContext);
-
-      next();
-    });
-}

package/middleware/session/expiry.js

@@ -1,95 +0,0 @@
-// If the store session has expired, clean up and let the user know. It's
-// important to clear the cookie, using the same options that were used when
-// the cookie was created by expressSession above - see
-// http://expressjs.com/en/api.html#res.clearCookie
-// Session store implementations should have their own clean-up methods to
-// clear out expired sessions, but just in case we also use a `dateExpire`
-// attribute in the session to forcefully destroy server-side sessions after
-// a defined amount of time.
-
-const qs = require('querystring');
-const url = require('url');
-const mwInit = require('./init.js');
-
-module.exports = (logger, mountUrl = '/', sessionExpiryController, sessionConfig = {}) => (req, res, next) => {
-  let redirectPath = `${mountUrl}session-timeout`;
-
-  // Session already destroyed, or on timeout page
-  if (typeof req.session === 'undefined' || req.path === redirectPath) {
-    next();
-    return;
-  }
-
-  // Update manual expiry timestamp
-  let oldSessionId;
-  if (req.casaSessionExpired) {
-    logger.debug('Auto-removed session %s will be cleared up', req.casaSessionExpired);
-    oldSessionId = req.casaSessionExpired;
-    delete req.casaSessionExpired;
-  } else if (req.session.dateExpire && new Date(req.session.dateExpire).getTime() <= Date.now()) {
-    logger.debug('Expired session %s will be destroyed', req.sessionID);
-    oldSessionId = req.sessionID;
-  } else {
-    const ttlMilliseconds = sessionConfig.ttl ? parseInt(sessionConfig.ttl, 10) * 1000 : 0;
-    req.session.dateExpire = new Date(Date.now() + ttlMilliseconds).toISOString();
-    next();
-    return;
-  }
-
-  // Optional redirect after destroy
-  function onAfterDestroy() {
-    if (!redirectPath || res.headersSent) {
-      return;
-    }
-
-    // Add current path to redirect query
-    if (req.originalUrl) {
-      const currentUrl = url.parse(req.originalUrl, true);
-      const redirectUrl = url.parse(redirectPath, true);
-
-      // Remove existing referrer query
-      if (currentUrl.query.referer) {
-        delete currentUrl.query.referer;
-
-        // Rebuild or remove query string
-        currentUrl.search = currentUrl.query.length
-          ? `?${qs.stringify(currentUrl.query)}`
-          : null;
-      }
-
-      // Append referrer, rebuild path
-      redirectUrl.search = `?${qs.stringify({ referer: url.format(currentUrl) })}`;
-      redirectPath = url.format(redirectUrl);
-    }
-
-    // Redirect to session timeout
-    res.status(302).redirect(`${redirectPath}#`);
-  }
-
-  // Destroy session
-  logger.debug('Destroying expired session %s (tmp new ID %s)', oldSessionId, req.sessionID);
-  req.session.destroy((err) => {
-    if (err) {
-      logger.error('Failed to destory session. Error: %s', err.message);
-    }
-
-    // Always clear cookie
-    res.clearCookie(sessionConfig.name, {
-      path: sessionConfig.cookiePath,
-      sameSite: sessionConfig.cookieSameSite,
-      httpOnly: true,
-      secure: sessionConfig.secure,
-      maxAge: null,
-    });
-
-    // Custom expiry controller
-    if (typeof sessionExpiryController === 'function') {
-      sessionExpiryController(req, res, () => {
-        redirectPath = undefined;
-        mwInit(logger, sessionConfig)(req, res, next);
-      });
-    }
-
-    process.nextTick(onAfterDestroy);
-  });
-}