Merge pull request #25 from InseeFr/reactivate-redirection

Reactivate redirection

.gitignore

@@ -23,3 +23,4 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+yarn.lock*

.k8s/deployment.yaml

@@ -14,4 +14,4 @@ spec:
     spec:
       containers:
         - name: coleman-access
-          image: inseefr/coleman-access:0.10.7
+          image: inseefr/coleman-access:0.10.8

package.json

@@ -1,6 +1,6 @@
 {
   "name": "colempub",
-  "version": "0.10.7",
+  "version": "0.10.8",
   "dependencies": {
     "axios": "^0.19.2",
     "bootstrap": "^3.3.7",

src/components/auth/component.js

@@ -1,26 +1,23 @@
-// import React, { useCallback, useEffect, useState } from 'react';
 import React, { useCallback, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import Loading from 'components/loading/loading';
 import ErrorComponent from 'components/template/error-component';
-/* import { extractQuestionnaireUrl } from 'utils/url-utils';
+import { extractQuestionnaireUrl } from 'utils/url-utils';
 import { getSurveyVerifMailById } from 'utils/read-content';
-import { getQuestionnaireUrl } from 'utils/api'; */
+import { getQuestionnaireUrl } from 'utils/api';
 import useAuth from 'utils/hook/auth';
 import NoSurveyPage from 'components/content/ineligible';
 
-const Auth = ({ urlBackEnd, urlMySurveys, id, history, keycloakAuth }) => {
+const Auth = ({ urlBackEnd, id, history, keycloakAuth }) => {
   const { loading, authenticated, authError } = useAuth(keycloakAuth);
   const [error, setError] = useState(null);
-  // const [ineligible, setIneligible] = useState(false);
-
-  const ineligible = false;
+  const [ineligible, setIneligible] = useState(false);
 
   const redirectToUrl = url => {
     window.location = url;
   };
 
-  /* const redirectToQuestionnaire = useCallback(async () => {
+  const redirectToQuestionnaire = useCallback(async () => {
     try {
       const response = await getQuestionnaireUrl(urlBackEnd, keycloakAuth);
       if (response.data && response.data.length) {
@@ -41,11 +38,7 @@ const Auth = ({ urlBackEnd, urlMySurveys, id, history, keycloakAuth }) => {
       // including 410 status - no habilitation found
       setError('technique');
     }
-  }, [history, id, urlBackEnd, keycloakAuth]); */
-
-  const redirectToQuestionnaire = useCallback(() => {
-    redirectToUrl(urlMySurveys);
-  }, [urlMySurveys]);
+  }, [history, id, urlBackEnd, keycloakAuth]);
 
   useEffect(() => {
     if (authenticated && !loading) redirectToQuestionnaire();