Merge pull request #953 from navikt/log-errors-from-formio-api

Log errors which stem from formio api

Author: akgagnat

packages/bygger-backend/src/fetchUtils.ts

@@ -1,4 +1,5 @@
 import fetch, { RequestInfo, RequestInit, Response } from 'node-fetch';
+import { logger } from './logging/logger';
 
 export class HttpError extends Error {
   readonly response: Response;
@@ -10,11 +11,22 @@ export class HttpError extends Error {
   }
 }
 
+const parseBody = async (res: Response): Promise<unknown | string> => {
+  const contentType = res.headers.get('content-type');
+  return contentType?.includes('application/json') ? await res.json() : await res.text();
+};
+
 export async function fetchWithErrorHandling(url: RequestInfo, options: RequestInit) {
   const res = await fetch(url, options);
   if (!res.ok) {
-    console.error(`Fetch ${options.method || 'GET'} ${url} failed with status: ${res.status}`);
-    console.error(`${options.method} body: ${options.body}`);
+    const responseBody = await parseBody(res);
+    const method = options.method || 'GET';
+    const logMeta = {
+      responseBody,
+      status: res.status,
+      method,
+    };
+    logger.error(`Fetch ${method} ${url} failed`, logMeta);
     throw new HttpError(res);
   }
   if (res.status === 204) {

packages/bygger-backend/src/routers/api/forms/form.ts

@@ -0,0 +1,43 @@
+import { RequestHandler } from 'express';
+import { formioService } from '../../../services';
+import { BadRequest } from '../helpers/errors';
+
+const OBJECT_ID_REGEX = /^[0-9a-fA-F]{24}$/;
+const isValidObjectId = (formId: string | undefined) => (formId ? OBJECT_ID_REGEX.test(formId) : false);
+
+const get: RequestHandler = async (req, res, next) => {
+  try {
+    const { formPath } = req.params;
+    const form = await formioService.getForm(formPath);
+    if (form) {
+      res.json(form);
+    } else {
+      res.sendStatus(404);
+    }
+  } catch (error) {
+    next(error);
+  }
+};
+
+const put: RequestHandler = async (req, res, next) => {
+  try {
+    const form = req.body;
+    if (!isValidObjectId(form._id)) {
+      next(new BadRequest(`Invalid form id: '${form._id}'`));
+      return;
+    }
+    const formioToken = req.getFormioToken?.();
+    const userName = req.getUser?.().name;
+    const savedForm = await formioService.saveForm(form, formioToken, userName, {}, true);
+    res.json(savedForm);
+  } catch (error) {
+    next(error);
+  }
+};
+
+const form = {
+  get,
+  put,
+};
+
+export default form;

packages/bygger-backend/src/routers/api/forms/forms.ts

@@ -0,0 +1,18 @@
+import { RequestHandler } from 'express';
+import { formioService } from '../../../services';
+
+const get: RequestHandler = async (req, res, next) => {
+  try {
+    const { select } = req.query;
+    const allForms = await formioService.getAllForms(1000, true, select as string);
+    res.json(allForms);
+  } catch (error) {
+    next(error);
+  }
+};
+
+const forms = {
+  get,
+};
+
+export default forms;

packages/bygger-backend/src/routers/api/forms/index.ts

@@ -0,0 +1,12 @@
+import express from 'express';
+import authorizedPublisher from '../helpers/authorizedPublisher';
+import form from './form';
+import forms from './forms';
+
+const formsRouter = express.Router();
+
+formsRouter.get('/', forms.get);
+formsRouter.get('/:formPath', form.get);
+formsRouter.put('/:formPath', authorizedPublisher, form.put);
+
+export default formsRouter;

packages/bygger-backend/src/routers/api/index.ts

@@ -6,6 +6,7 @@ import deprecatedPublishForm from './deprecated-publish-form';
 import deprecatedUnpublishForm from './deprecated-unpublish-form';
 import enhetsliste from './enhetsliste';
 import formDiff from './formDiff';
+import formsRouter from './forms';
 import apiErrorHandler from './helpers/apiErrorHandler';
 import authorizedPublisher from './helpers/authorizedPublisher';
 import log from './log';
@@ -38,6 +39,7 @@ apiRouter.get('/migrate', migrate);
 apiRouter.get('/migrate/preview/:formPath', migratePreview);
 apiRouter.post('/migrate/update', authorizedPublisher, migrateUpdate);
 apiRouter.get('/form/:formPath/diff', formDiff);
+apiRouter.use('/forms', formsRouter);
 apiRouter.post('/log/:level', rateLimiter(60000, 60), log);
 
 apiRouter.use(apiErrorHandler);

packages/bygger/cypress/e2e/diff.spec.cy.ts

@@ -1,7 +1,7 @@
 describe('Diff', () => {
   beforeEach(() => {
     cy.intercept('GET', '/api/config', { fixture: 'config.json' }).as('getConfig');
-    cy.intercept('GET', '/form?*', { fixture: 'form123456.json' }).as('getForm');
+    cy.intercept('GET', '/api/forms/dif123456', { fixture: 'form123456.json' }).as('getForm');
     cy.intercept('GET', '/api/published-forms/dif123456', { fixture: 'form123456-published.json' }).as(
       'getPublishedForm',
     );

packages/bygger/cypress/e2e/form-builder.spec.cy.ts

@@ -4,20 +4,20 @@ import { expect } from 'chai';
 describe('Form Builder', () => {
   beforeEach(() => {
     cy.intercept('GET', '/api/config', { fixture: 'config.json' }).as('getConfig');
-    cy.intercept('GET', '/form?*', { fixture: 'form123456.json' }).as('getForm');
-    cy.intercept('GET', '/api/published-forms/dif123456', { statusCode: 404 }).as('getPublishedForm');
+    cy.intercept('GET', '/api/forms/tst123456', { fixture: 'form123456.json' }).as('getForm');
+    cy.intercept('GET', '/api/published-forms/tst123456', { statusCode: 404 }).as('getPublishedForm');
     cy.intercept('GET', /language\/submission?.*/, { fixture: 'globalTranslations.json' }).as('getTranslations');
     cy.intercept('GET', '/api/countries*', { fixture: 'getCountriesLangNb.json' }).as('getCountriesLangNb');
 
-    cy.visit('forms/dif123456');
+    cy.visit('forms/tst123456');
     cy.wait('@getConfig');
     cy.wait('@getForm');
     cy.wait('@getPublishedForm');
     cy.wait('@getCountriesLangNb');
   });
 
   it('Trims properties "vedleggskode" and "vedleggstittel" before save', () => {
-    cy.intercept('PUT', '/form/63c7abd51578ad48a6dc00cc', (req) => {
+    cy.intercept('PUT', '/api/forms/tst123456', (req) => {
       const vedlegg = navFormUtils
         .flattenComponents(req.body.components)
         .find((comp) => comp.key === 'annenDokumentasjon');
@@ -40,7 +40,7 @@ describe('Form Builder', () => {
 
   describe('Textfield', () => {
     it('should save changes made in edit modal', () => {
-      cy.intercept('PUT', '/form/63c7abd51578ad48a6dc00cc', (req) => {
+      cy.intercept('PUT', '/api/forms/tst123456', (req) => {
         const fodselsdato = navFormUtils
           .flattenComponents(req.body.components)
           .find((comp) => comp.key === 'fornavnSoker');
@@ -58,7 +58,7 @@ describe('Form Builder', () => {
 
   describe('Nav datepicker', () => {
     it('should save changes made in edit modal', () => {
-      cy.intercept('PUT', '/form/63c7abd51578ad48a6dc00cc', (req) => {
+      cy.intercept('PUT', '/api/forms/tst123456', (req) => {
         const fodselsdato = navFormUtils
           .flattenComponents(req.body.components)
           .find((comp) => comp.key === 'fodselsdatoDdMmAaaaSoker');

packages/bygger/cypress/e2e/settings.spec.cy.ts

@@ -15,7 +15,7 @@ const _submitData = {
 describe('FormSettingsPage', () => {
   beforeEach(() => {
     cy.intercept('GET', '/api/config', { fixture: 'config.json' }).as('getConfig');
-    cy.intercept('GET', '/form?*', {
+    cy.intercept('GET', '/api/forms/cypresssettings', {
       fixture: 'getForm.json',
     }).as('getForm');
     cy.intercept('GET', '/api/published-forms/*', { statusCode: 404 }).as('getPublishedForm');
@@ -27,7 +27,7 @@ describe('FormSettingsPage', () => {
   });
 
   it('Fills all elements in settings page', () => {
-    cy.intercept('PUT', 'form/*', (req) => {
+    cy.intercept('PUT', '/api/forms/cypresssettings', (req) => {
       expect(req.body.properties.tema).to.include(_submitData.tema);
       expect(req.body.title).to.include(_submitData.title);
       expect(req.body.properties.skjemanummer).to.include(_submitData.skjemanummer);

packages/bygger/cypress/e2e/translations.spec.cy.ts

@@ -5,11 +5,11 @@ describe('Translations', () => {
 
   describe('Form translations', () => {
     beforeEach(() => {
-      cy.intercept('GET', '/form?*', { fixture: 'form123456.json' }).as('getForm');
-      cy.intercept('GET', '/api/published-forms/dif123456', { statusCode: 404 }).as('getPublishedForm');
+      cy.intercept('GET', '/api/forms/tst123456', { fixture: 'form123456.json' }).as('getForm');
+      cy.intercept('GET', '/api/published-forms/tst123456', { statusCode: 404 }).as('getPublishedForm');
       cy.intercept('GET', '/api/countries?*', { fixture: 'getCountriesLangNb.json' }).as('getCountriesLangNb');
 
-      cy.visit('/forms/dif123456');
+      cy.visit('/forms/tst123456');
       cy.wait('@getForm');
     });
 
@@ -45,7 +45,7 @@ describe('Translations', () => {
 
   describe('Global translations', () => {
     beforeEach(() => {
-      cy.intercept('GET', '/form?*', { body: [] }).as('getForms');
+      cy.intercept('GET', /\/api\/forms\\?.+/, { body: [] }).as('getForms');
       cy.visit('/');
     });