chore: Unify term types

client/src/api/terms.js

@@ -7,8 +7,8 @@ import http from './http';
 
 /* Actions */
 
-const getTerms = (type, language, headers) =>
-  http.get(`/terms/${type}${language ? `?language=${language}` : ''}`, undefined, headers);
+const getTerms = (language, headers) =>
+  http.get(`/terms${language ? `?language=${language}` : ''}`, undefined, headers);
 
 export default {
   getTerms,

client/src/components/common/AboutModal/TermsPane.jsx

@@ -4,19 +4,15 @@
  */
 
 import React, { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { Loader, Tab } from 'semantic-ui-react';
 
-import selectors from '../../../selectors';
 import api from '../../../api';
 import Markdown from '../Markdown';
 
 import styles from './TermsPane.module.scss';
 
 const TermsPane = React.memo(() => {
-  const type = useSelector((state) => selectors.selectCurrentUser(state).termsType);
-
   const { i18n } = useTranslation();
   const [content, setContent] = useState(null);
 
@@ -24,7 +20,7 @@ const TermsPane = React.memo(() => {
     async function fetchTerms() {
       let terms;
       try {
-        ({ item: terms } = await api.getTerms(type, i18n.resolvedLanguage));
+        ({ item: terms } = await api.getTerms(i18n.resolvedLanguage));
       } catch {
         return;
       }
@@ -33,7 +29,7 @@ const TermsPane = React.memo(() => {
     }
 
     fetchTerms();
-  }, [type, i18n.resolvedLanguage]);
+  }, [i18n.resolvedLanguage]);
 
   return (
     <Tab.Pane attached={false} className={styles.wrapper}>

client/src/sagas/login/services/login.js

@@ -30,7 +30,7 @@ export function* authenticate(data) {
   } catch (error) {
     let terms;
     if (error.step === AccessTokenSteps.ACCEPT_TERMS) {
-      ({ item: terms } = yield call(api.getTerms, error.termsType, i18n.resolvedLanguage));
+      ({ item: terms } = yield call(api.getTerms, i18n.resolvedLanguage));
     }
 
     yield put(actions.authenticate.failure(error, terms));
@@ -129,7 +129,7 @@ export function* authenticateWithOidcCallback() {
   } catch (error) {
     let terms;
     if (error.step === AccessTokenSteps.ACCEPT_TERMS) {
-      ({ item: terms } = yield call(api.getTerms, error.termsType, i18n.resolvedLanguage));
+      ({ item: terms } = yield call(api.getTerms, i18n.resolvedLanguage));
     }
 
     yield put(actions.authenticateWithOidc.failure(error, terms));
@@ -185,15 +185,9 @@ export function* cancelTerms() {
 export function* updateTermsLanguage(value) {
   yield put(actions.updateTermsLanguage(value));
 
-  const {
-    termsForm: {
-      payload: { type },
-    },
-  } = yield select(selectors.selectAuthenticateForm);
-
   let terms;
   try {
-    ({ item: terms } = yield call(api.getTerms, type, value));
+    ({ item: terms } = yield call(api.getTerms, value));
   } catch (error) {
     yield put(actions.updateTermsLanguage.failure(error));
     return;