Merge branch 'master' into 'release'

Version 0.5.2-beta3

See merge request kirbo/slothy!12

CHANGELOG.md

@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Crash reporter.
 - Ability to downgrade.
 
+## [0.5.2-beta3] - 2019-04-26
+### Fixed
+- Adding new Slack instance (authorisation) was broken (again).
+- When removing a Slack instance, removes also the configurations for it.
+
 ## [0.5.2-beta2] - 2019-04-26
 ### Fixed
 - Auto updater bug.

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.5.2-beta2",
+  "version": "0.5.2-beta3",
   "name": "slothy",
   "description": "Changes your Slack status based on the SSID you're currently connected to.",
   "productName": "Slothy",

public/electron.js

@@ -400,7 +400,10 @@ ipc
     }
   })
   .on('getConnections', async () => sendIfMainWindow('connections', getConnections))
-  .on('removeSlackInstance', async (event, data) => sendIfMainWindow('slackInstances', removeSlackInstance, data))
+  .on('removeSlackInstance', async (event, data) => {
+    await sendIfMainWindow('slackInstances', removeSlackInstance, data);
+    sendIfMainWindow('configurations', getConfigurations);
+  })
   .on('getConfigurations', async () => sendIfMainWindow('configurations', getConfigurations))
   .on('saveConfiguration', async (event, data, updateNow = true) => {
     await sendIfMainWindow('configurations', saveConfiguration, data);

public/handlers/auth.js

@@ -25,13 +25,13 @@ const handleAuth = (sendIfMainWindow, uri) => {
       };
 
       request(options, async (error, response, body) => {
-        const { ok, accessToken } = JSON.parse(body);
+        const { ok, access_token } = JSON.parse(body); // eslint-disable-line camelcase
         if (!ok) {
           sendIfMainWindow('error', () => 'Error in authentication!');
           throw error;
         } else {
           const token = {
-            token: accessToken,
+            token: access_token,
           };
           const profile = await getStatus(token);
           const workspace = await getWorkspace(token);
@@ -43,7 +43,7 @@ const handleAuth = (sendIfMainWindow, uri) => {
 
             if (profile) {
               instance = await saveSlackInstance({
-                token: accessToken,
+                token: access_token,
                 profile,
               });
             }

public/handlers/slackInstances.js

@@ -85,10 +85,13 @@ const saveSlackInstance = instance => (
  * @param {object} slackInstance - Slack instance to remove.
  * @returns {array} slackInstances
  */
-const removeSlackInstance = ({ token }) => (
+const removeSlackInstance = ({ id, token }) => (
   new Promise(async (resolve, reject) => {
     try {
-      resolve(await storage.set('slackInstances', (await getSlackInstances()).filter(instance => instance.token !== token)));
+      const slackInstances = await getSlackInstances();
+      await storage.set('configurations', (await getConfigurations()).filter(({ instanceId }) => instanceId !== id));
+      const filteredSlackInstances = slackInstances.filter(instance => instance.token !== token);
+      resolve(await storage.set('slackInstances', filteredSlackInstances));
     } catch (error) {
       log.error('removeSlackInstance', error);
       reject(error);
@@ -103,4 +106,5 @@ module.exports = {
   removeSlackInstance,
 };
 
+const { getConfigurations } = require('./configurations');
 const { getWorkspace, getWorkspaceEmojis } = require('./workspaces');

src/component/Menu/MenuConfig.js

@@ -35,7 +35,7 @@ export const contextMenu = (instance, removeSlackInstance) => (
   <Menu>
     <Menu.Item
       key="remove-instance"
-      onClick={() => showDeleteConfirm(instance.name, () => removeSlackInstance(instance.token))}
+      onClick={() => showDeleteConfirm(instance.name, () => removeSlackInstance(instance))}
     >
       <RemoveInstance>
         <Icon icon={['far', 'trash-alt']} /> Remove {instance.name}

src/container/App/AppProvider.js

@@ -33,8 +33,9 @@ const closeOtherNotifications = (skip = '') => {
 class AppProvider extends Component {
   state = {
     ...INITIAL_STATE,
-    removeSlackInstance: token => {
+    removeSlackInstance: ({ token, id }) => {
       ipcRenderer.send('removeSlackInstance', {
+        id,
         token,
       });
     },