Remove coral-framework reducers

Some of them were only related to the embed stream.
Auth code is too convoluted with the embed stream and can't be reused atm.

client/coral-admin/src/actions/auth.js

@@ -2,9 +2,9 @@ import bowser from 'bowser';
 import * as actions from '../constants/auth';
 import coralApi from 'coral-framework/helpers/request';
 import * as Storage from 'coral-framework/helpers/storage';
-import {handleAuthToken} from 'coral-framework/actions/auth';
 import {resetWebsocket} from 'coral-framework/services/client';
 import t from 'coral-framework/services/i18n';
+import jwtDecode from 'jwt-decode';
 
 //==============================================================================
 // SIGN IN
@@ -136,3 +136,30 @@ export const checkLogin = () => (dispatch) => {
       dispatch(checkLoginFailure(errorMessage));
     });
 };
+
+//==============================================================================
+// LOGOUT
+//==============================================================================
+
+export const logout = () => (dispatch) => {
+  return coralApi('/auth', {method: 'DELETE'}).then(() => {
+    Storage.removeItem('token');
+
+    // Reset the websocket.
+    resetWebsocket();
+
+    dispatch({type: actions.LOGOUT});
+  });
+};
+
+//==============================================================================
+// AUTH TOKEN
+//==============================================================================
+
+export const handleAuthToken = (token) => (dispatch) => {
+  Storage.setItem('exp', jwtDecode(token).exp);
+  Storage.setItem('token', token);
+
+  dispatch({type: 'HANDLE_AUTH_TOKEN'});
+};
+

client/coral-admin/src/containers/Layout.js

@@ -3,12 +3,11 @@ import {connect} from 'react-redux';
 import Layout from '../components/ui/Layout';
 import {fetchConfig} from '../actions/config';
 import AdminLogin from '../components/AdminLogin';
-import {logout} from 'coral-framework/actions/auth';
 import {FullLoading} from '../components/FullLoading';
 import BanUserDialog from './BanUserDialog';
 import SuspendUserDialog from './SuspendUserDialog';
 import {toggleModal as toggleShortcutModal} from '../actions/moderation';
-import {checkLogin, handleLogin, requestPasswordReset} from '../actions/auth';
+import {checkLogin, handleLogin, requestPasswordReset, logout} from '../actions/auth';
 import {can} from 'coral-framework/services/perms';
 import UserDetail from 'coral-admin/src/containers/UserDetail';
 

client/coral-configure/containers/ConfigureStreamContainer.js

@@ -2,7 +2,7 @@ import React, {Component} from 'react';
 import {connect} from 'react-redux';
 import {compose} from 'react-apollo';
 
-import {updateOpenStatus, updateConfiguration} from 'coral-framework/actions/asset';
+import {updateOpenStatus, updateConfiguration} from 'coral-embed-stream/src/actions/asset';
 
 import CloseCommentsInfo from '../components/CloseCommentsInfo';
 import ConfigureCommentStream from '../components/ConfigureCommentStream';

client/coral-embed-stream/src/actions/asset.js

@@ -1,6 +1,6 @@
 import * as actions from '../constants/asset';
-import coralApi from '../helpers/request';
-import {addNotification} from '../actions/notification';
+import coralApi from 'coral-framework/helpers/request';
+import {addNotification} from 'coral-framework/actions/notification';
 
 import t from 'coral-framework/services/i18n';
 

client/coral-embed-stream/src/actions/auth.js

@@ -1,10 +1,10 @@
 import jwtDecode from 'jwt-decode';
 import bowser from 'bowser';
 import * as actions from '../constants/auth';
-import * as Storage from '../helpers/storage';
-import coralApi, {base} from '../helpers/request';
-import pym from '../services/pym';
-import {addNotification} from '../actions/notification';
+import * as Storage from 'coral-framework/helpers/storage';
+import coralApi, {base} from 'coral-framework/helpers/request';
+import pym from 'coral-framework/services/pym';
+import {addNotification} from 'coral-framework/actions/notification';
 
 import {resetWebsocket} from 'coral-framework/services/client';
 import t from 'coral-framework/services/i18n';

client/coral-embed-stream/src/containers/Embed.js

@@ -8,8 +8,8 @@ import branch from 'recompose/branch';
 import renderComponent from 'recompose/renderComponent';
 
 import {Spinner} from 'coral-ui';
-import * as authActions from 'coral-framework/actions/auth';
-import * as assetActions from 'coral-framework/actions/asset';
+import * as authActions from '../actions/auth';
+import * as assetActions from '../actions/asset';
 import {getDefinitionName} from 'coral-framework/utils';
 import {withQuery} from 'coral-framework/hocs';
 import Embed from '../components/Embed';

client/coral-embed-stream/src/containers/Stream.js

@@ -8,7 +8,7 @@ import {
   withDeleteAction, withIgnoreUser, withEditComment
 } from 'coral-framework/graphql/mutations';
 
-import * as authActions from 'coral-framework/actions/auth';
+import * as authActions from 'coral-embed-stream/src/actions/auth';
 import * as notificationActions from 'coral-framework/actions/notification';
 import {setActiveReplyBox, setActiveTab, viewAllComments} from '../actions/stream';
 import Stream from '../components/Stream';

client/coral-embed-stream/src/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import {render} from 'react-dom';
 
-import {checkLogin, handleAuthToken, logout} from 'coral-framework/actions/auth';
+import {checkLogin, handleAuthToken, logout} from 'coral-embed-stream/src/actions/auth';
 import './graphql';
 import {addExternalConfig} from 'coral-embed-stream/src/actions/config';
 import {getStore, injectReducers, addListener} from 'coral-framework/services/store';

client/coral-embed-stream/src/reducers/index.js

@@ -1,8 +1,14 @@
+import auth from './auth';
+import asset from './asset';
 import embed from './embed';
 import config from './config';
 import stream from './stream';
+import {reducer as commentBox} from '../../../talk-plugin-commentbox';
 
 export default {
+  auth,
+  asset,
+  commentBox,
   embed,
   config,
   stream,

client/coral-embed-stream/src/reducers/stream.js

@@ -1,5 +1,5 @@
 import * as actions from '../constants/stream';
-import * as authActions from 'coral-framework/constants/auth';
+import * as authActions from '../constants/auth';
 
 function getQueryVariable(variable) {
   let query = window.location.search.substring(1);

client/coral-framework/reducers/index.js

@@ -1,9 +0,0 @@
-import auth from './auth';
-import asset from './asset';
-import {reducer as commentBox} from '../../talk-plugin-commentbox';
-
-export default {
-  auth,
-  asset,
-  commentBox,
-};

client/coral-framework/services/store.js

@@ -1,6 +1,5 @@
 import {createStore, combineReducers, applyMiddleware, compose} from 'redux';
 import thunk from 'redux-thunk';
-import mainReducer from '../reducers';
 import {getClient} from './client';
 
 let listeners = [];
@@ -52,7 +51,6 @@ export function getStore() {
   }
 
   const coralReducers = {
-    ...mainReducer,
     apollo: getClient().reducer()
   };
 

client/coral-settings/containers/ProfileContainer.js

@@ -11,7 +11,10 @@ import NotLoggedIn from '../components/NotLoggedIn';
 import IgnoredUsers from '../components/IgnoredUsers';
 import {Spinner} from 'coral-ui';
 import CommentHistory from 'talk-plugin-history/CommentHistory';
-import {showSignInDialog, checkLogin} from 'coral-framework/actions/auth';
+
+// TODO: Auth logic needs refactoring.
+import {showSignInDialog, checkLogin} from 'coral-embed-stream/src/actions/auth';
+
 import {insertCommentsSorted} from 'plugin-api/beta/client/utils';
 import update from 'immutability-helper';
 

plugin-api/beta/client/hocs/withReaction.js

@@ -7,12 +7,14 @@ import {getDisplayName} from 'coral-framework/helpers/hoc';
 import {compose, gql} from 'react-apollo';
 import withFragments from 'coral-framework/hocs/withFragments';
 import withMutation from 'coral-framework/hocs/withMutation';
-import {showSignInDialog} from 'coral-framework/actions/auth';
 import {addNotification} from 'coral-framework/actions/notification';
 import {capitalize} from 'coral-framework/helpers/strings';
 import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
 import * as PropTypes from 'prop-types';
 
+// TODO: Auth logic needs refactoring.
+import {showSignInDialog} from 'coral-embed-stream/src/actions/auth';
+
 export default (reaction) => (WrappedComponent) => {
   if (typeof reaction !== 'string') {
     console.error('Reaction must be a valid string');

plugins/talk-plugin-auth/client/components/ChangeUsername.js

@@ -13,7 +13,7 @@ import {
   invalidForm,
   validForm,
   createUsername
-} from 'coral-framework/actions/auth';
+} from 'coral-embed-stream/src/actions/auth';
 
 class ChangeUsernameContainer extends React.Component {
   constructor(props) {

plugins/talk-plugin-auth/client/components/SignInButton.js

@@ -2,7 +2,7 @@ import React from 'react';
 import {Button} from 'plugin-api/beta/client/components/ui';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
-import {showSignInDialog} from 'coral-framework/actions/auth';
+import {showSignInDialog} from 'coral-embed-stream/src/actions/auth';
 import t from 'coral-framework/services/i18n';
 
 const SignInButton = ({loggedIn, showSignInDialog}) => (

plugins/talk-plugin-auth/client/components/SignInContainer.js

@@ -18,7 +18,7 @@ import {
   facebookCallback,
   invalidForm,
   validForm,
-} from 'coral-framework/actions/auth';
+} from 'coral-embed-stream/src/actions/auth';
 
 class SignInContainer extends React.Component {
   constructor(props) {

plugins/talk-plugin-auth/client/components/UserBox.js

@@ -3,7 +3,7 @@ import styles from './styles.css';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import t from 'coral-framework/services/i18n';
-import {logout} from 'coral-framework/actions/auth';
+import {logout} from 'coral-embed-stream/src/actions/auth';
 
 const UserBox = ({loggedIn, user, logout, onShowProfile}) => (
   <div>