v1.0.3

* `profileParamsToPopulate` capability added to config
* `avatarUrl` parameter added to default profile for external provider logins
* `logout()` method now returns a promise
* Profile created by default when not provided for email signup
* [`lodash`](https://www.npmjs.com/package/lodash) updated to v4.16.6
* [`firebase`](https://www.npmjs.com/package/firebase) updated to v3.5.3

Author: prescottprue

.eslintrc

@@ -19,8 +19,5 @@
   },
   "rules": {
     "semi" : [2, "never"],
-    "max-len": "off",
-    "generator-star-spacing": 0,
-    "babel/generator-star-spacing": 1
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-redux-firebase",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Redux integration for Firebase. Comes with a Higher Order Component for use with React.",
   "main": "dist/index.js",
   "module": "src/index.js",
@@ -39,10 +39,10 @@
     }
   ],
   "dependencies": {
-    "firebase": "^3.5.2",
+    "firebase": "^3.5.3",
     "immutable": "^3.8.1",
     "jwt-decode": "^2.1.0",
-    "lodash": "^4.16.4"
+    "lodash": "^4.16.6"
   },
   "peerDependencies": {
     "react": "^0.14.6 || ^15.0.0",

src/actions/auth.js

@@ -10,6 +10,7 @@ import {
 } from '../constants'
 import { capitalize, omit, isArray, isString, isFunction } from 'lodash'
 import jwtDecode from 'jwt-decode'
+import { promisesForPopulate } from '../utils'
 
 /**
  * @description Dispatch login error action
@@ -93,15 +94,41 @@ const watchUserProfile = (dispatch, firebase) => {
   const authUid = firebase._.authUid
   const userProfile = firebase._.config.userProfile
   unWatchUserProfile(firebase)
+
   if (firebase._.config.userProfile) {
     firebase._.profileWatch = firebase.database()
       .ref()
       .child(`${userProfile}/${authUid}`)
       .on('value', snap => {
-        dispatch({
-          type: SET_PROFILE,
-          profile: snap.val()
-        })
+        const { profileParamsToPopulate } = firebase._.config
+        if (!profileParamsToPopulate || (!isArray(profileParamsToPopulate) && !isString(profileParamsToPopulate))) {
+          dispatch({
+            type: SET_PROFILE,
+            profile: snap.val()
+          })
+        } else {
+          // Handle string and array for profileParamsToPopulate config option
+          const paramsToPopulate = isArray(firebase._.config.profileParamsToPopulate)
+            ? firebase._.config.profileParamsToPopulate
+            : firebase._.config.profileParamsToPopulate.split(',')
+
+          // Convert each populate string in array into an array of once query promises
+          Promise.all(
+            paramsToPopulate.map(p =>
+              promisesForPopulate(firebase, snap.val(), p)
+            )
+          )
+          .then(data => {
+            // Dispatch action with profile combined with populated parameters
+            dispatch({
+              type: SET_PROFILE,
+              profile: Object.assign(
+                snap.val(), // profile
+                data.reduce((a, b) => Object.assign(a, b)) // populated profile parameters
+              )
+            })
+          })
+        }
       })
   }
 }
@@ -172,8 +199,9 @@ export const createUserProfile = (dispatch, firebase, userData, profile) =>
     .child(`${firebase._.config.userProfile}/${userData.uid}`)
     .once('value')
     .then(profileSnap =>
+      // update profile only if doesn't exist or if set by config
       !firebase._.config.updateProfileOnLogin && profileSnap.val() !== null
-        ? profile
+        ? profileSnap.val()
         : profileSnap.ref.update(profile) // Update the profile
         .then(() => profile)
         .catch(err => {
@@ -244,6 +272,7 @@ export const login = (dispatch, firebase, credentials) => {
           {
             email: user.email,
             displayName: user.providerData[0].displayName || user.email,
+            avatarUrl: user.providerData[0].photoURL,
             providerData: user.providerData
           }
         )
@@ -271,6 +300,7 @@ export const logout = (dispatch, firebase) => {
   dispatch({ type: LOGOUT })
   firebase._.authUid = null
   unWatchUserProfile(firebase)
+  return Promise.resolve(firebase)
 }
 
 /**
@@ -295,7 +325,7 @@ export const createUser = (dispatch, firebase, { email, password, signIn }, prof
       firebase.auth().currentUser || (!!signIn && signIn === false)
         ? createUserProfile(dispatch, firebase, userData, profile)
         : login(dispatch, firebase, { email, password })
-            .then(() => createUserProfile(dispatch, firebase, userData, profile))
+            .then(() => createUserProfile(dispatch, firebase, userData, profile || { email }))
             .catch(err => {
               if (err) {
                 switch (err.code) {

src/utils/index.js

@@ -0,0 +1,32 @@
+import { isString } from 'lodash'
+
+/**
+ * @description Watch user profile
+ * @param {Function} dispatch - Action dispatch function
+ * @param {Object} firebase - Internal firebase object
+ */
+export const promisesForPopulate = (firebase, profile, populateString) => {
+  const paramToPopulate = populateString.split(':')[0]
+  const populateRoot = populateString.split(':')[1]
+  let idList = profile[paramToPopulate]
+  if (isString(profile[paramToPopulate])) {
+    idList = profile[paramToPopulate].split(',')
+  }
+  return Promise.all(
+    idList.map(itemId =>
+      firebase.database()
+       .ref()
+       .child(populateRoot)
+       .child(itemId)
+       .once('value')
+       .then(snap => snap.val() || itemId)
+    )).then(data => {
+      const populatedObj = {}
+      idList.forEach(item => populatedObj)
+      populatedObj[paramToPopulate] = data
+      return populatedObj
+    }
+  )
+}
+
+export default { promisesForPopulate }