Merged master.

Author: Scott Prue

.github/ISSUE_TEMPLATE.md

@@ -1,13 +1,13 @@
 **Do you want to request a *feature* or report a *bug*?**  
 
-(If this is a *usage question*, please **do not post it here**—post it on [gitter](https://gitter.im/redux-firebase/Lobby) or [Stack Overflow](http://stackoverflow.com/questions/tagged/react-redux-firebase) instead. If this is not a “feature” or a “bug”, or the phrase “How do I...?” applies, then it's probably a usage question.)
+(If this is a *usage question*, please **do not post it here**—post it on [gitter](https://gitter.im/redux-firebase/Lobby). If this is not a “feature” or a “bug”, or the phrase “How do I...?” applies, then it's probably a usage question.)
 
 
 **What is the current behavior?**
 
 
 
-**If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem via https://jsfiddle.net or similar.**
+**If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem via [codesandbox](https://codesandbox.io/) or similar.**
 
 
 
@@ -18,4 +18,4 @@
 **Which versions of dependencies, and which browser and OS are affected by this issue? Did this work in previous versions or setups?**
 
 <!-- Love react-redux-firebase? Please consider supporting our collective:
-👉  https://opencollective.com/react-redux-firebase/donate -->
+👉  https://opencollective.com/react-redux-firebase/donate -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,19 +1,12 @@
 ### Description
 
-<!-- Write Your Description Here ^  -->
-<!-- Some things that may be of interest to address:
-- Will a new version need to be released or is this a docs change?
-- Which version should this be published as a part of? ("ASAP", "no idea", and specific version number)
-- Does this impact the external API?
-- Will it need to be a breaking change? -->
 
 ### Check List
 If not relevant to pull request, check off as complete
 
 - [ ] All tests passing
-- [ ] Docs updated with any changes or examples
-- [ ] Added tests to ensure feature(s) work properly
+- [ ] Docs updated with any changes or examples if applicable
+- [ ] Added tests to ensure new feature(s) work properly
 
 ### Relevant Issues
-<!-- List Relevant Issues here -->
 <!-- * #1 -->

.gitignore

@@ -21,6 +21,11 @@ coverage
 dist
 es
 lib
+_book
+# Logs
+*.log
+.DS_Store
+.idea
 examples/complete/react-native/ios/build
 examples/complete/react-native-firebase/ios/build
 

README.md

@@ -45,18 +45,13 @@ npm install --save react-redux-firebase
 
 The above install command will install the `@latest` tag. You may also use the following tags when installing to get different versions:
 
-* `@next` - Next upcoming release. Currently points to active progress with `v1.5.0-*` pre-releases
-* `@canary` - Most possible up to date code. Currently points to active progress with `v2.0.0-*` pre-releases. *Warning:* Syntax is different than current stable version.
+* `@canary` - Most possible up to date code. Currently, points to active progress with `v2.0.0-*` pre-releases. *Warning:* Syntax is different than current stable version.
 
-Other versions docs are available using the dropdown on the above docs link. For quick access:
-* [Version `1.5.0` Docs](http://docs.react-redux-firebase.com/history/v1.5.0/)
-* [Version `2.0.0` Docs](http://docs.react-redux-firebase.com/history/v2.0.0/)
-
-Be aware of changes when using version that are tagged `@latest`. Please report any issues you encounter, and try to keep an eye on the [releases page](https://github.com/prescottprue/react-redux-firebase/releases) for updates.
+Be aware of changes when using a version that is not tagged `@latest`. Please report any issues you encounter, and try to keep an eye on the [releases page](https://github.com/prescottprue/react-redux-firebase/releases) for updates.
 
 ## Use
 
-**Note:** If you are just starting a new project, you may want to use [`v2.0.0`](http://docs.react-redux-firebase.com/history/v2.0.0/#use) since it is has an even easier syntax. For clarity on the transition, view the [`v1` -> `v2` migration guide](http://docs.react-redux-firebase.com/history/v2.0.0/docs/v2-migration-guide.html)
+**Note:** If you are just starting a new project, you may want to use [`v2.0.0`](http://docs.react-redux-firebase.com/history/v2.0.0/#use) since it has an even easier syntax. For clarity on the transition, view the [`v1` -> `v2` migration guide](http://docs.react-redux-firebase.com/history/v2.0.0/docs/v2-migration-guide.html)
 
 Include `reactReduxFirebase` in your store compose function and  `firebaseStateReducer` in your reducers:
 
@@ -65,13 +60,7 @@ import { createStore, combineReducers, compose } from 'redux'
 import { reactReduxFirebase, firebaseStateReducer } from 'react-redux-firebase'
 import firebase from 'firebase'
 
-// Add Firebase to reducers
-const rootReducer = combineReducers({
-  firebase: firebaseStateReducer
-})
-
-// Firebase config
-const config = {
+const firebaseConfig = {
   apiKey: '<your-api-key>',
   authDomain: '<your-auth-domain>',
   databaseURL: '<your-database-url>',
@@ -87,7 +76,13 @@ const createStoreWithFirebase = compose(
   reactReduxFirebase(firebaseApp, rrfConfig), // firebase instance as first argument
 )(createStore)
 
+// Add Firebase to reducers
+const rootReducer = combineReducers({
+  firebase: firebaseStateReducer
+})
+
 // Create store with reducers and initial state
+const initialState = {}
 const store = createStoreWithFirebase(rootReducer, initialState)
 ```
 
@@ -115,6 +110,9 @@ class Todos extends Component {
         newTodo.value = ''
         console.log('Todo Created!')
       })
+      .catch((err) => {
+        console.log('Error creating todo:', err) // error is also set to state.firebase.authError
+      })
   }
 
   render() {
@@ -197,7 +195,7 @@ export default class SomeComponent extends Component {
 }
 ```
 
-In order to enable this functionality, you will most likely need to install a plugin (depending on your build setup). For Webpack and Babel, you will need to make sure you have installed and enabled  [babel-plugin-transform-decorators-legacy](https://github.com/loganfsmyth/babel-plugin-transform-decorators-legacy) by doing the following:
+To enable this functionality, you will most likely need to install a plugin (depending on your build setup). For Webpack and Babel, you will need to make sure you have installed and enabled  [babel-plugin-transform-decorators-legacy](https://github.com/loganfsmyth/babel-plugin-transform-decorators-legacy) by doing the following:
 
 1. run `npm i --save-dev babel-plugin-transform-decorators-legacy`
 2. Add the following line to your `.babelrc`:
@@ -245,7 +243,7 @@ Join us on the [redux-firebase gitter](https://gitter.im/redux-firebase/Lobby).
 View docs for recipes on integrations with:
 
 * [redux-thunk](/docs/recipes/thunks.md)
-* [redux-observable](/docs/recipes/redux-observable.md)
+* [redux-observable](/docs/recipes/epics.md)
 * [redux-saga](/docs/recipes/redux-saga.md)
 * [redux-form](/docs/recipes/redux-form.md)
 * [redux-auth-wrapper](/docs/recipes/routing.md#advanced)
@@ -267,33 +265,37 @@ The [examples folder](/examples) contains full applications that can be copied/a
 
 1. How is this different than [`redux-react-firebase`](https://github.com/tiberiuc/redux-react-firebase)?
 
-  This library was actually originally forked from redux-react-firebase, but adds extended functionality such as:
-  * [populate functionality](http://react-redux-firebase.com/docs/populate) (similar to mongoDB or SQL JOIN)
-  * `react-native` support ([web/js](http://react-redux-firebase.com/docs/recipes/react-native.html) or native modules through [`react-native-firebase`](http://docs.react-redux-firebase.com/history/v2.0.0/docs/recipes/react-native.html#native-modules))
-  * tons of [integrations](#integrations)
-  * [`profileFactory`](http://react-redux-firebase.com/docs/config) - change format of profile stored on Firebase
-  * [`getFirebase`](http://react-redux-firebase.com/docs/thunks) - access to firebase instance that fires actions when methods are called
-  * [access to firebase's `storage`](http://react-redux-firebase.com/docs/storage) method`
-  * `uniqueSet` method helper for only setting if location doesn't already exist
-  * Object or String notation for paths (`[{ path: '/todos' }]` equivalent to `['/todos']`)
-  * Action Types and other Constants are exposed for external usage (such as with `redux-observable`)
-  * Server Side Rendering Support
-  * [Complete Firebase Auth Integration](http://react-redux-firebase.com/docs/auth.html#examples) including `signInWithRedirect` compatibility for OAuth Providers
-
-  #### Well why not combine?
-  I have been talking to the author of [redux-react-firebase](https://github.com/tiberiuc/redux-react-firebase) about combining, but we are not sure that the users of both want that at this point. Join us on the [redux-firebase gitter](https://gitter.im/redux-firebase/Lobby) if you haven't already since a ton of this type of discussion goes on there.
+    This library was actually originally forked from redux-react-firebase, but adds extended functionality such as:
+    * [populate functionality](http://react-redux-firebase.com/docs/populate) (similar to mongoose's `populate` or SQL's `JOIN`)
+    * `react-native` support ([web/js](http://react-redux-firebase.com/docs/recipes/react-native.html) or native modules through [`react-native-firebase`](http://docs.react-redux-firebase.com/history/v2.0.0/docs/recipes/react-native.html#native-modules))
+    * tons of [integrations](#integrations)
+    * [`profileFactory`](http://react-redux-firebase.com/docs/config) - change format of profile stored on Firebase
+    * [`getFirebase`](http://react-redux-firebase.com/docs/thunks) - access to firebase instance that fires actions when methods are called
+    * [access to firebase's `storage`](http://react-redux-firebase.com/docs/storage) and `messaging` services
+    * `uniqueSet` method helper for only setting if location doesn't already exist
+    * Object or String notation for paths (`[{ path: '/todos' }]` equivalent to `['/todos']`)
+    * Action Types and other Constants are exposed for external usage (such as with `redux-observable`)
+    * Server Side Rendering Support
+    * [Complete Firebase Auth Integration](http://react-redux-firebase.com/docs/auth.html#examples) including `signInWithRedirect` compatibility for OAuth Providers
+
+    #### Well why not combine?
+    I have been talking to the author of [redux-react-firebase](https://github.com/tiberiuc/redux-react-firebase) about combining, but we are not sure that the users of both want that at this point. Join us on the [redux-firebase gitter](https://gitter.im/redux-firebase/Lobby) if you haven't already since a ton of this type of discussion goes on there.
+
+    #### What about [redux-firebase](https://github.com/colbyr/redux-firebase)?
+    The author of [redux-firebase](https://github.com/colbyr/redux-firebase) has agreed to share the npm namespace! Currently the plan is to take the framework agnostic redux core logic of `react-redux-firebase` and [place it into `redux-firebase`](https://github.com/prescottprue/redux-firebase)). Eventually `react-redux-firebase` and potentially other framework libraries can depend on that core (the new `redux-firebase`).
 
 2. Why use redux if I have Firebase to store state?
 
-  This isn't a super quick answer, so I wrote up [a medium article to explain](https://medium.com/@prescottprue/firebase-with-redux-82d04f8675b9)
+    This isn't a super quick answer, so I wrote up [a medium article to explain](https://medium.com/@prescottprue/firebase-with-redux-82d04f8675b9)
 
 3. Where can I find some examples?
 
-  * [Recipes Section](http://react-redux-firebase.com/docs/recipes/) of [the docs](http://react-redux-firebase.com/docs/recipes/)
-  * [examples folder](/examples) contains [complete example apps](/examples/complete) as well as [useful snippets](/examples/snippets)
+    * [Recipes Section](http://react-redux-firebase.com/docs/recipes/) of [the docs](http://react-redux-firebase.com/docs/recipes/)
+    * [examples folder](/examples) contains [complete example apps](/examples/complete) as well as [useful snippets](/examples/snippets)
+
 4. How does `connect` relate to `firebaseConnect`?
 
-  ![data flow](/docs/static/dataFlow.png)
+    ![data flow](/docs/static/dataFlow.png)
 
 5. How do I help?
 

SUMMARY.md

@@ -23,6 +23,7 @@
   * [React Native](/docs/recipes/react-native.md)
   * [React Chrome Redux](/docs/recipes/react-chrome-redux.md)
   * [Server Side Rendering](/docs/recipes/ssr.md)
+  * [Performance](/docs/recipes/performance.md)
 * [API Reference](/docs/api/README.md)
   * [constants](/docs/api/constants.md)
   * [firebaseConnect](/docs/api/connect.md)

book.json

@@ -27,7 +27,8 @@
         },
         {
             "value": "http://docs.react-redux-firebase.com/history/v1.5.0/",
-            "text": "Version 1.5.0"
+            "text": "Version 1.5.0",
+            "selected": true
         },
         {
             "value": "http://docs.react-redux-firebase.com/history/v2.0.0/",

docs/api/compose.md

@@ -54,7 +54,7 @@ Middleware that handles configuration (placed in redux's
         automatically populate profile with data loaded through profileParamsToPopulate config. (default: `true`)
     -   `config.setProfilePopulateResults` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Whether or not to
         call SET actions for data that results from populating profile to redux under
-        the data path. For example: role paramter on profile populated from 'roles'
+        the data path. For example role parameter on profile populated from 'roles'
         root. True will call SET_PROFILE as well as a SET action with the role that
         is loaded (places it in data/roles). (default: `false`)
 

docs/api/connect.md

@@ -74,6 +74,7 @@ export default connect(({ firebase: data: { todos }, auth, profile }) => ({
   todos,
   profile, // pass profile data as this.props.profile
   auth // pass auth data as this.props.auth
+>>>>>>> master
 }))(fbWrapped)
 ```
 

docs/api/constants.md

@@ -34,7 +34,7 @@ Object containing all action types
 -   `LOGIN_ERROR` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** `@@reactReduxFirebase/LOGIN_ERROR`
 -   `NO_VALUE` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** `@@reactReduxFirebase/NO_VALUE`
 -   `UNAUTHORIZED_ERROR` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** `@@reactReduxFirebase/UNAUTHORIZED_ERROR`
--   `ERROR` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** `@@reactReduxFirebase/UNAUTHORIZED_ERROR`
+-   `ERROR` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** `@@reactReduxFirebase/ERROR`
 -   `SET_LISTENER` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** `@@reactReduxFirebase/SET_LISTENER`
 -   `UNSET_LISTENER` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** `@@reactReduxFirebase/UNSET_LISTENER`
 -   `AUTHENTICATION_INIT_STARTED` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** `@@reactReduxFirebase/AUTHENTICATION_INIT_STARTED`
@@ -85,6 +85,8 @@ Default configuration options
     logging out.
 -   `updateProfileOnLogin` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** `true` Whether or not to update
     user profile when logging in.
+-   `resetBeforeLogin` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** `true` Whether or not to reset auth
+    and profile when logging in (see issue #254 for more details).
 -   `enableRedirectHandling` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** `true` Whether or not to enable
     redirect handling. This must be disabled if environment is not http/https
     such as with react-native.
@@ -98,7 +100,7 @@ Default configuration options
     profileParamsToPopulate config.
 -   `setProfilePopulateResults` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** `true` Whether or not to
     call SET actions for data that results from populating profile to redux under
-    the data path. For example: role paramter on profile populated from 'roles'
+    the data path. For example role parameter on profile populated from 'roles'
     root. True will call SET_PROFILE as well as a SET action with the role that
     is loaded (places it in data/roles).
 -   `dispatchOnUnsetListener` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** `false` Whether or not to