Population of profile params

package.json

@@ -18,7 +18,7 @@
     "build:umd": "cross-env BABEL_ENV=commonjs NODE_ENV=development webpack src/index.js dist/react-redux-firebase.js",
     "build:umd:min": "cross-env BABEL_ENV=commonjs NODE_ENV=production webpack src/index.js dist/react-redux-firebase.min.js",
     "build": "npm run build:commonjs && npm run build:es && npm run build:umd && npm run build:umd:min",
-    "watch": "npm run build:commonjs -- --watch",
+    "watch": "npm run build:umd -- --watch",
     "prepublish": "npm run clean && npm run build",
     "prepush": "npm run lint:fix",
     "docs:clean": "rimraf _book",

src/actions/auth.js

@@ -1,7 +1,21 @@
-import { omit, isArray, isString, isFunction, forEach, set, get } from 'lodash'
+import {
+  omit,
+  isArray,
+  isString,
+  isFunction,
+  forEach,
+  set,
+  get,
+  map,
+  mapValues
+} from 'lodash'
 import jwtDecode from 'jwt-decode'
 import { actionTypes, defaultJWTProps } from '../constants'
-import { promisesForPopulate, getPopulateObjs } from '../utils/populate'
+import {
+  promisesForPopulate,
+  getPopulateObjs,
+  getChildType
+} from '../utils/populate'
 import { getLoginMethodAndParams } from '../utils/auth'
 
 const {
@@ -105,7 +119,39 @@ export const watchUserProfile = (dispatch, firebase) => {
                 const populates = getPopulateObjs(profileParamsToPopulate)
                 const profile = snap.val()
                 forEach(populates, (p) => {
-                  set(profile, p.child, get(data, `${p.root}.${snap.val()[p.child]}`))
+                  const child = get(profile, p.child)
+                  const childType = getChildType(child)
+                  let populatedChild
+
+                  switch (childType) {
+
+                    case 'object':
+                      populatedChild = mapValues(
+                        child,
+                        (value, key) => {
+                          if (value) { // Only populate keys with truthy values
+                            return get(data, `${p.root}.${key}`)
+                          }
+                          return value
+                        })
+                      break
+
+                    case 'string':
+                      populatedChild = get(data, `${p.root}.${child}`)
+                      break
+
+                    case 'array':
+                      populatedChild = map(
+                        child,
+                        (key) => get(data, `${p.root}.${key}`)
+                      )
+                      break
+
+                    default:
+                      populatedChild = child
+                  }
+                  // Overwrite the child value with the populated child
+                  set(profile, p.child, populatedChild)
                 })
                 dispatch({
                   type: SET_PROFILE,

src/utils/populate.js

@@ -23,6 +23,24 @@ export const getPopulateObj = (str) => {
   // TODO: Handle childParam
   return { child: strArray[0], root: strArray[1] }
 }
+/**
+ * @private
+ * @description Determine the structure of the child parameter to populate onto
+ * @param {String|Object} child - Value at child parameter
+ */
+export const getChildType = (child) => {
+  if (isString(child)) {
+    return 'string'
+  }
+  if (isArray(child)) {
+    return 'array'
+  }
+  if (isObject(child)) {
+    return 'object'
+  }
+  return 'other'
+}
+
 /**
  * @private
  * @description Create standardized populate object from strings or objects