Merge branch 'v2.1.0' into v2.0.5

Author: prescottprue

.prettierrc

@@ -0,0 +1,3 @@
+singleQuote: true
+semi: false
+trailingComma: 'none'

README.md

@@ -30,12 +30,16 @@ The [Material Example](https://github.com/prescottprue/react-redux-firebase/tree
 - Server Side Rendering Support
 - [`react-native` support](/docs/recipes/react-native.md) using [native modules](http://docs.react-redux-firebase.com/history/v2.0.0/docs/recipes/react-native.html#native-modules) or [web sdk](/docs/recipes/react-native.md#jsweb)
 
-## Install
+## Installation
 
 ```bash
 npm install --save react-redux-firebase
 ```
 
+This assumes you are using [npm](https://www.npmjs.com/) as your package manager.
+
+If you're not, you can access the library on [unpkg](https://unpkg.com/redux-firestore@latest/dist/redux-firestore.min.js), download it, or point your package manager to it. Theres more on this in the [Builds section below](#builds).
+
 ## Use
 
 Include `reactReduxFirebase` (store enhancer) and  `firebaseReducer` (reducer) while creating your redux store:
@@ -116,7 +120,7 @@ const Todos = ({ firebase }) => {
 }
 
 export default withFirebase(Todos)
-// or firebaseConnect()(Todos) if attaching listeners
+// or firebaseConnect()(Todos)
 ```
 
 **Load Data (listeners automatically managed on mount/unmount)**
@@ -157,12 +161,10 @@ export default compose(
   firebaseConnect([
     'todos' // { path: '/todos' } // object notation
   ]),
-  connect(
-    (state) => ({
-      todos: state.firebase.data.todos,
-      // profile: state.firebase.profile // load profile
-    })
-  )
+  connect((state) => ({
+    todos: state.firebase.data.todos,
+    // profile: state.firebase.profile // load profile
+  }))
 )(Todos)
 ```
 
@@ -250,6 +252,14 @@ export default compose(
 )(Todos)
 ```
 
+## Firestore
+
+If you plan to use Firestore, you should checkout [`redux-firestore`][redux-firestore]. It integrates nicely with `react-redux-firebase` and it allows you to run Real Time Database and Firestore along side each other.
+
+`react-redux-firebase` provides the `firestoreConnect` HOC (similar to `firebaseConnect`) for easy setting/unsetting of listeners.
+
+Currently `react-redux-firebase` still handles auth when using [`redux-firestore`][redux-firestore] - The future plan is to also have auth standalone auth library that will allow the developer to choose which pieces they do/do not want.
+
 ## [Docs](http://react-redux-firebase.com)
 See full documentation at [react-redux-firebase.com](http://react-redux-firebase.com)
 
@@ -262,11 +272,18 @@ See full documentation at [react-redux-firebase.com](http://react-redux-firebase
 
 ## [Examples](examples)
 
-Examples folder is broken into two categories [complete](https://github.com/prescottprue/react-redux-firebase/tree/master/examples/complete) and [snippets](https://github.com/prescottprue/react-redux-firebase/tree/master/examples/snippets). `/complete` contains full applications that can be run as is, while `/snippets` contains small amounts of code to show functionality (dev tools and deps not included).
+### Real World Applications
+* [fireadmin.io](http://fireadmin.io) - Firebase Instance Management Tool (source [available here](https://github.com/prescottprue/fireadmin))
+
+If you would like a project added to this section please reach out [over gitter][gitter-url]
+
+### [Examples Folder](examples)
+
+Examples folder is broken into two categories [snippets](examples/snippets) and [complete](examples/complete). `/complete` contains full applications that can be run as is, where as `/snippets` contains small amounts of code to highlight specific functionality (dev tools and deps not included).
 
 #### [State Based Query Snippet](examples/snippets/stateBasedQuery)
 
-Snippet showing querying based on data in redux state. One of the most common examples of this is querying based on the current users auth UID.
+Snippet showing querying based on data in redux state. One of the more common examples is querying based on the current users auth UID.
 
 #### [Decorators Snippet](examples/snippets/decorators)
 
@@ -294,17 +311,9 @@ View docs for recipes on integrations with:
 * [redux-saga](http://react-redux-firebase.com/docs/integrations/redux-saga.md)
 * [redux-form](http://react-redux-firebase.com/docs/integrations/redux-form.md)
 * [redux-auth-wrapper](http://react-redux-firebase.com/docs/integrations/routing.md#advanced)
-* [redux-persist](http://react-redux-firebase.com/docs/integrations/redux-persist.md) - [improved integration with `v2.0.0`](http://react-redux-firebase.com/docs/integrations/redux-persist.html)
+* [redux-persist](http://react-redux-firebase.com/docs/integrations/redux-persist.md)
 * [react-native](/docs/integrations/react-native.md)
-* [react-native-firebase](http://react-redux-firebase.com/docs/integrations/react-native.html#native-modules) - requires `v2.0.0`
-
-## Firestore
-
-If you plan to use Firestore, you should checkout [`redux-firestore`][redux-firestore]. It integrates nicely with `react-redux-firebase` (v2 only) and it allows you to run Real Time Database and Firestore along side each other.
-
-`react-redux-firebase` provides the `firestoreConnect` HOC (similar to `firebaseConnect`) for easy setting/unsetting of listeners.
-
-Currently `react-redux-firebase` still handles auth when using [`redux-firestore`][redux-firestore] - The future plan is to also have auth standalone auth library that will allow the developer to choose which pieces they do/do not want.
+* [react-native-firebase](http://react-redux-firebase.com/docs/integrations/react-native.html#native-modules)
 
 ## Starting A Project
 
@@ -316,10 +325,26 @@ Currently `react-redux-firebase` still handles auth when using [`redux-firestore
 
 The [examples folder](/examples) contains full applications that can be copied/adapted and used as a new project.
 
-### FAQ
+## FAQ
 
 Please visit the [FAQ section of the docs](http://docs.react-redux-firebase.com/history/v2.0.0/docs/FAQ.html)
 
+## Builds
+
+Most commonly people consume Redux Firestore as a [CommonJS module](http://webpack.github.io/docs/commonjs.html). This module is what you get when you import redux in a Webpack, Browserify, or a Node environment.
+
+If you don't use a module bundler, it's also fine. The redux-firestore npm package includes precompiled production and development [UMD builds](https://github.com/umdjs/umd) in the [dist folder](https://unpkg.com/redux-firestore@latest/dist/). They can be used directly without a bundler and are thus compatible with many popular JavaScript module loaders and environments. For example, you can drop a UMD build as a `<script>` tag on the page. The UMD builds make Redux Firestore available as a `window.ReduxFirestore` global variable.
+
+It can be imported like so:
+
+```html
+<script src="../node_modules/react-redux-firebase/dist/react-redux-firebase.min.js"></script>
+<!-- or through cdn: <script src="https://unpkg.com/react-redux-firebase@latest/dist/react-redux-firebase.min.js"></script> -->
+<script>console.log('react redux firebase:', window.ReactReduxFirebase)</script>
+```
+
+Note: In an effort to keep things simple, the wording from this explanation was modeled after [the installation section of the Redux Docs](https://redux.js.org/#installation).
+
 ## Contributors
 
 This project exists thanks to all the people who contribute.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "react-redux-firebase",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "description": "Redux integration for Firebase. Comes with a Higher Order Components for use with React.",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -11,7 +11,7 @@
     "clean": "rimraf es lib dist coverage",
     "lint": "eslint src/** test/unit/** test/setup.js",
     "lint:fix": "npm run lint -- --fix",
-    "format": "prettier --single-quote --no-semi --trailing-comma none --write \"src/**/*.js\" \"test/**/*.js\"",
+    "format": "prettier --write \"src/**/*.js\" \"test/**/*.js\"",
     "test": "mocha -R spec ./test/unit/**",
     "test:cov": "istanbul cover ./node_modules/mocha/bin/_mocha ./test/unit/**",
     "codecov": "cat coverage/lcov.info | codecov",
@@ -117,7 +117,7 @@
     "rimraf": "^2.6.2",
     "sinon": "^3.3.0",
     "sinon-chai": "^2.14.0",
-    "webpack": "^3.6.0",
+    "webpack": "^3.11.0",
     "webpack-bundle-analyzer": "^2.9.0",
     "ws": "^3.2.0",
     "xmlhttprequest": "^1.8.0"

package.json

@@ -190,7 +190,7 @@ export const createUserProfile = (dispatch, firebase, userData, profile) => {
   if (isFunction(config.profileFactory)) {
     // catch errors in user provided profileFactory function
     try {
-      profile = config.profileFactory(userData, profile) // eslint-disable-line no-param-reassign
+      profile = config.profileFactory(userData.user, profile, userData) // eslint-disable-line no-param-reassign
     } catch (err) {
       /* eslint-disable no-console */
       console.error(
@@ -468,52 +468,35 @@ export const login = (dispatch, firebase, credentials) => {
     .auth()
     [method](...params)
     .then(userData => {
-      // Handle null response from getRedirectResult before redirect has happened
-      if (!userData) return Promise.resolve(null)
-
-      // For email auth return uid (createUser is used for creating a profile)
-      if (method === 'signInWithEmailAndPassword') {
-        return { user: userData }
-      }
-      // TODO: Only call createUserProfile once, and just pass different settings
-
-      // For token auth, the user key doesn't exist. Instead, return the JWT.
-      if (method === 'signInWithCustomToken') {
-        if (!firebase._.config.updateProfileOnLogin) {
-          return { user: userData }
-        }
-        return createUserProfile(
-          dispatch,
-          firebase,
-          userData,
-          credentials.profile
-        )
-      }
-
+      // signInWithPhoneNumber is a two step process which requires modifying
+      // the confirm method already existing on the response
       if (method === 'signInWithPhoneNumber') {
         // Modify confirm method to include profile creation
         return {
           ...userData,
           confirm: code =>
-            // Call original confirm
-            userData.confirm(code).then(({ user, additionalUserInfo }) =>
-              createUserProfile(dispatch, firebase, user, {
-                phoneNumber: user.providerData[0].phoneNumber,
-                providerData: user.providerData
-              }).then(profile => ({ profile, user, additionalUserInfo }))
+            // Call original confirm with profile creation after
+            userData.confirm(code).then(confirmResponse =>
+              createUserProfile(dispatch, firebase, confirmResponse, {
+                phoneNumber: confirmResponse.user.providerData[0].phoneNumber,
+                providerData: confirmResponse.user.providerData
+              }).then(profile => ({ profile, ...confirmResponse }))
             )
         }
       }
-
-      // Create profile when logging in with external provider
-      const user = userData.user || userData
-
-      return createUserProfile(dispatch, firebase, user, {
-        email: user.email,
-        displayName: user.providerData[0].displayName || user.email,
-        avatarUrl: user.providerData[0].photoURL,
-        providerData: user.providerData
-      }).then(profile => ({ profile, ...userData }))
+      return userData
+    })
+    .then(userData => {
+      // Create user profile if returned data exists and not type signInWithPhoneNumber
+      if (userData && method !== 'signInWithPhoneNumber') {
+        return createUserProfile(
+          dispatch,
+          firebase,
+          userData,
+          credentials.profile
+        ).then(profile => ({ profile, ...userData }))
+      }
+      return userData
     })
     .catch(err => {
       dispatchLoginError(dispatch, err)
@@ -567,7 +550,11 @@ export const createUser = (
     .auth()
     .createUserWithEmailAndPassword(email, password)
     .then(
-      userData =>
+      userData => {
+        if () {
+
+        }
+      }
         // Login to newly created account if signIn flag is not set to false
         firebase.auth().currentUser || (!!signIn && signIn === false)
           ? createUserProfile(

src/actions/auth.js

@@ -53,7 +53,6 @@ export const createFirestoreConnect = (storeKey = 'store') => (
       }
     }
 
-    // TODO: Re-attach listeners on query path change
     componentWillReceiveProps(np) {
       const { firebase, firestore } = this.store
       const inputAsFunc = createCallable(dataOrFn)
@@ -73,7 +72,6 @@ export const createFirestoreConnect = (storeKey = 'store') => (
       return (
         <WrappedComponent
           {...this.props}
-          {...this.state}
           firebase={{ ...firebase, ...firebase.helpers }}
           firestore={firestore}
         />

src/firestoreConnect.js

@@ -189,7 +189,7 @@ const buildChildList = (state, list, p) =>
   mapValues(list, (val, key) => {
     let getKey = val
     // Handle key: true lists
-    if (val === true) {
+    if (val === true || p.populateByKey) {
       getKey = key
     }
     // Allow for aliasing populated data see #126 for more details
@@ -210,7 +210,7 @@ const buildChildList = (state, list, p) =>
         : get(state.data, pathString)
     }
     // Populate child does not exist
-    return val === true ? val : getKey
+    return val === true || p.populateByKey ? val : getKey
   })
 
 /**

src/helpers.js

@@ -108,7 +108,7 @@ export const populateList = (firebase, list, p, results) => {
   return Promise.all(
     map(list, (id, childKey) => {
       // handle list of keys
-      const populateKey = id === true ? childKey : id
+      const populateKey = id === true || p.populateByKey ? childKey : id
       return getPopulateChild(firebase, p, populateKey).then(pc => {
         if (pc) {
           // write child to result object under root name if it is found

src/utils/populate.js

@@ -50,7 +50,11 @@ const addSpyWithArgsToAuthMethod = (methodName, spyFunc, args = []) => ({
     [methodName]: () => spyFunc(args)
   })
 })
-const fakeLogin = { email: 'test@tst.com', password: 'asdfasdf', role: 'admin' }
+const fakeLogin = {
+  email: 'test@tst.com',
+  password: 'asdfasdf',
+  role: 'admin'
+}
 
 describe('Actions: Auth -', () => {
   beforeEach(() => {

test/unit/actions/auth.spec.js

@@ -181,7 +181,11 @@ describe('reducer', () => {
 
     it('sets data to path with already existing data with numeric keys', () => {
       initialData = { data: { test: { [childKey]: { 123: 'bar1' } } } }
-      action = { type: actionTypes.SET, path: childPath, data: { 124: 'bar2' } }
+      action = {
+        type: actionTypes.SET,
+        path: childPath,
+        data: { 124: 'bar2' }
+      }
       expect(firebaseReducer(initialData, action).data).to.deep.equal({
         ...initialState.data,
         test: {