lift login handling from remote container to github tab controller

Author: wadethestealth

lib/containers/remote-container.js

@@ -19,6 +19,10 @@ export default class RemoteContainer extends React.Component {
     // Connection
     loginModel: PropTypes.object.isRequired,
     endpoint: EndpointPropType.isRequired,
+    fetchToken: PropTypes.func.isRequired,
+    handleLogin: PropTypes.func.isRequired,
+    handleLogout: PropTypes.func.isRequired,
+    handleTokenRetry: PropTypes.func.isRequired,
 
     // Repository attributes
     remoteOperationObserver: OperationStateObserverPropType.isRequired,
@@ -34,13 +38,9 @@ export default class RemoteContainer extends React.Component {
     onPushBranch: PropTypes.func.isRequired,
   }
 
-  fetchToken = loginModel => {
-    return loginModel.getToken(this.props.endpoint.getLoginAccount());
-  }
-
   render() {
     return (
-      <ObserveModel model={this.props.loginModel} fetchData={this.fetchToken}>
+      <ObserveModel model={this.props.loginModel} fetchData={this.props.fetchToken}>
         {this.renderWithToken}
       </ObserveModel>
     );
@@ -55,20 +55,20 @@ export default class RemoteContainer extends React.Component {
       return (
         <QueryErrorView
           error={token}
-          retry={this.handleTokenRetry}
-          login={this.handleLogin}
-          logout={this.handleLogout}
+          retry={this.props.handleTokenRetry}
+          login={this.props.handleLogin}
+          logout={this.props.handleLogout}
         />
       );
     }
 
     if (token === UNAUTHENTICATED) {
-      return <GithubLoginView onLogin={this.handleLogin} />;
+      return <GithubLoginView onLogin={this.props.handleLogin} />;
     }
 
     if (token === INSUFFICIENT) {
       return (
-        <GithubLoginView onLogin={this.handleLogin}>
+        <GithubLoginView onLogin={this.props.handleLogin}>
           <p>
             Your token no longer has sufficient authorizations. Please re-authenticate and generate a new one.
           </p>
@@ -108,9 +108,9 @@ export default class RemoteContainer extends React.Component {
       return (
         <QueryErrorView
           error={error}
-          login={this.handleLogin}
+          login={this.props.handleLogin}
           retry={retry}
-          logout={this.handleLogout}
+          logout={this.props.handleLogout}
         />
       );
     }
@@ -140,16 +140,4 @@ export default class RemoteContainer extends React.Component {
       />
     );
   }
-
-  handleLogin = token => {
-    incrementCounter('github-login');
-    this.props.loginModel.setToken(this.props.endpoint.getLoginAccount(), token);
-  }
-
-  handleLogout = () => {
-    incrementCounter('github-logout');
-    this.props.loginModel.removeToken(this.props.endpoint.getLoginAccount());
-  }
-
-  handleTokenRetry = () => this.props.loginModel.didUpdate();
 }

lib/controllers/github-tab-controller.js

@@ -32,26 +32,32 @@ export default class GitHubTabController extends React.Component {
     const gitHubRemotes = this.props.allRemotes.filter(remote => remote.isGithubRepo());
     const currentBranch = this.props.branches.getHeadBranch();
 
-    let currentRemote = gitHubRemotes.withName(this.props.selectedRemoteName);
+    this.currentRemote = gitHubRemotes.withName(this.props.selectedRemoteName);
     let manyRemotesAvailable = false;
-    if (!currentRemote.isPresent() && gitHubRemotes.size() === 1) {
-      currentRemote = Array.from(gitHubRemotes)[0];
-    } else if (!currentRemote.isPresent() && gitHubRemotes.size() > 1) {
+    if (!this.currentRemote.isPresent() && gitHubRemotes.size() === 1) {
+      this.currentRemote = Array.from(gitHubRemotes)[0];
+    } else if (!this.currentRemote.isPresent() && gitHubRemotes.size() > 1) {
       manyRemotesAvailable = true;
     }
 
     return (
       <GitHubTabView
+        // Connection
+        loginModel={this.props.loginModel}
+        fetchToken={this.fetchToken}
+        handleTokenRetry={this.handleTokenRetry}
+        handleLogin={this.handleLogin}
+        handleLogout={this.handleLogout}
+
         workspace={this.props.workspace}
         remoteOperationObserver={this.props.remoteOperationObserver}
-        loginModel={this.props.loginModel}
         rootHolder={this.props.rootHolder}
 
         workingDirectory={this.props.workingDirectory || this.props.currentWorkDir}
         branches={this.props.branches}
         currentBranch={currentBranch}
         remotes={gitHubRemotes}
-        currentRemote={currentRemote}
+        currentRemote={this.currentRemote}
         repository={this.props.repository}
         manyRemotesAvailable={manyRemotesAvailable}
         aheadCount={this.props.aheadCount}
@@ -78,4 +84,26 @@ export default class GitHubTabController extends React.Component {
     e.preventDefault();
     return this.props.repository.setConfig('atomGithub.currentRemote', remote.getName());
   }
+
+  fetchToken = loginModel => {
+    if (this.currentRemote.isPresent()) {
+      return loginModel.getToken(this.currentRemote.getEndpoint().getLoginAccount());
+    }
+  }
+
+  handleLogin = token => {
+    if (this.currentRemote.isPresent()) {
+      incrementCounter('github-login');
+      this.props.loginModel.setToken(this.currentRemote.getEndpoint().getLoginAccount(), token);
+    }
+  }
+
+  handleLogout = () => {
+    if (this.currentRemote.isPresent()) {
+      incrementCounter('github-logout');
+      this.props.loginModel.removeToken(this.currentRemote.getEndpoint().getLoginAccount());
+    }
+  }
+
+  handleTokenRetry = () => this.props.loginModel.didUpdate();
 }

lib/views/github-tab-view.js

@@ -12,10 +12,16 @@ import RemoteContainer from '../containers/remote-container';
 
 export default class GitHubTabView extends React.Component {
   static propTypes = {
+    // Connection
+    loginModel: PropTypes.object.isRequired,
+    fetchToken: PropTypes.func.isRequired,
+    handleLogin: PropTypes.func.isRequired,
+    handleLogout: PropTypes.func.isRequired,
+    handleTokenRetry: PropTypes.func.isRequired,
+
     repository: PropTypes.object.isRequired,
     workspace: PropTypes.object.isRequired,
     remoteOperationObserver: OperationStateObserverPropType.isRequired,
-    loginModel: GithubLoginModelPropType.isRequired,
     rootHolder: RefHolderPropType.isRequired,
 
     workingDirectory: PropTypes.string,
@@ -55,8 +61,13 @@ export default class GitHubTabView extends React.Component {
       // Single, chosen or unambiguous remote
       return (
         <RemoteContainer
+          // Connection
           loginModel={this.props.loginModel}
           endpoint={this.props.currentRemote.getEndpoint()}
+          fetchToken={this.props.fetchToken}
+          handleTokenRetry={this.props.handleTokenRetry}
+          handleLogin={this.props.handleLogin}
+          handleLogout={this.props.handleLogout}
 
           remoteOperationObserver={this.props.remoteOperationObserver}
           pushInProgress={this.props.pushInProgress}