defaults placed in constants and referenced. version set in package file.

Author: prescottprue

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-redux-firebase",
-  "version": "1.2.0",
+  "version": "1.2.0-alpha",
   "description": "Redux integration for Firebase. Comes with a Higher Order Component for use with React.",
   "main": "dist/index.js",
   "module": "src/index.js",

src/actions/auth.js

@@ -1,7 +1,7 @@
 import { omit, isArray, isString, isFunction } from 'lodash'
 import jwtDecode from 'jwt-decode'
 
-import { actionTypes, defaultJWTKeys } from '../constants'
+import { actionTypes, defaultJWTProps } from '../constants'
 import { promisesForPopulate } from '../utils/populate'
 import { getLoginMethodAndParams } from '../utils/auth'
 
@@ -208,7 +208,7 @@ export const login = (dispatch, firebase, credentials) => {
       if (method === 'signInWithCustomToken') {
         // Extract the extra data in the JWT token for user object
         const { stsTokenManager: { accessToken }, uid } = userData.toJSON()
-        const extraJWTData = omit(jwtDecode(accessToken), defaultJWTKeys)
+        const extraJWTData = omit(jwtDecode(accessToken), defaultJWTProps)
 
         return createUserProfile(
           dispatch,
@@ -220,12 +220,11 @@ export const login = (dispatch, firebase, credentials) => {
 
       // Create profile when logging in with external provider
       const { user } = userData
-      console.log('userData:', userData, user)
 
       return createUserProfile(
         dispatch,
         firebase,
-        user, // TODO: Change this to userData so it has uid?
+        user,
         {
           email: user.email,
           displayName: user.providerData[0].displayName || user.email,

src/actions/storage.js

@@ -1,6 +1,7 @@
 import { map, isFunction } from 'lodash'
 import { actionTypes } from '../constants'
-import { wrapInDispatch, deleteFile as deleteFileFromFb } from '../utils/actions'
+import { wrapInDispatch } from '../utils/actions'
+import { deleteFile as deleteFileFromFb } from '../utils/storage'
 
 const {
   FILE_UPLOAD_START,
@@ -71,7 +72,7 @@ export const uploadFile = (dispatch, firebase, { path, file, dbPath }) =>
       }
       const { metadata: { name, fullPath, downloadURLs } } = res
       const { fileMetadataFactory } = firebase._.config
-      console.log('download urls:', res)
+
       // Apply fileMetadataFactory if it exists in config
       const fileData = isFunction(fileMetadataFactory)
         ? fileMetadataFactory(res)

src/compose.js

@@ -1,4 +1,5 @@
 import Firebase from 'firebase'
+import { defaultConfig } from './constants'
 import { authActions, queryActions, storageActions } from './actions'
 let firebaseInstance
 
@@ -44,16 +45,10 @@ let firebaseInstance
  */
 export default (config, otherConfig) => next =>
   (reducer, initialState, middleware) => {
-    const defaultConfig = {
-      userProfile: null,
-      enableLogging: false,
-      updateProfileOnLogin: true
-    }
-
     const store = next(reducer, initialState, middleware)
     const { dispatch } = store
 
-    const { apiKey, authDomain, databaseURL, storageBucket } = config
+    const { apiKey, authDomain, databaseURL } = config
 
     // Throw for missing Firebase Data
     if (!databaseURL) throw new Error('Firebase databaseURL is required')
@@ -65,7 +60,7 @@ export default (config, otherConfig) => next =>
 
     // Initialize Firebase
     try {
-      Firebase.initializeApp({apiKey, authDomain, databaseURL, storageBucket})
+      Firebase.initializeApp(config)
     } catch (err) {}
 
     // Enable Logging based on config

src/constants.js

@@ -5,7 +5,7 @@
  * import { constants } from 'react-redux-firebase'
  * constants.actionsPrefix === '@@reactReduxFirebase' // true
 */
-export const actionsPrefix = '@@reactReduxFirebase/'
+export const actionsPrefix = '@@reactReduxFirebase'
 
 /** @constant
  * @description Object containing all action types
@@ -18,25 +18,35 @@ export const actionsPrefix = '@@reactReduxFirebase/'
  * constants.actionTypes.SET === '@@reactReduxFirebase/SET' // true
 */
 export const actionTypes = {
-  START: `${actionsPrefix}START`,
-  SET: `${actionsPrefix}SET`,
-  SET_PROFILE: `${actionsPrefix}SET_PROFILE`,
-  LOGIN: `${actionsPrefix}LOGIN`,
-  LOGOUT: `${actionsPrefix}LOGOUT`,
-  LOGIN_ERROR: `${actionsPrefix}LOGIN_ERROR`,
-  NO_VALUE: `${actionsPrefix}NO_VALUE`,
-  UNAUTHORIZED_ERROR: `${actionsPrefix}UNAUTHORIZED_ERROR`,
-  ERROR: `${actionsPrefix}ERROR`,
-  INIT_BY_PATH: `${actionsPrefix}INIT_BY_PATH`,
-  AUTHENTICATION_INIT_STARTED: `${actionsPrefix}AUTHENTICATION_INIT_STARTED`,
-  AUTHENTICATION_INIT_FINISHED: `${actionsPrefix}AUTHENTICATION_INIT_FINISHED`,
-  FILE_UPLOAD_START: `${actionsPrefix}FILE_UPLOAD_START`,
-  FILE_UPLOAD_ERROR: `${actionsPrefix}FILE_UPLOAD_ERROR`,
-  FILE_UPLOAD_PROGRESS: `${actionsPrefix}FILE_UPLOAD_PROGRESS`,
-  FILE_UPLOAD_COMPLETE: `${actionsPrefix}FILE_UPLOAD_COMPLETE`,
-  FILE_DELETE_START: `${actionsPrefix}FILE_DELETE_START`,
-  FILE_DELETE_ERROR: `${actionsPrefix}FILE_DELETE_ERROR`,
-  FILE_DELETE_COMPLETE: `${actionsPrefix}FILE_DELETE_COMPLETE`
+  START: `${actionsPrefix}/START`,
+  SET: `${actionsPrefix}/SET`,
+  SET_PROFILE: `${actionsPrefix}/SET_PROFILE`,
+  LOGIN: `${actionsPrefix}/LOGIN`,
+  LOGOUT: `${actionsPrefix}/LOGOUT`,
+  LOGIN_ERROR: `${actionsPrefix}/LOGIN_ERROR`,
+  NO_VALUE: `${actionsPrefix}/NO_VALUE`,
+  UNAUTHORIZED_ERROR: `${actionsPrefix}/UNAUTHORIZED_ERROR`,
+  ERROR: `${actionsPrefix}/ERROR`,
+  INIT_BY_PATH: `${actionsPrefix}/INIT_BY_PATH`,
+  AUTHENTICATION_INIT_STARTED: `${actionsPrefix}/AUTHENTICATION_INIT_STARTED`,
+  AUTHENTICATION_INIT_FINISHED: `${actionsPrefix}/AUTHENTICATION_INIT_FINISHED`,
+  FILE_UPLOAD_START: `${actionsPrefix}/FILE_UPLOAD_START`,
+  FILE_UPLOAD_ERROR: `${actionsPrefix}/FILE_UPLOAD_ERROR`,
+  FILE_UPLOAD_PROGRESS: `${actionsPrefix}/FILE_UPLOAD_PROGRESS`,
+  FILE_UPLOAD_COMPLETE: `${actionsPrefix}/FILE_UPLOAD_COMPLETE`,
+  FILE_DELETE_START: `${actionsPrefix}/FILE_DELETE_START`,
+  FILE_DELETE_ERROR: `${actionsPrefix}/FILE_DELETE_ERROR`,
+  FILE_DELETE_COMPLETE: `${actionsPrefix}/FILE_DELETE_COMPLETE`
+}
+
+/** @constant
+ * @description Default configuration options
+ * @type {Array}
+*/
+export const defaultConfig = {
+  userProfile: null,
+  enableLogging: false,
+  updateProfileOnLogin: true
 }
 
 /** @constant
@@ -56,7 +66,7 @@ export const supportedAuthProviders = [
  * @type {Array}
  * @private
 */
-export const defaultJWTKeys = [
+export const defaultJWTProps = [
   'aud',
   'auth_time',
   'exp',
@@ -67,14 +77,31 @@ export const defaultJWTKeys = [
   'user_id'
 ]
 
+/** @constant
+ * @description Default initial props used when running firebase.initializeApp
+ * @type {Array}
+ * @private
+*/
+export const defaultInitProps = [
+  'apiKey',
+  'authDomain',
+  'databaseURL',
+  'storageBucket',
+  'messagingSenderId'
+]
+
 export default {
-  defaultJWTKeys,
+  defaultJWTProps,
   actionTypes,
-  supportedAuthProviders
+  defaultConfig,
+  supportedAuthProviders,
+  defaultInitProps
 }
 
 module.exports = {
-  defaultJWTKeys,
+  defaultJWTProps,
   actionTypes,
-  supportedAuthProviders
+  defaultConfig,
+  supportedAuthProviders,
+  defaultInitProps
 }