From b612ee537d23fce5855452001c5189df5e4f9745 Mon Sep 17 00:00:00 2001 From: Renaud Genevois Date: Mon, 11 Sep 2023 10:49:56 +0200 Subject: [PATCH 1/2] remove token and let axa do the job --- src/components/auth/AuthProvider.tsx | 4 +- src/components/loadSourceData/LoadFromApi.tsx | 41 ++++++++----------- src/components/loadSourceData/LoadFromUrl.tsx | 10 ++--- src/lib/commons/axios-utils.ts | 40 +++--------------- src/lib/surveys/getDepositProof.ts | 9 ++-- src/lib/surveys/getMetadataSurvey.ts | 4 +- src/lib/surveys/getNomenclature.ts | 9 ++-- src/lib/surveys/getRequiredNomenclatures.ts | 9 ++-- src/lib/surveys/getSurvey.ts | 9 ++-- src/lib/surveys/getSurveyUnit.ts | 10 ++--- src/lib/surveys/putSurveyUnitData.ts | 10 ++--- src/lib/surveys/putSurveyUnitStateData.ts | 10 ++--- src/lib/surveys/surveysApi.ts | 25 ++++------- 13 files changed, 59 insertions(+), 131 deletions(-) diff --git a/src/components/auth/AuthProvider.tsx b/src/components/auth/AuthProvider.tsx index 9d3f16e9..3a2c0c67 100644 --- a/src/components/auth/AuthProvider.tsx +++ b/src/components/auth/AuthProvider.tsx @@ -6,7 +6,7 @@ import { } from '@axa-fr/react-oidc'; import { Layout as LayoutSkeleton } from '../skeleton/Layout'; -import { publicGetRequest } from '../../lib/commons/axios-utils'; +import { getRequest } from '../../lib/commons/axios-utils'; import { useAsyncEffect } from '../../hooks/useAsyncEffect'; function Pending() { @@ -18,7 +18,7 @@ type AuthProviderProps = { }; function fetchConfig(): Promise { - return publicGetRequest('/configuration.json'); + return getRequest('/configuration.json'); } export function AuthProvider({ children }: AuthProviderProps) { diff --git a/src/components/loadSourceData/LoadFromApi.tsx b/src/components/loadSourceData/LoadFromApi.tsx index 1b6fe60e..bc044c13 100644 --- a/src/components/loadSourceData/LoadFromApi.tsx +++ b/src/components/loadSourceData/LoadFromApi.tsx @@ -1,5 +1,4 @@ import { PropsWithChildren, useCallback } from 'react'; -import { useOidcAccessToken } from '../../lib/oidc'; import { surveyApi } from '../../lib/surveys/surveysApi'; import { DataVariables, StateData } from '../../typeStromae/type'; @@ -15,8 +14,6 @@ export function LoadFromApi({ unit, children, }: PropsWithChildren) { - const { accessToken } = useOidcAccessToken(); - const getMetadata = useCallback(async () => { if (survey) { return surveyApi.getMetadataSurvey(survey); @@ -25,38 +22,32 @@ export function LoadFromApi({ }, [survey]); const getSurvey = useCallback(async () => { - if (survey && accessToken) { - return surveyApi.getSurvey(survey, accessToken); + if (survey) { + return surveyApi.getSurvey(survey); } return undefined; - }, [survey, accessToken]); + }, [survey]); const getSurveyUnitData = useCallback(async () => { - if (accessToken && unit) { - return surveyApi.getSurveyUnitData(unit, accessToken); + if (unit) { + return surveyApi.getSurveyUnitData(unit); } return undefined; - }, [unit, accessToken]); + }, [unit]); - const getReferentiel = useCallback( - async (name: string) => { - return surveyApi.getNomenclature(name, accessToken); - }, - [accessToken] - ); + const getReferentiel = useCallback(async (name: string) => { + return surveyApi.getNomenclature(name); + }, []); - const getDepositProof = useCallback( - async (unit: string) => { - return surveyApi.getDepositiProof(unit, accessToken); - }, - [accessToken] - ); + const getDepositProof = useCallback(async (unit: string) => { + return surveyApi.getDepositiProof(unit); + }, []); const putSurveyUnitStateData = useCallback( async (state?: StateData) => { try { if (state && unit) { - await surveyApi.putSurveyUnitStateData(state, unit, accessToken); + await surveyApi.putSurveyUnitStateData(state, unit); } } catch (e) { // eslint-disable-next-line no-console @@ -65,7 +56,7 @@ export function LoadFromApi({ } return true; }, - [accessToken, unit] + [unit] ); const putSurveyUnitData = useCallback( @@ -73,7 +64,7 @@ export function LoadFromApi({ try { if (data) { if (unit) { - await surveyApi.putSurveyUnitData(data, unit, accessToken); + await surveyApi.putSurveyUnitData(data, unit); } } } catch (e) { @@ -83,7 +74,7 @@ export function LoadFromApi({ } return true; }, - [accessToken, unit] + [unit] ); return ( diff --git a/src/components/loadSourceData/LoadFromUrl.tsx b/src/components/loadSourceData/LoadFromUrl.tsx index e89b754b..e3c18fbb 100644 --- a/src/components/loadSourceData/LoadFromUrl.tsx +++ b/src/components/loadSourceData/LoadFromUrl.tsx @@ -1,6 +1,6 @@ import { PropsWithChildren, useCallback } from 'react'; import type { LunaticSource } from '../../typeLunatic/type-source'; -import { publicGetRequest } from '../../lib/commons/axios-utils'; +import { getRequest } from '../../lib/commons/axios-utils'; import { SurveyUnitData, MetadataSurvey } from '../../typeStromae/type'; import { loadSourceDataContext } from './LoadSourceDataContext'; @@ -31,19 +31,19 @@ export function LoadFromUrl({ }: PropsWithChildren) { const getMetadata = useCallback(async () => { if (urlMetadata) { - return publicGetRequest(urlMetadata); + return getRequest(urlMetadata); } return undefined; }, [urlMetadata]); const getSurvey = useCallback(async () => { if (urlSource) { - return publicGetRequest(urlSource); + return getRequest(urlSource); } return undefined; }, [urlSource]); const getSurveyUnitData = useCallback(async () => { if (urlData) { - return publicGetRequest(urlData); + return getRequest(urlData); } return undefined; }, [urlData]); @@ -52,7 +52,7 @@ export function LoadFromUrl({ async (name: string): Promise> => { if (name in urlNomenclatures) { const url = urlNomenclatures[name]; - return publicGetRequest>(url); + return getRequest>(url); } return []; diff --git a/src/lib/commons/axios-utils.ts b/src/lib/commons/axios-utils.ts index c8cf2324..5ec66e94 100644 --- a/src/lib/commons/axios-utils.ts +++ b/src/lib/commons/axios-utils.ts @@ -30,18 +30,11 @@ function errorHandler(error: AxiosError) { } } -function jwtHeaders(token: string, contentType?: string) { - return { - Authorization: `Bearer ${token}`, - 'Content-type': contentType ?? 'application/json; charset=utf-8', - }; -} - function publicHeader() { return { 'Content-type': 'application/json; charset=utf-8' }; } -export async function publicGetRequest(url: string) { +export async function getRequest(url: string) { try { const headers = publicHeader(); const { data } = await axios({ method: HTTP_VERBS.get, url, headers }); @@ -52,28 +45,9 @@ export async function publicGetRequest(url: string) { } } -export async function authenticatedGetRequest( - url: string, - token: string, - contentType?: string -) { - try { - const headers = jwtHeaders(token, contentType); - const { data } = await axios({ - method: HTTP_VERBS.get, - url, - headers, - }); - return data; - } catch (error: AxiosError | any) { - errorHandler(error); - throw new Error(`Request fail : ${url}`); - } -} - -export async function authenticatedGetBlob(url: string, token: string) { +export async function getBlob(url: string) { try { - const headers = jwtHeaders(token, 'application/pdf'); + const headers = publicHeader(); const { data } = await axios({ method: HTTP_VERBS.get, url, @@ -87,13 +61,9 @@ export async function authenticatedGetBlob(url: string, token: string) { } } -export async function authenticatedPutRequest( - url: string, - data: T, - token: string -) { +export async function putRequest(url: string, data: T) { try { - const headers = jwtHeaders(token); + const headers = publicHeader(); await axios({ method: HTTP_VERBS.put, url, headers, data }); } catch (error: AxiosError | any) { errorHandler(error); diff --git a/src/lib/surveys/getDepositProof.ts b/src/lib/surveys/getDepositProof.ts index f3019a50..f5a0f98a 100644 --- a/src/lib/surveys/getDepositProof.ts +++ b/src/lib/surveys/getDepositProof.ts @@ -1,7 +1,6 @@ -import { authenticatedGetBlob } from '../commons/axios-utils'; +import { getBlob } from '../commons/axios-utils'; import { depositProof } from './api'; -export const getDepositProof = - (baseUrl: string) => async (unit: string, token: string) => { - return authenticatedGetBlob(depositProof(baseUrl, unit), token); - }; +export const getDepositProof = (baseUrl: string) => async (unit: string) => { + return getBlob(depositProof(baseUrl, unit)); +}; diff --git a/src/lib/surveys/getMetadataSurvey.ts b/src/lib/surveys/getMetadataSurvey.ts index ab13aceb..0f843d62 100644 --- a/src/lib/surveys/getMetadataSurvey.ts +++ b/src/lib/surveys/getMetadataSurvey.ts @@ -1,11 +1,11 @@ import moize from 'moize'; import { MetadataSurvey } from '../../typeStromae/type'; -import { publicGetRequest } from '../commons/axios-utils'; +import { getRequest } from '../commons/axios-utils'; import * as API from './api'; export const getMetadataSurvey = (BASE_URL: string) => moize(async (survey: string): Promise => { const url = API.surveyMetada(BASE_URL, survey); - return publicGetRequest(url); + return getRequest(url); }); diff --git a/src/lib/surveys/getNomenclature.ts b/src/lib/surveys/getNomenclature.ts index f6859bd1..cc316ca3 100644 --- a/src/lib/surveys/getNomenclature.ts +++ b/src/lib/surveys/getNomenclature.ts @@ -1,11 +1,8 @@ -import { authenticatedGetRequest } from '../commons/axios-utils'; +import { getRequest } from '../commons/axios-utils'; import { nomenclature } from './api'; export const getNomenclature = (BASE_URL: string) => - (name: string, token: string): Promise> => { - return authenticatedGetRequest>( - nomenclature(BASE_URL, name), - token - ); + (name: string): Promise> => { + return getRequest>(nomenclature(BASE_URL, name)); }; diff --git a/src/lib/surveys/getRequiredNomenclatures.ts b/src/lib/surveys/getRequiredNomenclatures.ts index a60b88dd..ea22a1ad 100644 --- a/src/lib/surveys/getRequiredNomenclatures.ts +++ b/src/lib/surveys/getRequiredNomenclatures.ts @@ -1,12 +1,9 @@ -import { authenticatedGetRequest } from '../commons/axios-utils'; +import { getRequest } from '../commons/axios-utils'; import { requiredNomenclature } from './api'; export const getRequiredNomenclatures = (BASE_URL: string) => - (survey: string, token: string): Promise> => { - return authenticatedGetRequest>( - requiredNomenclature(BASE_URL, survey), - token - ); + (survey: string): Promise> => { + return getRequest>(requiredNomenclature(BASE_URL, survey)); }; diff --git a/src/lib/surveys/getSurvey.ts b/src/lib/surveys/getSurvey.ts index 6ae62cd3..6000ec81 100644 --- a/src/lib/surveys/getSurvey.ts +++ b/src/lib/surveys/getSurvey.ts @@ -1,4 +1,4 @@ -import { authenticatedGetRequest } from '../commons/axios-utils'; +import { getRequest } from '../commons/axios-utils'; import { LunaticSource } from '../../typeLunatic/type-source'; import { surveySource } from './api'; @@ -8,9 +8,6 @@ import { surveySource } from './api'; */ export const getSurvey = (BASE_URL: string) => - (survey: string, token: string): Promise => { - return authenticatedGetRequest( - surveySource(BASE_URL, survey), - token - ); + (survey: string): Promise => { + return getRequest(surveySource(BASE_URL, survey)); }; diff --git a/src/lib/surveys/getSurveyUnit.ts b/src/lib/surveys/getSurveyUnit.ts index 799464f9..6758eadc 100644 --- a/src/lib/surveys/getSurveyUnit.ts +++ b/src/lib/surveys/getSurveyUnit.ts @@ -1,16 +1,12 @@ import type { SurveyUnitData } from '../../typeStromae/type'; -import { authenticatedGetRequest } from '../commons/axios-utils'; - +import { getRequest } from '../commons/axios-utils'; import { surveyUnit } from './api'; export const getSurveyUnitData = (BASE_URL: string) => - async (unit: string, token: string): Promise => { + async (unit: string): Promise => { const { data, stateData, personalization } = - await authenticatedGetRequest( - surveyUnit(BASE_URL, unit), - token - ); + await getRequest(surveyUnit(BASE_URL, unit)); return { data, stateData, personalization }; }; diff --git a/src/lib/surveys/putSurveyUnitData.ts b/src/lib/surveys/putSurveyUnitData.ts index f5caebdb..2dc5d6dd 100644 --- a/src/lib/surveys/putSurveyUnitData.ts +++ b/src/lib/surveys/putSurveyUnitData.ts @@ -1,13 +1,9 @@ import { DataVariables } from '../../typeStromae/type'; -import { authenticatedPutRequest } from '../commons/axios-utils'; +import { putRequest } from '../commons/axios-utils'; import { surveyUnitDataUrl } from './api'; export const putSurveyUnitData = - (domain: string) => (data: DataVariables, unit: string, token: string) => { - return authenticatedPutRequest( - surveyUnitDataUrl(domain, unit), - data, - token - ); + (domain: string) => (data: DataVariables, unit: string) => { + return putRequest(surveyUnitDataUrl(domain, unit), data); }; diff --git a/src/lib/surveys/putSurveyUnitStateData.ts b/src/lib/surveys/putSurveyUnitStateData.ts index da9304b6..aabe4420 100644 --- a/src/lib/surveys/putSurveyUnitStateData.ts +++ b/src/lib/surveys/putSurveyUnitStateData.ts @@ -1,13 +1,9 @@ import { StateData } from '../../typeStromae/type'; -import { authenticatedPutRequest } from '../commons/axios-utils'; +import { putRequest } from '../commons/axios-utils'; import { surveyUnitStateDataUrl } from './api'; export const putSurveyUnitStateData = - (domain: string) => async (state: StateData, unit: string, token: string) => { - await authenticatedPutRequest( - surveyUnitStateDataUrl(domain, unit), - state, - token - ); + (domain: string) => async (state: StateData, unit: string) => { + await putRequest(surveyUnitStateDataUrl(domain, unit), state); }; diff --git a/src/lib/surveys/surveysApi.ts b/src/lib/surveys/surveysApi.ts index 01f0efa4..2269a87d 100644 --- a/src/lib/surveys/surveysApi.ts +++ b/src/lib/surveys/surveysApi.ts @@ -19,25 +19,14 @@ const DOMAIN: string = process.env.REACT_APP_SURVEY_API_BASE_URL ?? ''; export interface SurveyApi { // any type JSon lunatic - getSurvey: (survey: string, token: string) => Promise; - getSurveyUnitData: (unit: string, token: string) => Promise; + getSurvey: (survey: string) => Promise; + getSurveyUnitData: (unit: string) => Promise; getMetadataSurvey: (survey: string) => Promise; - getRequiredNomenclatures: ( - survey: string, - token: string - ) => Promise>; - getNomenclature: (name: string, token: string) => Promise>; - putSurveyUnitData: ( - data: DataVariables, - unit: string, - token: string - ) => Promise; - putSurveyUnitStateData: ( - stateData: StateData, - unit: string, - token: string - ) => Promise; - getDepositiProof: (unit: string, token: string) => Promise; + getRequiredNomenclatures: (survey: string) => Promise>; + getNomenclature: (name: string) => Promise>; + putSurveyUnitData: (data: DataVariables, unit: string) => Promise; + putSurveyUnitStateData: (stateData: StateData, unit: string) => Promise; + getDepositiProof: (unit: string) => Promise; } export const surveyApi: SurveyApi = { From 8654941da4dc426939bbb41764f8cfabc087defd Mon Sep 17 00:00:00 2001 From: Renaud Genevois Date: Mon, 11 Sep 2023 10:49:56 +0200 Subject: [PATCH 2/2] remove token and let axa do the job --- src/components/auth/AuthProvider.tsx | 5 +-- src/components/loadSourceData/LoadFromApi.tsx | 41 ++++++++----------- src/components/loadSourceData/LoadFromUrl.tsx | 10 ++--- src/lib/commons/axios-utils.ts | 40 +++--------------- src/lib/surveys/getDepositProof.ts | 9 ++-- src/lib/surveys/getMetadataSurvey.ts | 4 +- src/lib/surveys/getNomenclature.ts | 9 ++-- src/lib/surveys/getRequiredNomenclatures.ts | 9 ++-- src/lib/surveys/getSurvey.ts | 9 ++-- src/lib/surveys/getSurveyUnit.ts | 10 ++--- src/lib/surveys/putSurveyUnitData.ts | 10 ++--- src/lib/surveys/putSurveyUnitStateData.ts | 10 ++--- src/lib/surveys/surveysApi.ts | 25 ++++------- 13 files changed, 59 insertions(+), 132 deletions(-) diff --git a/src/components/auth/AuthProvider.tsx b/src/components/auth/AuthProvider.tsx index fa230c9b..d913f169 100644 --- a/src/components/auth/AuthProvider.tsx +++ b/src/components/auth/AuthProvider.tsx @@ -4,10 +4,9 @@ import { OidcProvider, TokenRenewMode, } from '@axa-fr/react-oidc'; - import { Layout as LayoutSkeleton } from '../skeleton/Layout'; import { Authenticating } from '../Oidc/Authenticating'; -import { publicGetRequest } from '../../lib/commons/axios-utils'; +import { getRequest } from '../../lib/commons/axios-utils'; import { useAsyncEffect } from '../../hooks/useAsyncEffect'; import { CallbackSuccess } from '../Oidc/CallbackSuccess'; import { AuthenticatingError } from '../Oidc/AuthenticatingError'; @@ -23,7 +22,7 @@ type AuthProviderProps = { }; function fetchConfig(): Promise { - return publicGetRequest('/configuration.json'); + return getRequest('/configuration.json'); } export function AuthProvider({ children }: AuthProviderProps) { diff --git a/src/components/loadSourceData/LoadFromApi.tsx b/src/components/loadSourceData/LoadFromApi.tsx index 1b6fe60e..bc044c13 100644 --- a/src/components/loadSourceData/LoadFromApi.tsx +++ b/src/components/loadSourceData/LoadFromApi.tsx @@ -1,5 +1,4 @@ import { PropsWithChildren, useCallback } from 'react'; -import { useOidcAccessToken } from '../../lib/oidc'; import { surveyApi } from '../../lib/surveys/surveysApi'; import { DataVariables, StateData } from '../../typeStromae/type'; @@ -15,8 +14,6 @@ export function LoadFromApi({ unit, children, }: PropsWithChildren) { - const { accessToken } = useOidcAccessToken(); - const getMetadata = useCallback(async () => { if (survey) { return surveyApi.getMetadataSurvey(survey); @@ -25,38 +22,32 @@ export function LoadFromApi({ }, [survey]); const getSurvey = useCallback(async () => { - if (survey && accessToken) { - return surveyApi.getSurvey(survey, accessToken); + if (survey) { + return surveyApi.getSurvey(survey); } return undefined; - }, [survey, accessToken]); + }, [survey]); const getSurveyUnitData = useCallback(async () => { - if (accessToken && unit) { - return surveyApi.getSurveyUnitData(unit, accessToken); + if (unit) { + return surveyApi.getSurveyUnitData(unit); } return undefined; - }, [unit, accessToken]); + }, [unit]); - const getReferentiel = useCallback( - async (name: string) => { - return surveyApi.getNomenclature(name, accessToken); - }, - [accessToken] - ); + const getReferentiel = useCallback(async (name: string) => { + return surveyApi.getNomenclature(name); + }, []); - const getDepositProof = useCallback( - async (unit: string) => { - return surveyApi.getDepositiProof(unit, accessToken); - }, - [accessToken] - ); + const getDepositProof = useCallback(async (unit: string) => { + return surveyApi.getDepositiProof(unit); + }, []); const putSurveyUnitStateData = useCallback( async (state?: StateData) => { try { if (state && unit) { - await surveyApi.putSurveyUnitStateData(state, unit, accessToken); + await surveyApi.putSurveyUnitStateData(state, unit); } } catch (e) { // eslint-disable-next-line no-console @@ -65,7 +56,7 @@ export function LoadFromApi({ } return true; }, - [accessToken, unit] + [unit] ); const putSurveyUnitData = useCallback( @@ -73,7 +64,7 @@ export function LoadFromApi({ try { if (data) { if (unit) { - await surveyApi.putSurveyUnitData(data, unit, accessToken); + await surveyApi.putSurveyUnitData(data, unit); } } } catch (e) { @@ -83,7 +74,7 @@ export function LoadFromApi({ } return true; }, - [accessToken, unit] + [unit] ); return ( diff --git a/src/components/loadSourceData/LoadFromUrl.tsx b/src/components/loadSourceData/LoadFromUrl.tsx index e89b754b..e3c18fbb 100644 --- a/src/components/loadSourceData/LoadFromUrl.tsx +++ b/src/components/loadSourceData/LoadFromUrl.tsx @@ -1,6 +1,6 @@ import { PropsWithChildren, useCallback } from 'react'; import type { LunaticSource } from '../../typeLunatic/type-source'; -import { publicGetRequest } from '../../lib/commons/axios-utils'; +import { getRequest } from '../../lib/commons/axios-utils'; import { SurveyUnitData, MetadataSurvey } from '../../typeStromae/type'; import { loadSourceDataContext } from './LoadSourceDataContext'; @@ -31,19 +31,19 @@ export function LoadFromUrl({ }: PropsWithChildren) { const getMetadata = useCallback(async () => { if (urlMetadata) { - return publicGetRequest(urlMetadata); + return getRequest(urlMetadata); } return undefined; }, [urlMetadata]); const getSurvey = useCallback(async () => { if (urlSource) { - return publicGetRequest(urlSource); + return getRequest(urlSource); } return undefined; }, [urlSource]); const getSurveyUnitData = useCallback(async () => { if (urlData) { - return publicGetRequest(urlData); + return getRequest(urlData); } return undefined; }, [urlData]); @@ -52,7 +52,7 @@ export function LoadFromUrl({ async (name: string): Promise> => { if (name in urlNomenclatures) { const url = urlNomenclatures[name]; - return publicGetRequest>(url); + return getRequest>(url); } return []; diff --git a/src/lib/commons/axios-utils.ts b/src/lib/commons/axios-utils.ts index c8cf2324..5ec66e94 100644 --- a/src/lib/commons/axios-utils.ts +++ b/src/lib/commons/axios-utils.ts @@ -30,18 +30,11 @@ function errorHandler(error: AxiosError) { } } -function jwtHeaders(token: string, contentType?: string) { - return { - Authorization: `Bearer ${token}`, - 'Content-type': contentType ?? 'application/json; charset=utf-8', - }; -} - function publicHeader() { return { 'Content-type': 'application/json; charset=utf-8' }; } -export async function publicGetRequest(url: string) { +export async function getRequest(url: string) { try { const headers = publicHeader(); const { data } = await axios({ method: HTTP_VERBS.get, url, headers }); @@ -52,28 +45,9 @@ export async function publicGetRequest(url: string) { } } -export async function authenticatedGetRequest( - url: string, - token: string, - contentType?: string -) { - try { - const headers = jwtHeaders(token, contentType); - const { data } = await axios({ - method: HTTP_VERBS.get, - url, - headers, - }); - return data; - } catch (error: AxiosError | any) { - errorHandler(error); - throw new Error(`Request fail : ${url}`); - } -} - -export async function authenticatedGetBlob(url: string, token: string) { +export async function getBlob(url: string) { try { - const headers = jwtHeaders(token, 'application/pdf'); + const headers = publicHeader(); const { data } = await axios({ method: HTTP_VERBS.get, url, @@ -87,13 +61,9 @@ export async function authenticatedGetBlob(url: string, token: string) { } } -export async function authenticatedPutRequest( - url: string, - data: T, - token: string -) { +export async function putRequest(url: string, data: T) { try { - const headers = jwtHeaders(token); + const headers = publicHeader(); await axios({ method: HTTP_VERBS.put, url, headers, data }); } catch (error: AxiosError | any) { errorHandler(error); diff --git a/src/lib/surveys/getDepositProof.ts b/src/lib/surveys/getDepositProof.ts index f3019a50..f5a0f98a 100644 --- a/src/lib/surveys/getDepositProof.ts +++ b/src/lib/surveys/getDepositProof.ts @@ -1,7 +1,6 @@ -import { authenticatedGetBlob } from '../commons/axios-utils'; +import { getBlob } from '../commons/axios-utils'; import { depositProof } from './api'; -export const getDepositProof = - (baseUrl: string) => async (unit: string, token: string) => { - return authenticatedGetBlob(depositProof(baseUrl, unit), token); - }; +export const getDepositProof = (baseUrl: string) => async (unit: string) => { + return getBlob(depositProof(baseUrl, unit)); +}; diff --git a/src/lib/surveys/getMetadataSurvey.ts b/src/lib/surveys/getMetadataSurvey.ts index ab13aceb..0f843d62 100644 --- a/src/lib/surveys/getMetadataSurvey.ts +++ b/src/lib/surveys/getMetadataSurvey.ts @@ -1,11 +1,11 @@ import moize from 'moize'; import { MetadataSurvey } from '../../typeStromae/type'; -import { publicGetRequest } from '../commons/axios-utils'; +import { getRequest } from '../commons/axios-utils'; import * as API from './api'; export const getMetadataSurvey = (BASE_URL: string) => moize(async (survey: string): Promise => { const url = API.surveyMetada(BASE_URL, survey); - return publicGetRequest(url); + return getRequest(url); }); diff --git a/src/lib/surveys/getNomenclature.ts b/src/lib/surveys/getNomenclature.ts index f6859bd1..cc316ca3 100644 --- a/src/lib/surveys/getNomenclature.ts +++ b/src/lib/surveys/getNomenclature.ts @@ -1,11 +1,8 @@ -import { authenticatedGetRequest } from '../commons/axios-utils'; +import { getRequest } from '../commons/axios-utils'; import { nomenclature } from './api'; export const getNomenclature = (BASE_URL: string) => - (name: string, token: string): Promise> => { - return authenticatedGetRequest>( - nomenclature(BASE_URL, name), - token - ); + (name: string): Promise> => { + return getRequest>(nomenclature(BASE_URL, name)); }; diff --git a/src/lib/surveys/getRequiredNomenclatures.ts b/src/lib/surveys/getRequiredNomenclatures.ts index a60b88dd..ea22a1ad 100644 --- a/src/lib/surveys/getRequiredNomenclatures.ts +++ b/src/lib/surveys/getRequiredNomenclatures.ts @@ -1,12 +1,9 @@ -import { authenticatedGetRequest } from '../commons/axios-utils'; +import { getRequest } from '../commons/axios-utils'; import { requiredNomenclature } from './api'; export const getRequiredNomenclatures = (BASE_URL: string) => - (survey: string, token: string): Promise> => { - return authenticatedGetRequest>( - requiredNomenclature(BASE_URL, survey), - token - ); + (survey: string): Promise> => { + return getRequest>(requiredNomenclature(BASE_URL, survey)); }; diff --git a/src/lib/surveys/getSurvey.ts b/src/lib/surveys/getSurvey.ts index 6ae62cd3..6000ec81 100644 --- a/src/lib/surveys/getSurvey.ts +++ b/src/lib/surveys/getSurvey.ts @@ -1,4 +1,4 @@ -import { authenticatedGetRequest } from '../commons/axios-utils'; +import { getRequest } from '../commons/axios-utils'; import { LunaticSource } from '../../typeLunatic/type-source'; import { surveySource } from './api'; @@ -8,9 +8,6 @@ import { surveySource } from './api'; */ export const getSurvey = (BASE_URL: string) => - (survey: string, token: string): Promise => { - return authenticatedGetRequest( - surveySource(BASE_URL, survey), - token - ); + (survey: string): Promise => { + return getRequest(surveySource(BASE_URL, survey)); }; diff --git a/src/lib/surveys/getSurveyUnit.ts b/src/lib/surveys/getSurveyUnit.ts index 799464f9..6758eadc 100644 --- a/src/lib/surveys/getSurveyUnit.ts +++ b/src/lib/surveys/getSurveyUnit.ts @@ -1,16 +1,12 @@ import type { SurveyUnitData } from '../../typeStromae/type'; -import { authenticatedGetRequest } from '../commons/axios-utils'; - +import { getRequest } from '../commons/axios-utils'; import { surveyUnit } from './api'; export const getSurveyUnitData = (BASE_URL: string) => - async (unit: string, token: string): Promise => { + async (unit: string): Promise => { const { data, stateData, personalization } = - await authenticatedGetRequest( - surveyUnit(BASE_URL, unit), - token - ); + await getRequest(surveyUnit(BASE_URL, unit)); return { data, stateData, personalization }; }; diff --git a/src/lib/surveys/putSurveyUnitData.ts b/src/lib/surveys/putSurveyUnitData.ts index f5caebdb..2dc5d6dd 100644 --- a/src/lib/surveys/putSurveyUnitData.ts +++ b/src/lib/surveys/putSurveyUnitData.ts @@ -1,13 +1,9 @@ import { DataVariables } from '../../typeStromae/type'; -import { authenticatedPutRequest } from '../commons/axios-utils'; +import { putRequest } from '../commons/axios-utils'; import { surveyUnitDataUrl } from './api'; export const putSurveyUnitData = - (domain: string) => (data: DataVariables, unit: string, token: string) => { - return authenticatedPutRequest( - surveyUnitDataUrl(domain, unit), - data, - token - ); + (domain: string) => (data: DataVariables, unit: string) => { + return putRequest(surveyUnitDataUrl(domain, unit), data); }; diff --git a/src/lib/surveys/putSurveyUnitStateData.ts b/src/lib/surveys/putSurveyUnitStateData.ts index da9304b6..aabe4420 100644 --- a/src/lib/surveys/putSurveyUnitStateData.ts +++ b/src/lib/surveys/putSurveyUnitStateData.ts @@ -1,13 +1,9 @@ import { StateData } from '../../typeStromae/type'; -import { authenticatedPutRequest } from '../commons/axios-utils'; +import { putRequest } from '../commons/axios-utils'; import { surveyUnitStateDataUrl } from './api'; export const putSurveyUnitStateData = - (domain: string) => async (state: StateData, unit: string, token: string) => { - await authenticatedPutRequest( - surveyUnitStateDataUrl(domain, unit), - state, - token - ); + (domain: string) => async (state: StateData, unit: string) => { + await putRequest(surveyUnitStateDataUrl(domain, unit), state); }; diff --git a/src/lib/surveys/surveysApi.ts b/src/lib/surveys/surveysApi.ts index 01f0efa4..2269a87d 100644 --- a/src/lib/surveys/surveysApi.ts +++ b/src/lib/surveys/surveysApi.ts @@ -19,25 +19,14 @@ const DOMAIN: string = process.env.REACT_APP_SURVEY_API_BASE_URL ?? ''; export interface SurveyApi { // any type JSon lunatic - getSurvey: (survey: string, token: string) => Promise; - getSurveyUnitData: (unit: string, token: string) => Promise; + getSurvey: (survey: string) => Promise; + getSurveyUnitData: (unit: string) => Promise; getMetadataSurvey: (survey: string) => Promise; - getRequiredNomenclatures: ( - survey: string, - token: string - ) => Promise>; - getNomenclature: (name: string, token: string) => Promise>; - putSurveyUnitData: ( - data: DataVariables, - unit: string, - token: string - ) => Promise; - putSurveyUnitStateData: ( - stateData: StateData, - unit: string, - token: string - ) => Promise; - getDepositiProof: (unit: string, token: string) => Promise; + getRequiredNomenclatures: (survey: string) => Promise>; + getNomenclature: (name: string) => Promise>; + putSurveyUnitData: (data: DataVariables, unit: string) => Promise; + putSurveyUnitStateData: (stateData: StateData, unit: string) => Promise; + getDepositiProof: (unit: string) => Promise; } export const surveyApi: SurveyApi = {