From 84c0afab0ca5044f89651d45ea08dc18927a31a7 Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Fri, 26 Mar 2021 19:53:18 +0100
Subject: [PATCH 01/15] Small optimizations

---
 admin/src/components/ActionButtons/index.js | 3 +++
 admin/src/index.js                          | 1 -
 config/config.json                          | 4 +++-
 package.json                                | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/ActionButtons/index.js b/admin/src/components/ActionButtons/index.js
index f642838..f570552 100644
--- a/admin/src/components/ActionButtons/index.js
+++ b/admin/src/components/ActionButtons/index.js
@@ -25,6 +25,9 @@ const ActionButtons = ({ diff }) => {
     <ActionButtonsStyling>
       <Button disabled={isEmpty(diff.fileConfig)} color="primary" label="Import" onClick={() => openModal('import')} />
       <Button disabled={isEmpty(diff.fileConfig)} color="primary" label="Export" onClick={() => openModal('export')} />
+      {!isEmpty(diff.diff) && (
+        <h4 style={{ display: 'inline' }}>{Object.keys(diff.diff).length} {Object.keys(diff.diff).length === 1 ? "config change" : "config changes"}</h4>
+      )}
       <ConfirmModal
         isOpen={modalIsOpen}
         onClose={closeModal}
diff --git a/admin/src/index.js b/admin/src/index.js
index c700182..52cb61c 100644
--- a/admin/src/index.js
+++ b/admin/src/index.js
@@ -23,7 +23,6 @@ export default strapi => {
     blockerComponent: null,
     blockerComponentProps: {},
     description: pluginDescription,
-    icon: pluginPkg.strapi.icon,
     id: pluginId,
     initializer: Initializer,
     injectedComponents: [],
diff --git a/config/config.json b/config/config.json
index e42c20e..d46c723 100644
--- a/config/config.json
+++ b/config/config.json
@@ -7,5 +7,7 @@
     "role-permissions",
     "webhooks"
   ],
-  "exclude": []
+  "exclude": [
+    "core-store.plugin_users-permissions_grant"
+  ]
 }
diff --git a/package.json b/package.json
index 517a83f..c97c253 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "Manage your Strapi database configuration as partial json files which can be imported/exported across environments. ",
   "strapi": {
     "name": "config-sync",
-    "icon": "plug",
+    "icon": "sync",
     "description": "Manage your Strapi database configuration as partial json files which can be imported/exported across environments. "
   },
   "dependencies": {

From b6f1f354ea7945de8d8951af73605dffc8d8af81 Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Sat, 27 Mar 2021 00:29:21 +0100
Subject: [PATCH 02/15] Fix exclude setting

---
 services/core-store.js       | 12 ++++++++++++
 services/role-permissions.js | 12 ++++++++++++
 services/webhooks.js         | 12 ++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/services/core-store.js b/services/core-store.js
index 975dd3b..57c2039 100644
--- a/services/core-store.js
+++ b/services/core-store.js
@@ -17,6 +17,10 @@ module.exports = {
     const coreStore = await strapi.query(coreStoreQueryString).find({ _limit: -1 });
 
     await Promise.all(Object.values(coreStore).map(async ({ id, ...config }) => {
+      // Check if the config should be excluded.
+      const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${config.key}`);
+      if (shouldExclude) return;
+
       config.value = JSON.parse(config.value);
       await strapi.plugins['config-sync'].services.main.writeConfigFile(configPrefix, config.key, config);
     }));
@@ -30,6 +34,10 @@ module.exports = {
    * @returns {void}
    */
   importSingle: async (configName, configContent) => {
+    // Check if the config should be excluded.
+    const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${configName}`);
+    if (shouldExclude) return;
+
     const { value, ...fileContent } = configContent;
     const coreStoreAPI = strapi.query(coreStoreQueryString);
 
@@ -53,6 +61,10 @@ module.exports = {
     let configs = {};
 
     Object.values(coreStore).map( ({ id, value, key, ...config }) => {
+      // Check if the config should be excluded.
+      const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${key}`);
+      if (shouldExclude) return;
+
       configs[`${configPrefix}.${key}`] = { key, value: JSON.parse(value), ...config };
     });
 
diff --git a/services/role-permissions.js b/services/role-permissions.js
index 18234b4..406899a 100644
--- a/services/role-permissions.js
+++ b/services/role-permissions.js
@@ -34,6 +34,10 @@ module.exports = {
     );
 
     await Promise.all(sanitizedRolesArray.map(async (config) => {
+      // Check if the config should be excluded.
+      const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${config.type}`);
+      if (shouldExclude) return;
+
       await strapi.plugins['config-sync'].services.main.writeConfigFile(configPrefix, config.type, config);
     }));
   },
@@ -46,6 +50,10 @@ module.exports = {
    * @returns {void}
    */
   importSingle: async (configName, configContent) => {
+    // Check if the config should be excluded.
+    const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${configName}`);
+    if (shouldExclude) return;
+
     const service =
       strapi.plugins['users-permissions'].services.userspermissions;
       
@@ -90,6 +98,10 @@ module.exports = {
     let configs = {};
 
     Object.values(sanitizedRolesArray).map((config) => {
+      // Check if the config should be excluded.
+      const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${config.type}`);
+      if (shouldExclude) return;
+
       configs[`${configPrefix}.${config.type}`] = config;
     });
 
diff --git a/services/webhooks.js b/services/webhooks.js
index e8068a5..3b98ede 100644
--- a/services/webhooks.js
+++ b/services/webhooks.js
@@ -17,6 +17,10 @@ module.exports = {
     const webhooks = await strapi.query(webhookQueryString).find({ _limit: -1 });
 
     await Promise.all(Object.values(webhooks).map(async (config) => {
+      // Check if the config should be excluded.
+      const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${config.id}`);
+      if (shouldExclude) return;
+
       await strapi.plugins['config-sync'].services.main.writeConfigFile(configPrefix, config.id, config);
     }));
   },
@@ -29,6 +33,10 @@ module.exports = {
    * @returns {void}
    */
   importSingle: async (configName, configContent) => {
+    // Check if the config should be excluded.
+    const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${configName}`);
+    if (shouldExclude) return;
+
     const webhookAPI = strapi.query(webhookQueryString);
 
     const configExists = await webhookAPI.findOne({ id: configName });
@@ -50,6 +58,10 @@ module.exports = {
     let configs = {};
 
     Object.values(webhooks).map( (config) => {
+      // Check if the config should be excluded.
+      const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${config.id}`);
+      if (shouldExclude) return;
+
       configs[`${configPrefix}.${config.id}`] = config;
     });
 

From f692fa5aaa1f8b1613ce535cf3239542abec63ba Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Sat, 27 Mar 2021 00:54:41 +0100
Subject: [PATCH 03/15] Show correct diff in frontend

---
 admin/src/components/ActionButtons/index.js |  4 ++--
 admin/src/components/ConfigList/index.js    |  2 +-
 controllers/config.js                       |  3 ++-
 utils/getObjectDiff.js                      | 12 +++++++++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/ActionButtons/index.js b/admin/src/components/ActionButtons/index.js
index f570552..9f6dac3 100644
--- a/admin/src/components/ActionButtons/index.js
+++ b/admin/src/components/ActionButtons/index.js
@@ -23,8 +23,8 @@ const ActionButtons = ({ diff }) => {
 
   return (
     <ActionButtonsStyling>
-      <Button disabled={isEmpty(diff.fileConfig)} color="primary" label="Import" onClick={() => openModal('import')} />
-      <Button disabled={isEmpty(diff.fileConfig)} color="primary" label="Export" onClick={() => openModal('export')} />
+      <Button disabled={isEmpty(diff.diff)} color="primary" label="Import" onClick={() => openModal('import')} />
+      <Button disabled={isEmpty(diff.diff)} color="primary" label="Export" onClick={() => openModal('export')} />
       {!isEmpty(diff.diff) && (
         <h4 style={{ display: 'inline' }}>{Object.keys(diff.diff).length} {Object.keys(diff.diff).length === 1 ? "config change" : "config changes"}</h4>
       )}
diff --git a/admin/src/components/ConfigList/index.js b/admin/src/components/ConfigList/index.js
index f2ed7c2..12bb344 100644
--- a/admin/src/components/ConfigList/index.js
+++ b/admin/src/components/ConfigList/index.js
@@ -33,7 +33,7 @@ const ConfigList = ({ diff, isLoading }) => {
     }
 
     let formattedRows = [];
-    Object.keys(diff.fileConfig).map((configName) => {
+    Object.keys(diff.diff).map((configName) => {
       const type = configName.split('.')[0]; // Grab the first part of the filename.
       const name = configName.split(/\.(.+)/)[1]; // Grab the rest of the filename minus the file extension.
 
diff --git a/controllers/config.js b/controllers/config.js
index e5d212a..863b1d8 100644
--- a/controllers/config.js
+++ b/controllers/config.js
@@ -70,7 +70,8 @@ module.exports = {
     const fileConfig = await strapi.plugins['config-sync'].services.main.getAllConfigFromFiles();
     const databaseConfig = await strapi.plugins['config-sync'].services.main.getAllConfigFromDatabase();
 
-    const diff = difference(fileConfig, databaseConfig);
+    const diff = difference(databaseConfig, fileConfig);
+
     formattedDiff.diff = diff;
 
     Object.keys(diff).map((changedConfigName) => {
diff --git a/utils/getObjectDiff.js b/utils/getObjectDiff.js
index ca101e9..7176ac2 100644
--- a/utils/getObjectDiff.js
+++ b/utils/getObjectDiff.js
@@ -10,13 +10,23 @@ const { transform, isEqual, isArray, isObject } = require('lodash');
 const difference = (origObj, newObj) => {
   function changes(newObj, origObj) {
     let arrayIndexCounter = 0
-    return transform(newObj, function (result, value, key) {
+
+    const newObjChange = transform(newObj, function (result, value, key) {
       if (!isEqual(value, origObj[key])) {
         let resultKey = isArray(origObj) ? arrayIndexCounter++ : key
         result[resultKey] = (isObject(value) && isObject(origObj[key])) ? changes(value, origObj[key]) : value
       }
+    });
+    const origObjChange = transform(origObj, function (result, value, key) {
+      if (!isEqual(value, newObj[key])) {
+        let resultKey = isArray(newObj) ? arrayIndexCounter++ : key
+        result[resultKey] = (isObject(value) && isObject(newObj[key])) ? changes(value, newObj[key]) : value
+      }
     })
+
+    return Object.assign(newObjChange, origObjChange);
   }
+  
   return changes(newObj, origObj)
 }
 

From 4590c8fd6e80770b000eb41a7d6ffe22f27d3593 Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Sat, 27 Mar 2021 16:16:14 +0100
Subject: [PATCH 04/15] Show config state in admin page

---
 .../ConfigList/ConfigListRow/index.js         | 52 +++++++++++++++++++
 admin/src/components/ConfigList/index.js      | 39 ++++++++++----
 2 files changed, 82 insertions(+), 9 deletions(-)
 create mode 100644 admin/src/components/ConfigList/ConfigListRow/index.js

diff --git a/admin/src/components/ConfigList/ConfigListRow/index.js b/admin/src/components/ConfigList/ConfigListRow/index.js
new file mode 100644
index 0000000..d1863d3
--- /dev/null
+++ b/admin/src/components/ConfigList/ConfigListRow/index.js
@@ -0,0 +1,52 @@
+import React from 'react';
+import styled from 'styled-components';
+
+const CustomRow = ({ row }) => {
+  const { config_name, config_type, state, onClick } = row;
+
+
+  return (
+    <tr onClick={() => onClick(config_type, config_name)}>
+      <td>
+        <p>{config_name}</p>
+      </td>
+      <td>
+        <p>{config_type}</p>
+      </td>
+      <td>
+        <p style={stateStyle(state)}>{state}</p>
+      </td>
+    </tr>
+  );
+};
+
+const stateStyle = (state) => {
+  let style = {
+    display: 'inline-flex',
+    padding: '0 10px',
+    borderRadius: '12px',
+    height: '24px',
+    alignItems: 'center',
+    fontWeight: '500',
+  };
+
+  if (state === 'Only in DB') {
+    style.backgroundColor = '#cbf2d7';
+    style.color = '#1b522b';
+  }
+
+  if (state === 'Only in sync dir') {
+    style.backgroundColor = '#f0cac7';
+    style.color = '#3d302f';
+  }
+
+  if (state === 'Different') {
+    style.backgroundColor = '#e8e6b7';
+    style.color = '#4a4934';
+  }
+
+  return style;
+};
+
+
+export default CustomRow
\ No newline at end of file
diff --git a/admin/src/components/ConfigList/index.js b/admin/src/components/ConfigList/index.js
index 12bb344..ba185a7 100644
--- a/admin/src/components/ConfigList/index.js
+++ b/admin/src/components/ConfigList/index.js
@@ -3,6 +3,7 @@ import { Table } from '@buffetjs/core';
 import { isEmpty } from 'lodash';
 import ConfigDiff from '../ConfigDiff';
 import FirstExport from '../FirstExport';
+import ConfigListRow from './ConfigListRow';
 
 const headers = [
   {
@@ -14,8 +15,8 @@ const headers = [
     value: 'config_type',
   },
   {
-    name: 'Change',
-    value: 'change_type',
+    name: 'State',
+    value: 'state',
   },
 ];
 
@@ -26,6 +27,25 @@ const ConfigList = ({ diff, isLoading }) => {
   const [configName, setConfigName] = useState('');
   const [rows, setRows] = useState([]);
 
+  const getConfigState = (configName) => {
+    if (
+      diff.fileConfig[configName] &&
+      diff.databaseConfig[configName]
+    ) {
+      return 'Different'
+    } else if (
+      diff.fileConfig[configName] &&
+      !diff.databaseConfig[configName]
+    ) {
+      return 'Only in sync dir'
+    } else if (
+      !diff.fileConfig[configName] &&
+      diff.databaseConfig[configName]
+    ) {
+      return 'Only in DB'
+    }
+  };
+
   useEffect(() => {
     if (isEmpty(diff.diff)) {
       setRows([]);
@@ -40,7 +60,13 @@ const ConfigList = ({ diff, isLoading }) => {
       formattedRows.push({ 
         config_name: name,
         config_type: type,
-        change_type: ''
+        state: getConfigState(configName),
+        onClick: (config_type, config_name) => {
+          setOriginalConfig(diff.fileConfig[`${config_type}.${config_name}`]);
+          setNewConfig(diff.databaseConfig[`${config_type}.${config_name}`]);
+          setConfigName(`${config_type}.${config_name}`);
+          setOpenModal(true);
+        }
       });
     });
 
@@ -70,12 +96,7 @@ const ConfigList = ({ diff, isLoading }) => {
       />
       <Table
         headers={headers}
-        onClickRow={(e, { config_type, config_name }) => {
-          setOriginalConfig(diff.fileConfig[`${config_type}.${config_name}`]);
-          setNewConfig(diff.databaseConfig[`${config_type}.${config_name}`]);
-          setConfigName(`${config_type}.${config_name}`);
-          setOpenModal(true);
-        }}
+        customRow={ConfigListRow}
         rows={!isLoading ? rows : []}
         isLoading={isLoading}
         tableEmptyText="No config changes. You are up to date!"

From 75c4f978897a7c7e021d93d4f75df4222a411ec9 Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Sat, 27 Mar 2021 16:20:37 +0100
Subject: [PATCH 05/15] Remove id from role-permissions config

---
 services/role-permissions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/role-permissions.js b/services/role-permissions.js
index 406899a..5753efc 100644
--- a/services/role-permissions.js
+++ b/services/role-permissions.js
@@ -33,7 +33,7 @@ module.exports = {
       })
     );
 
-    await Promise.all(sanitizedRolesArray.map(async (config) => {
+    await Promise.all(sanitizedRolesArray.map(async ({id, ...config}) => {
       // Check if the config should be excluded.
       const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${config.type}`);
       if (shouldExclude) return;
@@ -97,7 +97,7 @@ module.exports = {
 
     let configs = {};
 
-    Object.values(sanitizedRolesArray).map((config) => {
+    Object.values(sanitizedRolesArray).map(({ id, ...config }) => {
       // Check if the config should be excluded.
       const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${config.type}`);
       if (shouldExclude) return;

From 4d90117796db2250b1c48493deda76e5142bae5b Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Sat, 27 Mar 2021 16:21:58 +0100
Subject: [PATCH 06/15] Exclude webhooks by default

---
 config/config.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/config.json b/config/config.json
index d46c723..61bf642 100644
--- a/config/config.json
+++ b/config/config.json
@@ -4,8 +4,7 @@
   "importOnBootstrap": false,
   "include": [
     "core-store",
-    "role-permissions",
-    "webhooks"
+    "role-permissions"
   ],
   "exclude": [
     "core-store.plugin_users-permissions_grant"

From 8b0f688d3f9a755d122ae1170e44120f780866b2 Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Sat, 27 Mar 2021 17:12:40 +0100
Subject: [PATCH 07/15] feat(deletion): delete on import

---
 services/core-store.js       | 11 +++++++++--
 services/role-permissions.js |  9 +++++++++
 services/webhooks.js         |  3 +++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/services/core-store.js b/services/core-store.js
index 57c2039..268e232 100644
--- a/services/core-store.js
+++ b/services/core-store.js
@@ -38,11 +38,18 @@ module.exports = {
     const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${configName}`);
     if (shouldExclude) return;
 
-    const { value, ...fileContent } = configContent;
     const coreStoreAPI = strapi.query(coreStoreQueryString);
 
     const configExists = await coreStoreAPI
-      .findOne({ key: configName, environment: fileContent.environment });
+      .findOne({ key: configName });
+
+    if (configExists && configContent === null) {
+      await coreStoreAPI.delete({ key: configName });
+
+      return;
+    }
+
+    const { value, ...fileContent } = configContent;
 
     if (!configExists) {
       await coreStoreAPI.create({ value: JSON.stringify(value), ...fileContent });
diff --git a/services/role-permissions.js b/services/role-permissions.js
index 5753efc..d009eed 100644
--- a/services/role-permissions.js
+++ b/services/role-permissions.js
@@ -61,6 +61,15 @@ module.exports = {
       .query('role', 'users-permissions')
       .findOne({ type: configName });
 
+    if (role && configContent === null) {
+      const publicRole = await strapi.query('role', 'users-permissions').findOne({ type: 'public' });
+      const publicRoleID = publicRole.id;
+
+      await service.deleteRole(role.id, publicRoleID);
+
+      return;
+    }
+
     const users = role ? role.users : [];
     configContent.users = users;
 
diff --git a/services/webhooks.js b/services/webhooks.js
index 3b98ede..005a451 100644
--- a/services/webhooks.js
+++ b/services/webhooks.js
@@ -44,6 +44,9 @@ module.exports = {
     if (!configExists) {
       await webhookAPI.create(configContent);
     } else {
+      if (configContent === null) {
+        await webhookAPI.delete({ id: configName });
+      }
       await webhookAPI.update({ id: configName }, configContent);
     }
   },

From 2db6203c649247281b982af8377c3593b7fed329 Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Sat, 27 Mar 2021 17:14:56 +0100
Subject: [PATCH 08/15] Import config diff, not all config

---
 services/main.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/services/main.js b/services/main.js
index 2a95e3d..0058d01 100644
--- a/services/main.js
+++ b/services/main.js
@@ -2,6 +2,7 @@
 
 const fs = require('fs');
 const util = require('util');
+const difference = require('../utils/getObjectDiff');
 
 /**
  * Main services for config import/export.
@@ -116,11 +117,14 @@ module.exports = {
    * @returns {void}
    */
   importAllConfig: async (configType = null) => {
-    const configFiles = fs.readdirSync(strapi.plugins['config-sync'].config.destination);
+    const fileConfig = await strapi.plugins['config-sync'].services.main.getAllConfigFromFiles();
+    const databaseConfig = await strapi.plugins['config-sync'].services.main.getAllConfigFromDatabase();
 
-    configFiles.map((file) => {
+    const diff = difference(databaseConfig, fileConfig);
+
+    Object.keys(diff).map((file) => {
       const type = file.split('.')[0]; // Grab the first part of the filename.
-      const name = file.split(/\.(.+)/)[1].split('.').slice(0, -1).join('.'); // Grab the rest of the filename minus the file extension.
+      const name = file.split(/\.(.+)/)[1]; // Grab the rest of the filename minus the file extension.
 
       if (configType && configType !== type) {
         return;

From 6223ac42ebfbdf7d90fbbec427340fab2bd9e8a4 Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Sat, 27 Mar 2021 18:20:51 +0100
Subject: [PATCH 09/15] feat(deletion): Delete on export

---
 services/core-store.js       | 34 ++++++++++++++++++++++----
 services/main.js             | 21 +++++++++++++++-
 services/role-permissions.js | 46 ++++++++++++++++++++++--------------
 services/webhooks.js         | 33 ++++++++++++++++++++++----
 4 files changed, 106 insertions(+), 28 deletions(-)

diff --git a/services/core-store.js b/services/core-store.js
index 268e232..4bbf3eb 100644
--- a/services/core-store.js
+++ b/services/core-store.js
@@ -2,6 +2,7 @@
 
 const coreStoreQueryString = 'core_store';
 const configPrefix = 'core-store'; // Should be the same as the filename.
+const difference = require('../utils/getObjectDiff');
 
 /**
  * Import/Export for core-store configs.
@@ -14,15 +15,38 @@ module.exports = {
    * @returns {void}
    */
    exportAll: async () => {
-    const coreStore = await strapi.query(coreStoreQueryString).find({ _limit: -1 });
+    const formattedDiff = {
+      fileConfig: {},
+      databaseConfig: {},
+      diff: {}
+    };
+    
+    const fileConfig = await strapi.plugins['config-sync'].services.main.getAllConfigFromFiles(configPrefix);
+    const databaseConfig = await strapi.plugins['config-sync'].services.main.getAllConfigFromDatabase(configPrefix);
+    const diff = difference(databaseConfig, fileConfig);
 
-    await Promise.all(Object.values(coreStore).map(async ({ id, ...config }) => {
+    formattedDiff.diff = diff;
+
+    Object.keys(diff).map((changedConfigName) => {
+      formattedDiff.fileConfig[changedConfigName] = fileConfig[changedConfigName];
+      formattedDiff.databaseConfig[changedConfigName] = databaseConfig[changedConfigName];
+    })
+
+    await Promise.all(Object.entries(diff).map(async ([configName, config]) => {
       // Check if the config should be excluded.
-      const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${config.key}`);
+      const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configName}`);
       if (shouldExclude) return;
 
-      config.value = JSON.parse(config.value);
-      await strapi.plugins['config-sync'].services.main.writeConfigFile(configPrefix, config.key, config);
+      const currentConfig = formattedDiff.databaseConfig[configName];
+
+      if (
+        !currentConfig &&
+        formattedDiff.fileConfig[configName]
+      ) {
+        await strapi.plugins['config-sync'].services.main.deleteConfigFile(configName);
+      } else {
+        await strapi.plugins['config-sync'].services.main.writeConfigFile(configPrefix, currentConfig.key, currentConfig);
+      }
     }));
   },
 
diff --git a/services/main.js b/services/main.js
index 0058d01..58a2f7e 100644
--- a/services/main.js
+++ b/services/main.js
@@ -44,6 +44,20 @@ module.exports = {
       });
   },
 
+  /**
+   * Delete config file.
+   *
+   * @param {string} configName - The name of the config file.
+   * @returns {void}
+   */
+   deleteConfigFile: async (configName) => {
+    // Check if the config should be excluded.
+    const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configName}`);
+    if (shouldExclude) return;
+
+    fs.unlinkSync(`${strapi.plugins['config-sync'].config.destination}${configName}.json`);
+  },
+
   /**
    * Read from a config file.
    *
@@ -68,7 +82,7 @@ module.exports = {
    *
    * @returns {object} Object with key value pairs of configs.
    */
-  getAllConfigFromFiles: async () => {
+  getAllConfigFromFiles: async (configType = null) => {
     const configFiles = fs.readdirSync(strapi.plugins['config-sync'].config.destination);
 
     const getConfigs = async () => {
@@ -77,6 +91,11 @@ module.exports = {
       await Promise.all(configFiles.map(async (file) => {
         const type = file.split('.')[0]; // Grab the first part of the filename.
         const name = file.split(/\.(.+)/)[1].split('.').slice(0, -1).join('.'); // Grab the rest of the filename minus the file extension.
+
+        if (configType && configType !== type) {
+          return;
+        }
+
         const fileContents = await strapi.plugins['config-sync'].services.main.readConfigFile(type, name);
         fileConfigs[`${type}.${name}`] = fileContents;
       }));
diff --git a/services/role-permissions.js b/services/role-permissions.js
index d009eed..9511148 100644
--- a/services/role-permissions.js
+++ b/services/role-permissions.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const { sanitizeEntity } = require('strapi-utils');
+const difference = require('../utils/getObjectDiff');
 
 const configPrefix = 'role-permissions'; // Should be the same as the filename.
 
@@ -15,30 +16,39 @@ module.exports = {
    * @returns {void}
    */
    exportAll: async () => {
-    const service =
-      strapi.plugins['users-permissions'].services.userspermissions;
+    const formattedDiff = {
+      fileConfig: {},
+      databaseConfig: {},
+      diff: {}
+    };
+    
+    const fileConfig = await strapi.plugins['config-sync'].services.main.getAllConfigFromFiles(configPrefix);
+    const databaseConfig = await strapi.plugins['config-sync'].services.main.getAllConfigFromDatabase(configPrefix);
+    const diff = difference(databaseConfig, fileConfig);
 
-    const [roles, plugins] = await Promise.all([
-      service.getRoles(),
-      service.getPlugins(),
-    ]);
+    formattedDiff.diff = diff;
 
-    const rolesWithPermissions = await Promise.all(
-      roles.map(async role => service.getRole(role.id, plugins))
-    );
+    Object.keys(diff).map((changedConfigName) => {
+      formattedDiff.fileConfig[changedConfigName] = fileConfig[changedConfigName];
+      formattedDiff.databaseConfig[changedConfigName] = databaseConfig[changedConfigName];
+    })
 
-    const sanitizedRolesArray = rolesWithPermissions.map(role =>
-      sanitizeEntity(role, {
-        model: strapi.plugins['users-permissions'].models.role,
-      })
-    );
-
-    await Promise.all(sanitizedRolesArray.map(async ({id, ...config}) => {
+    await Promise.all(Object.entries(diff).map(async ([configName, config]) => {
       // Check if the config should be excluded.
-      const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${config.type}`);
+      const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configName}`);
       if (shouldExclude) return;
 
-      await strapi.plugins['config-sync'].services.main.writeConfigFile(configPrefix, config.type, config);
+      const currentConfig = formattedDiff.databaseConfig[configName];
+
+      if (
+        !currentConfig &&
+        formattedDiff.fileConfig[configName]
+      ) {
+        await strapi.plugins['config-sync'].services.main.deleteConfigFile(configName);
+      } else {
+        await strapi.plugins['config-sync'].services.main.writeConfigFile(configPrefix, currentConfig.type, currentConfig);
+      }
+
     }));
   },
 
diff --git a/services/webhooks.js b/services/webhooks.js
index 005a451..bb4c4ac 100644
--- a/services/webhooks.js
+++ b/services/webhooks.js
@@ -6,6 +6,7 @@
 
 const webhookQueryString = 'strapi_webhooks';
 const configPrefix = 'webhooks'; // Should be the same as the filename.
+const difference = require('../utils/getObjectDiff');
 
 module.exports = {
   /**
@@ -14,14 +15,38 @@ module.exports = {
    * @returns {void}
    */
    exportAll: async () => {
-    const webhooks = await strapi.query(webhookQueryString).find({ _limit: -1 });
+    const formattedDiff = {
+      fileConfig: {},
+      databaseConfig: {},
+      diff: {}
+    };
+    
+    const fileConfig = await strapi.plugins['config-sync'].services.main.getAllConfigFromFiles(configPrefix);
+    const databaseConfig = await strapi.plugins['config-sync'].services.main.getAllConfigFromDatabase(configPrefix);
+    const diff = difference(databaseConfig, fileConfig);
 
-    await Promise.all(Object.values(webhooks).map(async (config) => {
+    formattedDiff.diff = diff;
+
+    Object.keys(diff).map((changedConfigName) => {
+      formattedDiff.fileConfig[changedConfigName] = fileConfig[changedConfigName];
+      formattedDiff.databaseConfig[changedConfigName] = databaseConfig[changedConfigName];
+    })
+
+    await Promise.all(Object.entries(diff).map(async ([configName, config]) => {
       // Check if the config should be excluded.
-      const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configPrefix}.${config.id}`);
+      const shouldExclude = strapi.plugins['config-sync'].config.exclude.includes(`${configName}`);
       if (shouldExclude) return;
 
-      await strapi.plugins['config-sync'].services.main.writeConfigFile(configPrefix, config.id, config);
+      const currentConfig = formattedDiff.databaseConfig[configName];
+
+      if (
+        !currentConfig &&
+        formattedDiff.fileConfig[configName]
+      ) {
+        await strapi.plugins['config-sync'].services.main.deleteConfigFile(configName);
+      } else {
+        await strapi.plugins['config-sync'].services.main.writeConfigFile(configPrefix, currentConfig.id, currentConfig);
+      }
     }));
   },
 

From 567e29f3c96bbc1098bbcf6379aa8df7308d9581 Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Sat, 27 Mar 2021 18:37:55 +0100
Subject: [PATCH 10/15] Check for exclusion when getting file config

---
 services/main.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/main.js b/services/main.js
index 58a2f7e..9adc07a 100644
--- a/services/main.js
+++ b/services/main.js
@@ -92,7 +92,11 @@ module.exports = {
         const type = file.split('.')[0]; // Grab the first part of the filename.
         const name = file.split(/\.(.+)/)[1].split('.').slice(0, -1).join('.'); // Grab the rest of the filename minus the file extension.
 
-        if (configType && configType !== type) {
+        if (
+          configType && configType !== type ||
+          !strapi.plugins['config-sync'].config.include.includes(type) ||
+          strapi.plugins['config-sync'].config.exclude.includes(`${type}.${name}`)
+        ) {
           return;
         }
 

From e62f440b6591132d47bd12dd8cb5fa067ee8c302 Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Sat, 27 Mar 2021 20:21:30 +0100
Subject: [PATCH 11/15] Catch missing sync folder in getAllConfigFromFiles
 service

---
 services/main.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/main.js b/services/main.js
index 9adc07a..9537d13 100644
--- a/services/main.js
+++ b/services/main.js
@@ -83,6 +83,10 @@ module.exports = {
    * @returns {object} Object with key value pairs of configs.
    */
   getAllConfigFromFiles: async (configType = null) => {
+    if (!fs.existsSync(strapi.plugins['config-sync'].config.destination)) {
+      return {};
+    }
+
     const configFiles = fs.readdirSync(strapi.plugins['config-sync'].config.destination);
 
     const getConfigs = async () => {

From 32764a90eda13e22f86397c644e20bb396b6f5fb Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Sat, 27 Mar 2021 21:24:43 +0100
Subject: [PATCH 12/15] Updated README.md

---
 README.md | 68 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 39 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index b6b3def..d26d2c2 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 A lot of configuration of your Strapi project is stored in the database. Like core_store, user permissions, user roles & webhooks. Things you might want to have the same on all environments. But when you update them locally, you will have to manually update them on all other environments too.
 
-That's where this plugin comes in to play. It allows you to export these configs as individual JSON files for each config, and write them somewhere in your project. With the configs written in your filesystem your can keep track of them through version control (git), and easily pull and import them across environments.
+That's where this plugin comes in to play. It allows you to export these configs as individual JSON files for each config, and write them somewhere in your project. With the configs written in your filesystem you can keep track of them through version control (git), and easily pull and import them across environments.
 
 Importing, exporting and keeping track of config changes is done in the admin page of the plugin.
 
@@ -27,44 +27,51 @@ This way your app won't reload when you export the config in development.
 
 	admin: {
 	  auth: {
-     	...
+     	// ...
 	  },
 	  watchIgnoreFiles: [
 	    '**/config-sync/files/**',
-	  ]
+	  ],
 	},
 
 
 ## Settings
-Some settings for the plugin are able to be modified by creating a file `extensions/config-sync/config/config.json` and overwriting the default settings.
+The settings of the plugin can be overridden in the `config/plugins.js` file. 
+In the example below you can see how, and also what the default settings are.
 
-#### Default settings:
-	{
-	  "destination": "extensions/config-sync/files/",
-	  "minify": false,
-	  "importOnBootstrap": false,
-	  "include": [
-	    "core-store",
-	    "role-permissions",
-	    "webhooks"
-	  ],
-	  "exclude": []
-	}
+##### `config/plugins.js`:
+	module.exports = ({ env }) => ({
+	  // ...
+	  'config-sync: {
+		  destination: "extensions/config-sync/files/",
+		  minify: false,
+		  importOnBootstrap: false,
+		  include: [
+		    "core-store",
+		    "role-permissions"
+		  ],
+		  exclude: [
+		    "core-store.plugin_users-permissions_grant"
+		  ]
+		},
 
-| Property | Default | Description |
-| -------- | ------- | ----------- |
-| destination | extensions/config-sync/files/ | The path for reading and writing the config JSON files. |
-| minify | false |  Setting to minify the JSON that's being exported. It defaults to false for better readability in git commits. |
-| importOnBootstrap | false |  Allows you to let the config be imported automaticly when strapi is bootstrapping (on `yarn start`). This setting should only be used in production, and should be handled very carefully as it can unintendedly overwrite the changes in your database. PLEASE USE WITH CARE. |
-| include | ["core-store", "role-permissions", "webhooks"] |  Configs you want to include. Allowed values: `core-store`, `role-permissions`, `webhooks`. |
-| exclude | [] |  You might not want all your database config exported and managed in git. This settings allows you to add an array of config names which should not be tracked by the config-sync plugin. *Currently not working* |
+	  // ...
+	});
+
+| Property | Type | Description |
+| -------- | ---- | ----------- |
+| destination | string | The path for reading and writing the sync files. |
+| minify | bool | When enabled all the exported JSON files will be minified. |
+| importOnBootstrap | bool | Allows you to let the config be imported automaticly when strapi is bootstrapping (on `strapi start`). This setting should only be used in production, and should be handled very carefully as it can unintendedly overwrite the changes in your database. PLEASE USE WITH CARE. |
+| include | array | Configs types you want to include in the syncing process. Allowed values: `core-store`, `role-permissions`, `webhooks`. |
+| exclude | array | Specify the names of configs you want to exclude from the syncing process. By default the API tokens for users-permissions, which are stored in core_store, are excluded. This setting expects the config names to comply with the naming convention. |
 
 ## Naming convention
 All the config files written in the file destination have the same naming convention. It goes as follows:
 
 	[config-type].[config-name].json
 
-- `config-type` - Corresponds to the value in from the config.include setting.
+- `config-type` - Corresponds to the value in from the include setting.
 - `config-name` - The unique identifier of the config. 
 	- 	For `core-store` config this is the `key` value.
 	-  	For `role-permissions` config this is the `type` value.
@@ -78,7 +85,14 @@ All the config files written in the file destination have the same naming conven
 - Exporting of EE roles & permissions
 - Add partial import/export functionality
 - Add CLI commands for importing/exporting
-- Track config deletions
+- ~~Track config deletions~~
+
+## ⭐️ Show your support
+
+Give a star if this project helped you.
+
+## Credits
+Shout out to [@ScottAgirs](https://github.com/ScottAgirs) for making [strapi-plugin-migrate](https://github.com/ijsto/strapi-plugin-migrate) as it was a big help while making the config-sync plugin.
 
 ## Resources
 
@@ -88,7 +102,3 @@ All the config files written in the file destination have the same naming conven
 
 - [NPM package](https://www.npmjs.com/package/strapi-plugin-config-sync)
 - [GitHub repository](https://github.com/boazpoolman/strapi-plugin-config-sync)
-
-## ⭐️ Show your support
-
-Give a star if this project helped you.

From b807caa3286b3a4385614f7db87a1f830fb90623 Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Sat, 27 Mar 2021 21:26:27 +0100
Subject: [PATCH 13/15] Update README.md

---
 README.md | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index d26d2c2..532df7a 100644
--- a/README.md
+++ b/README.md
@@ -43,18 +43,17 @@ In the example below you can see how, and also what the default settings are.
 	module.exports = ({ env }) => ({
 	  // ...
 	  'config-sync: {
-		  destination: "extensions/config-sync/files/",
-		  minify: false,
-		  importOnBootstrap: false,
-		  include: [
-		    "core-store",
-		    "role-permissions"
-		  ],
-		  exclude: [
-		    "core-store.plugin_users-permissions_grant"
-		  ]
-		},
-
+	    destination: "extensions/config-sync/files/",
+	    minify: false,
+	    importOnBootstrap: false,
+	    include: [
+	      "core-store",
+	      "role-permissions"
+	    ],
+	    exclude: [
+	      "core-store.plugin_users-permissions_grant"
+	    ]
+	  },
 	  // ...
 	});
 

From b98c97b788e7e46896f1aec1e1941c2efbee57ca Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Sat, 27 Mar 2021 21:27:03 +0100
Subject: [PATCH 14/15] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 532df7a..4d017c0 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ In the example below you can see how, and also what the default settings are.
 ##### `config/plugins.js`:
 	module.exports = ({ env }) => ({
 	  // ...
-	  'config-sync: {
+	  'config-sync': {
 	    destination: "extensions/config-sync/files/",
 	    minify: false,
 	    importOnBootstrap: false,

From 86439e3cd88b08fff03263642aca3761927fea89 Mon Sep 17 00:00:00 2001
From: Boaz Poolman <boaz_skater@hotmail.com>
Date: Sat, 27 Mar 2021 21:53:41 +0100
Subject: [PATCH 15/15] 0.1.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c97c253..8e43a76 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-config-sync",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Manage your Strapi database configuration as partial json files which can be imported/exported across environments. ",
   "strapi": {
     "name": "config-sync",