profileParamsToPopulate config option. AvatarUrl parameter added to default profile.

* profileParamsToPopulate config option added and working
* avatarUrl parameter added to profile object for provider logins

Author: Scott Prue

.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

@@ -83,7 +83,29 @@ const unWatchUserProfile = (firebase) => {
     firebase._.profileWatch = null
   }
 }
-
+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
+    }
+  )
+}
 /**
  * @description Watch user profile
  * @param {Function} dispatch - Action dispatch function
@@ -93,15 +115,33 @@ 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({
+                type: SET_PROFILE,
+                profile: Object.assign(snap.val(), data.reduce((a, b) => Object.assign(a, b)))
+              })
+            })
+        }
       })
   }
 }
@@ -244,6 +284,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
           }
         )