Merge pull request #2506 from uProxy/fix-logout

Fix issues with expectedLogout not getting set

Author: jpevarnek

src/generic_ui/polymer/network-in-settings.ts

@@ -58,7 +58,7 @@ Polymer({
     }
 
     confirmLogout.then(() => {
-      ui.logout({
+      this.$.state.background.logout({
         name: this.name,
         userId: this.networkInfo.userId
       });

src/generic_ui/polymer/state.ts

@@ -87,6 +87,14 @@ class Background {
   }
 
   public logout = (networkInfo: social.SocialNetworkInfo): Promise<void> => {
+    var network = ui_context.model.getNetwork(networkInfo.name);
+    if (!network) {
+      console.warn('Network is not logged in');
+      return Promise.resolve<void>();
+    }
+
+    network.logoutExpected = true;
+
     return this.doInBackground_('logout', networkInfo, true);
   }
 

src/generic_ui/scripts/ui.spec.ts

@@ -351,25 +351,4 @@ describe('UI.UserInterface', () => {
       expect(ui.gettingStatus).toEqual(null);
     });
   });  // Update giving and/or getting state in UI
-
-  describe('logout', () => {
-    it('No networks', (done) => {
-      ui.logout({ name: 'testNetwork', userId: 'fakeUser' }).then(() => {
-        expect(mockCore.logout).not.toHaveBeenCalled();
-        done();
-      });
-    });
-
-    it('Single network', (done) => {
-      login();
-      ui.logout({ name: 'testNetwork', userId: 'fakeUser' }).then(() => {;
-        expect(mockCore.logout).toHaveBeenCalled();
-        logout(); //cleanup
-        done();
-      }).catch(() => {
-        logout();
-        expect('Error: rejected promise').toEqual(false);
-      });
-    });
-  });
 });  // UI.UserInterface

src/generic_ui/scripts/ui.ts

@@ -329,9 +329,7 @@ export class UserInterface implements ui_constants.UiApi {
      * though
      */
     switch(name) {
-      case 'logout':
-        this.logout(data.data.networkInfo);
-        break;
+      /* holding for more operations as needed */
     }
   }
 
@@ -1087,21 +1085,6 @@ export class UserInterface implements ui_constants.UiApi {
     });
   }
 
-  public logout = (networkInfo :social.SocialNetworkInfo) : Promise<void> => {
-    var network = this.model.getNetwork(networkInfo.name);
-    // Check if the user is connected to a network
-    if (!network) {
-      // If the user is not connected to the network, then don't log him out,
-      // you probably won't reach this point anyways. EVER. Probably.
-      console.warn('User is trying to log out of not-logged-in-network ' +
-                   networkInfo.name);
-      return Promise.resolve<void>();
-    }
-
-    network.logoutExpected = true;
-    return this.core.logout(networkInfo);
-  }
-
   private reconnect_ = (network :string) => {
     this.model.reconnecting = true;
     // TODO: add wechat, quiver, github URLs