Feat/new translation

packages/bygger-backend/src/routers/api/formio-global-translations/index.ts

@@ -0,0 +1,25 @@
+import { Language } from '@navikt/skjemadigitalisering-shared-domain';
+import express, { NextFunction, Request, Response } from 'express';
+import config from '../../../config';
+import { copyService } from '../../../services';
+
+const formioGlobalTranslationsRouter = express.Router();
+
+formioGlobalTranslationsRouter.put(
+  '/:language/copy-from-prod',
+  async (req: Request, res: Response, next: NextFunction) => {
+    if (config.naisClusterName === 'prod-gcp' || !copyService) {
+      return res.sendStatus(405);
+    }
+    try {
+      const { language } = req.params;
+      const formioToken = req.getFormioToken?.();
+      await copyService.globalTranslations(language as Language, formioToken);
+      return res.sendStatus(201);
+    } catch (error) {
+      next(error);
+    }
+  },
+);
+
+export default formioGlobalTranslationsRouter;

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

@@ -0,0 +1,56 @@
+import { FormsApiFormTranslation } from '@navikt/skjemadigitalisering-shared-domain';
+import { RequestHandler } from 'express';
+import { HttpError as OldHttpError } from '../../../fetchUtils';
+import { formTranslationsService } from '../../../services';
+import { HttpError } from '../helpers/errors';
+
+const get: RequestHandler = async (req, res, next) => {
+  const { formPath } = req.params;
+  try {
+    const translations = await formTranslationsService.get(formPath);
+    res.json(translations);
+  } catch (error) {
+    next(error);
+  }
+};
+
+const post: RequestHandler = async (req, res, next) => {
+  const { formPath } = req.params;
+  const accessToken = req.headers.AzureAccessToken as string;
+  const { key, nb, nn, en, globalTranslationId } = req.body as FormsApiFormTranslation;
+  const body = globalTranslationId ? { key, globalTranslationId } : { key, nb, nn, en };
+  try {
+    const translation = await formTranslationsService.post(formPath, body, accessToken);
+    res.status(201).json(translation);
+  } catch (error) {
+    if (error instanceof OldHttpError) {
+      next(new HttpError(error.message, error.response.status));
+    } else {
+      next(error);
+    }
+  }
+};
+
+const put: RequestHandler = async (req, res, next) => {
+  const { formPath, id } = req.params;
+  const { revision, nb, nn, en, globalTranslationId } = req.body as FormsApiFormTranslation;
+  const accessToken = req.headers.AzureAccessToken as string;
+  const body = globalTranslationId ? { globalTranslationId } : { nb, nn, en };
+  try {
+    const translation = await formTranslationsService.put(formPath, id, body, revision!, accessToken);
+    res.json(translation);
+  } catch (error) {
+    if (error instanceof OldHttpError) {
+      next(new HttpError(error.message, error.response.status));
+    } else {
+      next(error);
+    }
+  }
+};
+
+const formTranslations = {
+  get,
+  post,
+  put,
+};
+export default formTranslations;

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

@@ -0,0 +1,10 @@
+import { Router } from 'express';
+import formTranslations from './form-translations';
+
+const formsApiFormTranslationsRouter = Router({ mergeParams: true });
+
+formsApiFormTranslationsRouter.get('/', formTranslations.get);
+formsApiFormTranslationsRouter.post('/', formTranslations.post);
+formsApiFormTranslationsRouter.put('/:id', formTranslations.put);
+
+export default formsApiFormTranslationsRouter;

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

@@ -0,0 +1,54 @@
+import { FormsApiGlobalTranslation } from '@navikt/skjemadigitalisering-shared-domain';
+import { RequestHandler } from 'express';
+import { HttpError as OldHttpError } from '../../../fetchUtils';
+import { globalTranslationsService } from '../../../services';
+import { HttpError } from '../helpers/errors';
+
+const get: RequestHandler = async (req, res, next) => {
+  try {
+    const translations = await globalTranslationsService.get();
+    res.json(translations);
+  } catch (error) {
+    next(error);
+  }
+};
+
+const post: RequestHandler = async (req, res, next) => {
+  const accessToken = req.headers.AzureAccessToken as string;
+  const { key, tag, nb, nn, en } = req.body as FormsApiGlobalTranslation;
+  const body = { key, tag, nb, nn, en };
+  try {
+    const translation = await globalTranslationsService.post(body, accessToken);
+    res.status(201).json(translation);
+  } catch (error) {
+    if (error instanceof OldHttpError) {
+      next(new HttpError(error.message, error.response.status));
+    } else {
+      next(error);
+    }
+  }
+};
+
+const put: RequestHandler = async (req, res, next) => {
+  const { id } = req.params;
+  const { revision, nb, nn, en } = req.body as FormsApiGlobalTranslation;
+  const accessToken = req.headers.AzureAccessToken as string;
+  const body = { nb, nn, en };
+  try {
+    const translation = await globalTranslationsService.put(id, body, revision!, accessToken);
+    res.json(translation);
+  } catch (error) {
+    if (error instanceof OldHttpError) {
+      next(new HttpError(error.message, error.response.status));
+    } else {
+      next(error);
+    }
+  }
+};
+
+const globalTranslations = {
+  get,
+  post,
+  put,
+};
+export default globalTranslations;

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

@@ -0,0 +1,10 @@
+import { Router } from 'express';
+import globalTranslations from './global-translations';
+
+const formsApiGlobalTranslationsRouter = Router();
+
+formsApiGlobalTranslationsRouter.get('/', globalTranslations.get);
+formsApiGlobalTranslationsRouter.post('/', globalTranslations.post);
+formsApiGlobalTranslationsRouter.put('/:id', globalTranslations.put);
+
+export default formsApiGlobalTranslationsRouter;

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

@@ -1,14 +1,17 @@
 import express from 'express';
-import authorizedPublisher from '../helpers/authorizedPublisher';
+import formsApiFormTranslationsRouter from '../forms-api-form-translations';
+import authHandlers from '../helpers/authHandlers';
 import form from './form';
 import forms from './forms';
 
 const formsRouter = express.Router();
+const { authorizedPublisher, formsApiAuthHandler } = authHandlers;
 
 formsRouter.get('/', forms.get);
 formsRouter.get('/:formPath', form.get);
 formsRouter.put('/:formPath', authorizedPublisher, form.put);
 formsRouter.put('/:formPath/overwrite-with-prod', authorizedPublisher, form.copyFromProd);
 formsRouter.put('/:formPath/form-settings', authorizedPublisher, form.putFormSettings);
+formsRouter.use('/:formPath/translations', formsApiAuthHandler, formsApiFormTranslationsRouter);
 
 export default formsRouter;

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

@@ -6,8 +6,9 @@ import deprecatedPublishForm from './deprecated-publish-form';
 import deprecatedUnpublishForm from './deprecated-unpublish-form';
 import enhetsliste from './enhetsliste';
 import formDiff from './formDiff';
+import formioGlobalTranslationsRouter from './formio-global-translations';
 import formsRouter from './forms';
-import globalTranslationsRouter from './global-translations';
+import formsApiGlobalTranslationsRouter from './forms-api-global-translations';
 import apiErrorHandler from './helpers/apiErrorHandler';
 import authHandlers from './helpers/authHandlers';
 import importRouter from './import';
@@ -45,8 +46,9 @@ apiRouter.post('/migrate/update', authorizedPublisher, migrateUpdate);
 apiRouter.get('/form/:formPath/diff', formDiff);
 apiRouter.use('/forms', formsRouter);
 apiRouter.use('/recipients', formsApiAuthHandler, recipientsRouter);
+apiRouter.use('/translations', formsApiAuthHandler, formsApiGlobalTranslationsRouter);
 apiRouter.use('/import', importRouter);
-apiRouter.use('/global-translations', authorizedPublisher, globalTranslationsRouter);
+apiRouter.use('/global-translations', authorizedPublisher, formioGlobalTranslationsRouter);
 apiRouter.post('/log/:level', rateLimiter(60000, 60), log);
 
 apiRouter.use(apiErrorHandler);

packages/bygger-backend/src/services/RecipientService.ts

@@ -1,7 +1,7 @@
 import { Recipient } from '@navikt/skjemadigitalisering-shared-domain';
 import { fetchWithErrorHandling } from '../fetchUtils';
 
-export class RecipientService {
+export default class RecipientService {
   readonly formsApiUrl: string;
   readonly recipientsUrl: string;
 

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

@@ -5,8 +5,10 @@ import { createCopyService } from './copy/CopyService';
 import { FormioService } from './formioService';
 import PublisherService from './PublisherService';
 import PusherService from './PusherService';
-import { RecipientService } from './RecipientService';
+import RecipientService from './RecipientService';
 import ReportService from './ReportService';
+import createFormTranslationsService from './translation/FormTranslationService';
+import createGlobalTranslationService from './translation/GlobalTranslationsService';
 
 const formioApiServiceUrl = getFormioApiServiceUrl();
 const prodFormioApiServiceUrl = getFormioApiProdServiceUrl();
@@ -23,6 +25,10 @@ const reportService = new ReportService(formioService);
 
 const pusherService = new PusherService();
 
+const formTranslationsService = createFormTranslationsService(config.formsApi.url);
+
+const globalTranslationsService = createGlobalTranslationService(config.formsApi.url);
+
 const copyService = prodFormioApiServiceUrl
   ? createCopyService(new FormioService(prodFormioApiServiceUrl), formioService)
   : null;
@@ -31,6 +37,8 @@ export {
   backendInstance,
   copyService,
   formioService,
+  formTranslationsService,
+  globalTranslationsService,
   publisherService,
   pusherService,
   recipientService,

packages/bygger-backend/src/services/translation/FormTranslationService.ts

@@ -0,0 +1,50 @@
+import { FormsApiFormTranslation } from '@navikt/skjemadigitalisering-shared-domain';
+import { fetchWithErrorHandling } from '../../fetchUtils';
+import { FormTranslationPostBody, FormTranslationPutBody, FormTranslationService } from './types';
+import { createHeaders } from './utils';
+
+const createFormTranslationsService = (formsApiUrl: string): FormTranslationService => {
+  const formsApiTranslationsUrl = `${formsApiUrl}/v1/forms`;
+  const translationsPath = 'translations';
+
+  return {
+    get: async (formPath: string): Promise<FormsApiFormTranslation[]> => {
+      const response = await fetchWithErrorHandling(`${formsApiTranslationsUrl}/${formPath}/${translationsPath}`, {
+        headers: createHeaders(),
+      });
+      return response.data as FormsApiFormTranslation[];
+    },
+    post: async (
+      formPath: string,
+      translation: FormTranslationPostBody,
+      accessToken: string,
+    ): Promise<FormsApiFormTranslation> => {
+      const response = await fetchWithErrorHandling(`${formsApiTranslationsUrl}/${formPath}/${translationsPath}`, {
+        method: 'POST',
+        headers: createHeaders(accessToken),
+        body: JSON.stringify(translation),
+      });
+      return response.data as FormsApiFormTranslation;
+    },
+
+    put: async (
+      formPath: string,
+      id: string,
+      body: FormTranslationPutBody,
+      revision: number,
+      accessToken: string,
+    ): Promise<FormsApiFormTranslation> => {
+      const response = await fetchWithErrorHandling(
+        `${formsApiTranslationsUrl}/${formPath}/${translationsPath}/${id}`,
+        {
+          method: 'PUT',
+          headers: createHeaders(accessToken, revision),
+          body: JSON.stringify(body),
+        },
+      );
+      return response.data as FormsApiFormTranslation;
+    },
+  };
+};
+
+export default createFormTranslationsService;

packages/bygger-backend/src/services/translation/GlobalTranslationsService.ts

@@ -0,0 +1,40 @@
+import { FormsApiGlobalTranslation } from '@navikt/skjemadigitalisering-shared-domain';
+import { fetchWithErrorHandling } from '../../fetchUtils';
+import { GlobalTranslationPostBody, GlobalTranslationPutBody, GlobalTranslationService } from './types';
+import { createHeaders } from './utils';
+
+const createGlobalTranslationService = (formsApiUrl: string): GlobalTranslationService => {
+  const globalTranslationsPath: string = '/v1/global-translations';
+
+  return {
+    get: async (): Promise<FormsApiGlobalTranslation[]> => {
+      const response = await fetchWithErrorHandling(`${formsApiUrl}${globalTranslationsPath}`, {
+        headers: createHeaders(),
+      });
+      return response.data as FormsApiGlobalTranslation[];
+    },
+    post: async (body: GlobalTranslationPostBody, accessToken?: string): Promise<FormsApiGlobalTranslation> => {
+      const response = await fetchWithErrorHandling(`${formsApiUrl}${globalTranslationsPath}`, {
+        method: 'POST',
+        headers: createHeaders(accessToken),
+        body: JSON.stringify(body),
+      });
+      return response.data as FormsApiGlobalTranslation;
+    },
+    put: async (
+      id: string,
+      body: GlobalTranslationPutBody,
+      revision: number,
+      accessToken: string,
+    ): Promise<FormsApiGlobalTranslation> => {
+      const response = await fetchWithErrorHandling(`${formsApiUrl}${globalTranslationsPath}/${id}`, {
+        method: 'PUT',
+        headers: createHeaders(accessToken, revision),
+        body: JSON.stringify(body),
+      });
+      return response.data as FormsApiGlobalTranslation;
+    },
+  };
+};
+
+export default createGlobalTranslationService;

packages/bygger-backend/src/services/translation/types.ts

@@ -0,0 +1,38 @@
+import { FormsApiFormTranslation, FormsApiGlobalTranslation } from '@navikt/skjemadigitalisering-shared-domain';
+
+type FormTranslationPostBody = Pick<FormsApiFormTranslation, 'key' | 'nb' | 'nn' | 'en' | 'globalTranslationId'>;
+type FormTranslationPutBody = Pick<FormsApiFormTranslation, 'nb' | 'nn' | 'en' | 'globalTranslationId'>;
+type GlobalTranslationPostBody = Pick<FormsApiGlobalTranslation, 'key' | 'tag' | 'nb' | 'nn' | 'en'>;
+type GlobalTranslationPutBody = Pick<FormsApiGlobalTranslation, 'nb' | 'nn' | 'en'>;
+
+type FormTranslationService = {
+  get: (formPath: string) => Promise<FormsApiFormTranslation[]>;
+  post: (formPath: string, body: FormTranslationPostBody, accessToken: string) => Promise<FormsApiFormTranslation>;
+  put: (
+    formPath: string,
+    id: string,
+    body: FormTranslationPutBody,
+    revision: number,
+    accessToken: string,
+  ) => Promise<FormsApiFormTranslation>;
+};
+
+type GlobalTranslationService = {
+  get: () => Promise<FormsApiGlobalTranslation[]>;
+  post: (body: GlobalTranslationPostBody, accessToken: string) => Promise<FormsApiGlobalTranslation>;
+  put: (
+    id: string,
+    body: GlobalTranslationPutBody,
+    revision: number,
+    accessToken: string,
+  ) => Promise<FormsApiGlobalTranslation>;
+};
+
+export type {
+  FormTranslationPostBody,
+  FormTranslationPutBody,
+  FormTranslationService,
+  GlobalTranslationPostBody,
+  GlobalTranslationPutBody,
+  GlobalTranslationService,
+};