Put providers

Signed-off-by: soupette <cyril@strapi.io>

packages/plugins/users-permissions/admin/src/hooks/useForm/index.js

@@ -72,9 +72,10 @@ const useUserForm = (endPoint, permissions) => {
     dispatch({ type: 'SET_ERRORS', errors });
   }, []);
 
-  const dispatchSubmitSucceeded = useCallback(() => {
+  const dispatchSubmitSucceeded = useCallback(data => {
     dispatch({
       type: 'ON_SUBMIT_SUCCEEDED',
+      data,
     });
   }, []);
 

packages/plugins/users-permissions/admin/src/hooks/useForm/reducer.js

@@ -36,13 +36,14 @@ const reducer = (state, action) =>
         break;
       }
       case 'ON_SUBMIT_SUCCEEDED': {
-        draftState.initialData = state.modifiedData;
+        draftState.initialData = action.data;
-        draftState.formErrors = {};
+        draftState.modifiedData = action.data;
+        // draftState.formErrors = {};
         break;
       }
       case 'RESET_FORM': {
         draftState.modifiedData = state.initialData;
-        draftState.formErrors = {};
+        // draftState.formErrors = {};
         break;
       }
       case 'SET_ERRORS': {

packages/plugins/users-permissions/admin/src/pages/Providers/index.js

@@ -2,30 +2,15 @@ import React, { useMemo, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 import {
   SettingsPageTitle,
-  // SizedInput,
-  // useTracking,
-  // getYupInnerErrors,
-  // request,
-  // useNotification,
-  // useOverlayBlocker,
   LoadingIndicatorPage,
-  // SizedInput,
   useTracking,
-  // getYupInnerErrors,
-  // request,
   useNotification,
   useOverlayBlocker,
   CheckPagePermissions,
 } from '@strapi/helper-plugin';
 import has from 'lodash/has';
 import upperFirst from 'lodash/upperFirst';
-// import { get, upperFirst, has } from 'lodash';
-// import has from 'lodash/has';
-// import { Row } from 'reactstrap';
-
-// // DS INTEGRATION
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-
 import { HeaderLayout, Layout, ContentLayout } from '@strapi/parts/Layout';
 import { Main } from '@strapi/parts/Main';
 import { Table, Thead, Tr, Th, Tbody, Td } from '@strapi/parts/Table';
@@ -35,14 +20,11 @@ import { IconButton } from '@strapi/parts/IconButton';
 import EditIcon from '@strapi/icons/EditIcon';
 import forms from './utils/forms';
 import createProvidersArray from './utils/createProvidersArray';
-// import ModalForm from '../../components/ModalForm';
+import { getRequestURL, getTrad } from '../../utils';
-import {
-  // getRequestURL,
-  getTrad,
-} from '../../utils';
 import { useForm } from '../../hooks';
 import pluginPermissions from '../../permissions';
 import FormModal from '../../components/FormModal';
+import { axiosInstance } from '../../../../../../core/admin/admin/src/core/utils';
 
 export const ProvidersPage = () => {
   const { formatMessage } = useIntl();
@@ -51,8 +33,6 @@ export const ProvidersPage = () => {
   const trackUsageRef = useRef(trackUsage);
   const [isOpen, setIsOpen] = useState(false);
   const [isSubmiting, setIsSubmiting] = useState(false);
-  // const buttonSubmitRef = useRef(null);
-  // const [showForm, setShowForm] = useState(false);
   const [providerToEditName, setProviderToEditName] = useState(null);
   const toggleNotification = useNotification();
   const { lockApp, unlockApp } = useOverlayBlocker();
@@ -63,11 +43,7 @@ export const ProvidersPage = () => {
 
   const {
     allowedActions: { canUpdate },
-    // dispatchResetForm,
+    dispatchSubmitSucceeded,
-    // dispatchSetFormErrors,
-    // dispatchSubmitSucceeded,
-    // formErrors,
-    // handleChange,
     isLoading,
     isLoadingForPermissions,
     modifiedData,
@@ -104,10 +80,6 @@ export const ProvidersPage = () => {
     return forms.providers;
   }, [providerToEditName, isProviderWithSubdomain]);
 
-  // const handleClick = useCallback(() => {
-  //   buttonSubmitRef.current.click();
-  // }, []);
-
   const handleToggleModal = () => {
     setIsOpen(prev => !prev);
   };
@@ -119,19 +91,7 @@ export const ProvidersPage = () => {
     }
   };
 
-  // const handleClosed = useCallback(() => {
+  const handleSubmit = async values => {
-  //   setProviderToEditName(null);
-  //   setShowForm(false);
-  //   dispatchResetForm();
-  // }, [dispatchResetForm]);
-
-  // const handleOpened = useCallback(() => {
-  //   setShowForm(true);
-  // }, []);
-
-  const handleSubmit = async () => {
-    // e.preventDefault();
-
     setIsSubmiting(true);
 
     lockApp();
@@ -139,10 +99,10 @@ export const ProvidersPage = () => {
     try {
       trackUsageRef.current('willEditAuthenticationProvider');
 
-      // await request(getRequestURL('providers'), {
+      const body = { ...modifiedData, [providerToEditName]: values };
-      //   method: 'PUT',
+      const endPoint = getRequestURL('providers');
-      //   body: { providers: modifiedData },
+
-      // });
+      await axiosInstance.put(endPoint, { providers: body });
 
       trackUsageRef.current('didEditAuthenticationProvider');
 
@@ -151,9 +111,9 @@ export const ProvidersPage = () => {
         message: { id: getTrad('notification.success.submit') },
       });
 
-      // dispatchSubmitSucceeded();
+      dispatchSubmitSucceeded(body);
 
-      // handleToggle();
+      handleToggleModal();
     } catch (err) {
       console.error(err);
       toggleNotification({
@@ -166,8 +126,6 @@ export const ProvidersPage = () => {
     unlockApp();
   };
 
-  console.log({ modifiedData, providerToEditName });
-
   return (
     <Layout>
       <SettingsPageTitle name={pageTitle} />
@@ -281,55 +239,6 @@ export const ProvidersPage = () => {
         onSubmit={handleSubmit}
         providerToEditName={providerToEditName}
       />
-
-      {/* <ModalForm
-        isOpen={isOpen}
-        onClick={handleClick}
-        onCancel={handleToggle}
-        isLoading={isSubmiting}
-        onOpened={handleOpened}
-        onClosed={handleClosed}
-        onToggle={handleToggle}
-        headerBreadcrumbs={[
-          formatMessage({
-            id: getTrad('PopUpForm.header.edit.providers'),
-            defaultMessage: 'Edit Provider',
-          }),
-          upperFirst(providerToEditName),
-        ]}
-      >
-        {showForm && (
-          <form onSubmit={handleSubmit}>
-            <Row>
-              {layoutToRender.form.map(input => {
-                const label = input.label.params
-                  ? { ...input.label, params: { provider: upperFirst(providerToEditName) } }
-                  : input.label;
-
-                const value =
-                  input.name === 'noName'
-                    ? `${strapi.backendURL}/connect/${providerToEditName}/callback`
-                    : get(modifiedData, [providerToEditName, ...input.name.split('.')], '');
-
-                return (
-                  <SizedInput
-                    key={input.name}
-                    {...input}
-                    label={label}
-                    error={formErrors[input.name]}
-                    name={`${providerToEditName}.${input.name}`}
-                    onChange={handleChange}
-                    value={value}
-                  />
-                );
-              })}
-            </Row>
-            <button type="submit" style={{ display: 'none' }} ref={buttonSubmitRef}>
-              hidden button to use the native form event
-            </button>
-          </form>
-        )}
-      </ModalForm> */}
     </Layout>
   );
 };

packages/plugins/users-permissions/admin/src/utils/axiosInstance.js

@@ -0,0 +1,24 @@
+import axios from 'axios';
+import { auth } from '@strapi/helper-plugin';
+
+const instance = axios.create({
+  baseURL: process.env.STRAPI_ADMIN_BACKEND_URL,
+  timeout: 1000,
+});
+
+instance.interceptors.request.use(
+  async config => {
+    config.headers = {
+      Authorization: `Bearer ${auth.getToken()}`,
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+    };
+
+    return config;
+  },
+  error => {
+    Promise.reject(error);
+  }
+);
+
+export default instance;

packages/plugins/users-permissions/admin/src/utils/index.js

@@ -1,3 +1,4 @@
+export { default as axiosInstance } from './axiosInstance';
 export { default as cleanPermissions } from './cleanPermissions';
 export { default as getRequestURL } from './getRequestURL';
 export { default as getTrad } from './getTrad';