Merge pull request #1471 from navikt/tech/remove-formio-from-bygger

Remove formio api

Author: akgagnat

.nais/bygger/nais.yaml

@@ -48,10 +48,6 @@ spec:
       value: {{skjemabygging-proxy-url}}
     - name: SKJEMABYGGING_PROXY_CLIENT_ID
       value: {{skjemabygging-proxy-client-id}}
-    - name: FORMIO_API_SERVICE
-      value: http://formio-api
-    - name: FORMIO_PROJECT_NAME
-      value: jvcemxwcpghcqjn
     - name: FORMS_API_URL
       value: http://forms-api.fyllut-sendinn
     {{#each environmentVars}}
@@ -93,9 +89,7 @@ spec:
           cluster: {{this.cluster}}
       {{/each}}
       external:
-        - host: formio-api-server.ekstern.dev.nav.no
         - host: api.github.com
-        - host: formio-api.nav.no
         - host: api-eu.pusher.com
       {{#each accessPolicy.outbound.external}}
         - host: {{this.host}}

.nais/bygger/preprod-alt.yaml

@@ -15,26 +15,16 @@ accessPolicy:
       - application: skjemabygging-proxy
         namespace: skjemadigitalisering
         cluster: dev-fss
-      - application: formio-api
-        namespace: skjemadigitalisering
-        cluster: dev-gcp
-      - application: formio-enterprise-server
-        namespace: skjemadigitalisering
-        cluster: dev-gcp
       - application: skjemautfylling-preprod-alt
         namespace: skjemadigitalisering
         cluster: dev-gcp
     external:
       - host: skjemabygging-proxy.dev-fss-pub.nais.io
+      - host: forms-api.nav.no
 secrets:
-  - formio-server-access-dev
   - bygger-pusher-dev
   - github-app-installation
 environmentVars:
-  - name: FORMIO_API_SERVICE_PROD
-    value: http://formio-enterprise-server
-  - name: FORMIO_PROJECT_NAME_PROD
-    value: jvcemxwcpghcqjn
   - name: FORMS_API_URL_PROD
     value: https://forms-api.nav.no
 azure:

.nais/bygger/preprod.yaml

@@ -18,26 +18,16 @@ accessPolicy:
       - application: skjemabygging-proxy
         namespace: skjemadigitalisering
         cluster: dev-fss
-      - application: formio-api
-        namespace: skjemadigitalisering
-        cluster: dev-gcp
-      - application: formio-enterprise-server
-        namespace: skjemadigitalisering
-        cluster: dev-gcp
       - application: skjemautfylling-preprod
         namespace: skjemadigitalisering
         cluster: dev-gcp
     external:
       - host: skjemabygging-proxy.dev-fss-pub.nais.io
+      - host: forms-api.nav.no
 secrets:
-  - formio-server-access-dev
   - bygger-pusher-dev
   - github-app-installation
 environmentVars:
-  - name: FORMIO_API_SERVICE_PROD
-    value: http://formio-enterprise-server
-  - name: FORMIO_PROJECT_NAME_PROD
-    value: jvcemxwcpghcqjn
   - name: FORMS_API_URL_PROD
     value: https://forms-api.nav.no
 azure:

.nais/bygger/prod.yaml

@@ -17,13 +17,9 @@ accessPolicy:
       - application: skjemabygging-proxy
         namespace: skjemadigitalisering
         cluster: prod-fss
-      - application: formio-api
-        namespace: skjemadigitalisering
-        cluster: prod-gcp
     external:
       - host: skjemabygging-proxy.prod-fss-pub.nais.io
 secrets:
-  - formio-server-access
   - bygger-pusher
   - github-app-installation
 environmentVars: []

packages/bygger-backend/package.json

@@ -27,7 +27,6 @@
     "express-rate-limit": "^7.5.0",
     "http-proxy": "^1.18.1",
     "jose": "^5.9.6",
-    "jsonwebtoken": "^9.0.2",
     "luxon": "^3.5.0",
     "node-fetch": "^3.3.2",
     "node-jose": "^2.2.0",
@@ -47,6 +46,7 @@
     "@types/node-fetch": "^2.6.12",
     "@types/node-jose": "^1.1.13",
     "@types/uuid": "^10.0.0",
+    "jsonwebtoken": "^9.0.2",
     "memorystream": "^0.3.1",
     "nock": "^13.5.6",
     "vite-plugin-node": "^4.0.0",

packages/bygger-backend/src/config/development.ts

@@ -1,6 +1,5 @@
 import {
   AzureConfig,
-  FormioConfig,
   FormsApiConfig,
   FyllutConfig,
   GithubAppConfig,
@@ -20,21 +19,6 @@ export const devSkjemabyggingProxy: Partial<SkjemabyggingProxyConfig> = {
   clientId: '95170319-b4d7-4190-8271-118ed19bafbf',
 };
 
-export const devFormio: Partial<FormioConfig> = {
-  apiService: 'https://formio-api.intern.dev.nav.no',
-  projectName: 'jvcemxwcpghcqjn',
-  roleIds: {
-    administrator: '628ca77305690db58c974d04',
-    authenticated: '628ca77305690db58c974d09',
-    everyone: '000000000000000000000000',
-  },
-};
-
-export const prodFormio: Pick<FormioConfig, 'apiService' | 'projectName'> = {
-  apiService: 'https://formio-api-server.ekstern.dev.nav.no',
-  projectName: 'jvcemxwcpghcqjn',
-};
-
 export const devFyllut: Partial<FyllutConfig> = {
   baseUrl: 'https://skjemadelingslenke.ekstern.dev.nav.no/fyllut',
 };

packages/bygger-backend/src/config/index.ts

@@ -3,14 +3,12 @@ import dotenv from 'dotenv';
 import {
   devAzure,
   devEnabledFeatures,
-  devFormio,
   devFormsApi,
   devFyllut,
   devGithub,
   devGithubApp,
   devPusher,
   devSkjemabyggingProxy,
-  prodFormio,
   prodFormsApi,
 } from './development';
 import { ConfigType, NodeEnv } from './types';
@@ -67,27 +65,6 @@ const config: ConfigType = {
     clientSecret: env('GITHUB_CLIENT_SECRET'),
     installationId: env('GITHUB_APP_INSTALLATION_ID'),
   },
-  formio: {
-    apiService: env('FORMIO_API_SERVICE', devFormio.apiService),
-    projectName: env('FORMIO_PROJECT_NAME', devFormio.projectName),
-    projectId: env('FORMIO_PROJECT_ID'),
-    roleIds: {
-      administrator: env('FORMIO_ROLE_ID_ADMINISTRATOR', devFormio.roleIds?.administrator),
-      authenticated: env('FORMIO_ROLE_ID_AUTHENTICATED', devFormio.roleIds?.authenticated),
-      everyone: env('FORMIO_ROLE_ID_EVERYONE', devFormio.roleIds?.everyone),
-    },
-    formIds: {
-      userResource: env('FORMIO_FORM_ID_USER'),
-    },
-    jwtSecret: env('FORMIO_JWT_SECRET'),
-  },
-  prodFormio:
-    naisClusterName !== 'prod-gcp'
-      ? {
-          apiService: env('FORMIO_API_SERVICE_PROD', prodFormio.apiService),
-          projectName: env('FORMIO_PROJECT_NAME_PROD', prodFormio.projectName),
-        }
-      : undefined,
   fyllut: {
     baseUrl: env('FYLLUT_BASE_URL', devFyllut.baseUrl),
     skjemadelingslenkeUrl: 'https://skjemadelingslenke.ekstern.dev.nav.no/fyllut',

packages/bygger-backend/src/config/types.d.ts

@@ -20,15 +20,6 @@ export type PublishRepoConfig = {
   base: string;
 };
 
-export type FormioConfig = {
-  apiService: string;
-  projectName: string;
-  projectId: string;
-  roleIds: Record<string, string>;
-  formIds: Record<string, string>;
-  jwtSecret: string;
-};
-
 export type FyllutConfig = {
   baseUrl: string;
   skjemadelingslenkeUrl: string;
@@ -64,8 +55,6 @@ export type ConfigType = {
   azure: AzureConfig;
   skjemabyggingProxy: SkjemabyggingProxyConfig;
   publishRepo: PublishRepoConfig;
-  formio: FormioConfig;
-  prodFormio?: Pick<FormioConfig, 'apiService' | 'projectName'>;
   fyllut: FyllutConfig;
   formsApi: FormsApiConfig;
   prodFormsApi?: Pick<FormsApiConfig, 'url'>;

packages/bygger-backend/src/middleware/authHandler.ts

@@ -1,7 +1,6 @@
 import { NextFunction, Request, Response } from 'express';
 import { FlattenedJWSInput, JWSHeaderParameters, createRemoteJWKSet, jwtVerify } from 'jose';
 import { GetKeyFunction } from 'jose/dist/types/types';
-import jwt from 'jsonwebtoken';
 import config from '../config';
 import { logger } from '../logging/logger';
 import { AzureAdTokenPayload, User } from '../types/custom';
@@ -73,25 +72,4 @@ const authHandler = async (req: Request, res: Response, next: NextFunction) => {
   next();
 };
 
-export const createFormioJwt = (user: User) => {
-  const { formio } = config;
-  const tokenPayload = {
-    external: true,
-    form: {
-      _id: formio.formIds.userResource,
-    },
-    project: {
-      _id: formio.projectId,
-    },
-    user: {
-      _id: user.NAVident,
-      data: {
-        name: user.name,
-      },
-      roles: [formio.roleIds.authenticated],
-    },
-  };
-  return jwt.sign(tokenPayload, formio.jwtSecret, { expiresIn: '9h' });
-};
-
 export default authHandler;

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

@@ -1,23 +1,17 @@
 import { Response } from 'express';
 import appConfig from '../../config';
-import { createFormioJwt } from '../../middleware/authHandler';
 import { ByggerRequest } from '../../types';
 import { getByggerUrl } from '../../util/url';
 
 const config = (req: ByggerRequest, res: Response) => {
   const user = appConfig.isDevelopment ? undefined : req.getUser?.();
-  if (user) {
-    res.header('Bygger-Formio-Token', createFormioJwt(user));
-  }
   res.json({
-    formioProjectUrl: `${getByggerUrl(req)}/${appConfig.formio.projectName}`,
     fyllutBaseUrl: `${getByggerUrl(req)}/fyllut`,
     skjemadelingslenkeUrl: appConfig.fyllut.skjemadelingslenkeUrl,
     pusherCluster: appConfig.pusher.cluster,
     pusherKey: appConfig.pusher.key,
     isDevelopment: appConfig.isDevelopment,
     featureToggles: appConfig.featureToggles,
-    formioRoleIds: appConfig.formio.roleIds,
     loggerConfig: appConfig.frontendLoggerConfig,
     isProdGcp: appConfig.naisClusterName === 'prod-gcp',
     user,

packages/bygger-backend/src/test/test.env

@@ -1,6 +1,3 @@
-FORMIO_PROJECT_URL=http://formio-api-server.unittest.nav.no
-FORMIO_PROJECT_NAME=abcd1234
-FORMIO_API_SERVICE=http://formio-api-server.unittest.nav.no
 FORMS_API_URL=http://forms-api.unittest.nav.no
 
 AZURE_APP_CLIENT_ID=a123456789

packages/bygger-backend/src/types.d.ts

@@ -8,5 +8,4 @@ interface User {
 
 export type ByggerRequest = Request & {
   getUser?: () => User;
-  getFormioToken?: () => string;
 };

packages/bygger-backend/src/types/express/index.d.ts

@@ -4,7 +4,6 @@ declare global {
   namespace Express {
     export interface Request {
       getUser: () => User;
-      getFormioToken: () => string;
     }
   }
 }

packages/bygger-backend/src/util/formio.ts

@@ -1,5 +1,4 @@
 {
-  "formioProjectUrl": "http://127.0.0.1",
   "fyllutBaseUrl": "http://127.0.0.1",
   "isDevelopment": true,
   "user": { "name": "Test", "preferredUsername": "[email protected]", "NAVident": "K100", "isAdmin": true },

packages/bygger/cypress/fixtures/config.json

@@ -266,7 +266,7 @@ describe('MigrationPage', () => {
               include: ['form3'],
             },
           }),
-          headers: { 'Bygger-Formio-Token': '', 'content-type': 'application/json' },
+          headers: { 'content-type': 'application/json' },
           method: 'POST',
         });
       });

packages/bygger/src/migration/MigrationPage.test.tsx

@@ -1,5 +1,5 @@
 import { Button, Heading, Pagination, ToggleGroup } from '@navikt/ds-react';
-import { makeStyles, NavFormioJs } from '@navikt/skjemadigitalisering-shared-components';
+import { makeStyles } from '@navikt/skjemadigitalisering-shared-components';
 import { Form, MigrationLevel, paginationUtils } from '@navikt/skjemadigitalisering-shared-domain';
 import { useEffect, useMemo, useReducer, useState } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
@@ -132,7 +132,7 @@ const MigrationPage = () => {
   };
 
   const onConfirm = async () => {
-    const updatedForms = await runMigrationWithUpdate(NavFormioJs.Formio.getToken(), {
+    const updatedForms = await runMigrationWithUpdate({
       formSearchFilters: searchFiltersAsParams(formSearchFilters),
       searchFilters: searchFiltersAsParams(searchFilters),
       dependencyFilters: searchFiltersAsParams(dependencyFilters),

packages/bygger/src/migration/MigrationPage.tsx

@@ -2,12 +2,11 @@ import { MigrationLevel } from '@navikt/skjemadigitalisering-shared-domain';
 import { MigrationOptions } from '../../types/migration';
 import { createUrlParams } from './utils';
 
-async function postJson(url, bodyAsJSON, token) {
+async function postJson(url, bodyAsJSON) {
   const result = await fetch(url, {
     method: 'POST',
     headers: {
       'content-type': 'application/json',
-      'Bygger-Formio-Token': token,
     },
     body: JSON.stringify(bodyAsJSON),
   });
@@ -52,18 +51,18 @@ export async function runMigrationDryRun(
   }
 }
 
-export async function runMigrationWithUpdate(token, payload) {
+export async function runMigrationWithUpdate(payload) {
   try {
-    return postJson('/api/migrate/update', { payload }, token);
+    return postJson('/api/migrate/update', { payload });
   } catch (error) {
     console.error(error);
     return [];
   }
 }
 
-export async function bulkPublish(token, payload) {
+export async function bulkPublish(payload) {
   try {
-    return postJson('/api/form-publications', { payload }, token);
+    return postJson('/api/form-publications', { payload });
   } catch (error) {
     console.error(error);
     throw error;

packages/bygger/src/migration/api.ts

@@ -104,7 +104,7 @@ describe('BulkPublishPanel', () => {
       it('bulk publishes selected forms when bulk publish is confirmed', async () => {
         fireEvent.click(screen.getByRole('button', { name: 'Bekreft publisering' }));
         await waitFor(() => expect(bulkPublish).toHaveBeenCalledTimes(1));
-        expect(bulkPublish).toHaveBeenCalledWith('', { formPaths: ['form1', 'form3'] });
+        expect(bulkPublish).toHaveBeenCalledWith({ formPaths: ['form1', 'form3'] });
       });
     });
   });

packages/bygger/src/migration/components/BulkPublishPanel.test.tsx

@@ -1,5 +1,5 @@
 import { Alert, BodyShort, Box, Button, Checkbox, Heading, Table } from '@navikt/ds-react';
-import { ConfirmationModal, makeStyles, NavFormioJs } from '@navikt/skjemadigitalisering-shared-components';
+import { ConfirmationModal, makeStyles } from '@navikt/skjemadigitalisering-shared-components';
 import { Form } from '@navikt/skjemadigitalisering-shared-domain';
 import { useReducer, useState } from 'react';
 import FormStatus from '../../Forms/status/FormStatus';
@@ -66,7 +66,7 @@ const BulkPublishPanel = ({ forms }: Props) => {
   const [statusState, dispatchStatus] = useReducer(statusReducer, {});
 
   const onBulkPublish = async (formPaths: string[]) => {
-    return await bulkPublish(NavFormioJs.Formio.getToken(), { formPaths });
+    return await bulkPublish({ formPaths });
   };
 
   const willBePublished = forms.filter((form) => state[form.path]);

packages/bygger/src/migration/components/BulkPublishPanel.tsx

@@ -13,7 +13,6 @@ interface FetchHeader {
   'Content-Type'?: MimeType;
   Accept?: MimeType;
   'Fyllut-Submission-Method'?: SubmissionMethodType;
-  'Bygger-Formio-Token'?: string;
   'x-jwt-token'?: string; // formio token when invoking formio api directly
   'x-innsendingsid'?: string;
 }