linting

.eslintignore

@@ -13,6 +13,7 @@ public
 !plugins/talk-plugin-facebook-auth
 !plugins/talk-plugin-featured-comments
 !plugins/talk-plugin-flag-details
+!plugins/talk-plugin-google-auth
 !plugins/talk-plugin-ignore-user
 !plugins/talk-plugin-like
 !plugins/talk-plugin-love
@@ -21,6 +22,7 @@ public
 !plugins/talk-plugin-moderation-actions
 !plugins/talk-plugin-offtopic
 !plugins/talk-plugin-permalink
+!plugins/talk-plugin-profile-settings
 !plugins/talk-plugin-remember-sort
 !plugins/talk-plugin-respect
 !plugins/talk-plugin-sort-most-liked
@@ -31,5 +33,4 @@ public
 !plugins/talk-plugin-sort-oldest
 !plugins/talk-plugin-subscriber
 !plugins/talk-plugin-toxic-comments
-!plugins/talk-plugin-viewing-options
-!plugins/talk-plugin-profile-settings
+!plugins/talk-plugin-viewing-options

plugins/talk-plugin-auth/client/login/containers/Main.js

@@ -4,10 +4,6 @@ import Main from '../components/Main';
 import { connect } from 'plugin-api/beta/client/hocs';
 import { bindActionCreators } from 'redux';
 import { setView } from '../actions';
-import {
-  setAuthToken,
-  handleSuccessfulLogin,
-} from 'plugin-api/beta/client/actions/auth';
 import * as views from '../enums/views';
 
 class MainContainer extends React.Component {
@@ -24,7 +20,6 @@ class MainContainer extends React.Component {
 
   componentDidMount() {
     this.resizeHeight();
-    this.listenToStorageChanges();
   }
 
   componentDidUpdate(prevProps) {
@@ -33,40 +28,6 @@ class MainContainer extends React.Component {
     }
   }
 
-  componentWillUnmount() {
-    this.unlisten();
-  }
-
-  listenToStorageChanges() {
-    window.addEventListener('storage', this.handleAuth);
-  }
-
-  unlisten() {
-    window.removeEventListener('storage', this.handleAuth);
-  }
-
-  // External logins store auth data into `auth`, we use it to detect
-  // a successful sign in.
-  handleAuth = e => {
-    if (e.key === 'auth') {
-      const { err, data } = JSON.parse(e.newValue);
-      if (err) {
-        console.error(err);
-      } else if (data && data.token) {
-        if (data.user) {
-          this.props.handleSuccessfulLogin(data.user, data.token);
-        } else {
-          this.props.setAuthToken(data.token);
-        }
-        this.unlisten();
-        localStorage.removeItem('auth');
-        window.close();
-      } else {
-        console.error('auth was set, but did not contain a token');
-      }
-    }
-  };
-
   render() {
     return <Main onResetView={this.resetView} view={this.props.view} />;
   }
@@ -75,8 +36,6 @@ class MainContainer extends React.Component {
 MainContainer.propTypes = {
   view: PropTypes.string.isRequired,
   setView: PropTypes.func.isRequired,
-  handleSuccessfulLogin: PropTypes.func.isRequired,
-  setAuthToken: PropTypes.func.isRequired,
 };
 
 const mapStateToProps = ({ talkPluginAuth: state }) => ({
@@ -87,8 +46,6 @@ const mapDispatchToProps = dispatch =>
   bindActionCreators(
     {
       setView,
-      handleSuccessfulLogin,
-      setAuthToken,
     },
     dispatch
   );

plugins/talk-plugin-google-auth/client/components/SignIn.js

@@ -3,7 +3,5 @@ import GoogleButton from '../containers/GoogleButton';
 import { t } from 'plugin-api/beta/client/services';
 
 export default () => {
-  return (
-    <GoogleButton>{t('talk-plugin-google-auth.sign_in')}</GoogleButton>
-  );
+  return <GoogleButton>{t('talk-plugin-google-auth.sign_in')}</GoogleButton>;
 };

plugins/talk-plugin-google-auth/client/components/SignUp.js

@@ -3,7 +3,5 @@ import GoogleButton from '../containers/GoogleButton';
 import { t } from 'plugin-api/beta/client/services';
 
 export default () => {
-  return (
-    <GoogleButton>{t('talk-plugin-google-auth.sign_up')}</GoogleButton>
-  );
+  return <GoogleButton>{t('talk-plugin-google-auth.sign_up')}</GoogleButton>;
 };