fixxed auto account login

rePublic-Studios · Aug 10, 2021 · 15cafbe · 15cafbe
1 parent 788e311
commit 15cafbe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/app/desktop/DesktopRoot.js b/src/app/desktop/DesktopRoot.js
@@ -113,7 +113,7 @@ function DesktopRoot({ store }) {
       });
     }
 
-    if (process.env.NODE_ENV === 'development' && currentAccount) {
+    if (process.env.NODE_ENV !== 'development' && currentAccount) {
       dispatch(received(features.mcAuthentication));
       dispatch(push('/home'));
     } else if (currentAccount) {
@@ -123,13 +123,13 @@ function DesktopRoot({ store }) {
           dispatch(() => {
             switch (currentAccount.accountType) {
               case ACCOUNT_MICROSOFT:
-                loginWithOAuthAccessToken();
+                dispatch(loginWithOAuthAccessToken());
                 break;
               case ACCOUNT_LOCAL:
-                loginLocalWithoutAccessToken();
+                dispatch(loginLocalWithoutAccessToken());
                 break;
               default:
-                loginWithAccessToken();
+                dispatch(loginWithAccessToken());
                 break;
             }
           })

diff --git a/src/common/modals/AccountsManager.js b/src/common/modals/AccountsManager.js
@@ -71,13 +71,13 @@ const ProfileSettings = () => {
                         dispatch(() => {
                           switch (account.accountType) {
                             case ACCOUNT_MICROSOFT:
-                              loginWithOAuthAccessToken(false);
+                              dispatch(loginWithOAuthAccessToken(false));
                               break;
                             case ACCOUNT_LOCAL:
-                              loginLocalWithoutAccessToken(false);
+                              dispatch(loginLocalWithoutAccessToken(false));
                               break;
                             default:
-                              loginWithAccessToken(false);
+                              dispatch(loginWithAccessToken(false));
                               break;
                           }
                         })

diff --git a/src/common/reducers/actions.js b/src/common/reducers/actions.js
@@ -271,13 +271,13 @@ export function switchToFirstValidAccount(id) {
         await dispatch(() => {
           switch (accounts[i].accountType) {
             case ACCOUNT_MICROSOFT:
-              loginWithOAuthAccessToken();
+              dispatch(loginWithOAuthAccessToken());
               break;
             case ACCOUNT_LOCAL:
-              loginLocalWithoutAccessToken();
+              dispatch(loginLocalWithoutAccessToken());
               break;
             default:
-              loginWithAccessToken();
+              dispatch(loginWithAccessToken());
               break;
           }
         });
@@ -752,6 +752,7 @@ export function loginWithAccessToken(redirect = true) {
 
 export function loginLocalWithoutAccessToken() {
   return async (dispatch, getState) => {
+    console.log('lol');
     const state = getState();
     const currentAccount = _getCurrentAccount(state);
     const { selectedProfile } = currentAccount;