Removed the cyclical dependency (#1519) (#1539)

3 files changed, 34 insertions, 28 deletions

diff --git a/src/features/basicAuth/Component.js b/src/features/basicAuth/Component.js
index ba9ae2273..14184f80b 100644
--- a/src/features/basicAuth/Component.js
+++ b/src/features/basicAuth/Component.js
@@ -13,7 +13,7 @@ import {
   resetState,
   sendCredentials,
   cancelLogin,
-} from '.';
+} from './store';
 import Form from './Form';
 
 import styles from './styles';
diff --git a/src/features/basicAuth/index.js b/src/features/basicAuth/index.js
index 51625ea55..e43d51d15 100644
--- a/src/features/basicAuth/index.js
+++ b/src/features/basicAuth/index.js
@@ -1,21 +1,12 @@
 import { ipcRenderer } from 'electron';
-import { observable } from 'mobx';
 
 import BasicAuthComponent from './Component';
 
-const debug = require('debug')('Ferdi:feature:basicAuth');
-
-const defaultState = {
-  isModalVisible: true,
-  service: null,
-  authInfo: null,
-};
+import { state as ModalState } from './store';
 
-export const state = observable(defaultState);
+const debug = require('debug')('Ferdi:feature:basicAuth');
 
-export function resetState() {
-  Object.assign(state, defaultState);
-}
+const state = ModalState;
 
 export default function initialize() {
   debug('Initialize basicAuth feature');
@@ -40,19 +31,4 @@ export function mainIpcHandler(mainWindow, authInfo) {
   });
 }
 
-export function sendCredentials(user, password) {
-  debug('Sending credentials to main', user, password);
-
-  ipcRenderer.send('feature-basic-auth-credentials', {
-    user,
-    password,
-  });
-}
-
-export function cancelLogin() {
-  debug('Cancel basic auth event');
-
-  ipcRenderer.send('feature-basic-auth-cancel');
-}
-
 export const Component = BasicAuthComponent;
diff --git a/src/features/basicAuth/store.js b/src/features/basicAuth/store.js
new file mode 100644
index 000000000..0713ff572
--- /dev/null
+++ b/src/features/basicAuth/store.js
@@ -0,0 +1,30 @@
+import { observable } from 'mobx';
+import { ipcRenderer } from 'electron';
+
+const debug = require('debug')('Ferdi:feature:basicAuth');
+
+const defaultState = {
+  isModalVisible: true,
+  service: null,
+  authInfo: null,
+};
+
+export const state = observable(defaultState);
+
+export function resetState() {
+  Object.assign(state, defaultState);
+}
+export function sendCredentials(user, password) {
+  debug('Sending credentials to main', user, password);
+
+  ipcRenderer.send('feature-basic-auth-credentials', {
+    user,
+    password,
+  });
+}
+
+export function cancelLogin() {
+  debug('Cancel basic auth event');
+
+  ipcRenderer.send('feature-basic-auth-cancel');
+}