v2.1.5

* fix(storage): `uploadFile` no longer errors out due to downloadURLs not being defined (v5 Firebase SDK) - prescottprue#480
* fix(examples): add `recompose` to firestore example's dependencies
* feat(auth): use new `signInAndRetrieveDataWithCustomToken` firebase login method - prescottprue#467 - @kadikraman

Author: prescottprue

examples/complete/firestore/package-lock.json

@@ -13,6 +13,7 @@
     "react-google-button": "*",
     "react-redux": "^4.4.5",
     "react-redux-firebase": "latest",
+    "recompose": "^0.27.1",
     "redux": "^3.6.0",
     "redux-firestore": "latest"
   },

examples/complete/firestore/package.json

@@ -1,10 +1,10 @@
 export const firebase = {
-  apiKey: "AIzaSyBTvAcJwsN8iygsnwAZyzIuy1uleYEpWIo",
-  authDomain: "redux-firestore.firebaseapp.com",
-  databaseURL: "https://redux-firestore.firebaseio.com",
-  projectId: "redux-firestore",
-  storageBucket: "redux-firestore.appspot.com",
-  messagingSenderId: "502471151289"
+  apiKey: "AIzaSyCTUERDM-Pchn_UDTsfhVPiwM4TtNIxots",
+  authDomain: "redux-firebasev3.firebaseapp.com",
+  databaseURL: "https://redux-firebasev3.firebaseio.com",
+  projectId: "redux-firebasev3",
+  storageBucket: "redux-firebasev3.appspot.com",
+  messagingSenderId: "823357791673"
 }
 
 export const rrfConfig = {

examples/complete/firestore/src/config.js

@@ -1,6 +1,6 @@
 {
   "name": "react-redux-firebase",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Redux integration for Firebase. Comes with a Higher Order Components for use with React.",
   "main": "lib/index.js",
   "module": "es/index.js",

package-lock.json

@@ -247,12 +247,9 @@ export const createUserProfile = (dispatch, firebase, userData, profile) => {
         if (!config.updateProfileOnLogin && profileSnap.exists) {
           return profileSnap.data()
         }
-
-        let newProfile = {}
+        let newProfile = profile
         // If the user did supply a profileFactory, we should use the result of it for the new Profile
-        if (isFunction(config.profileFactory)) {
-          newProfile = profile
-        } else {
+        if (!newProfile) {
           // Convert to JSON format (to prevent issue of writing invalid type to Firestore)
           const userDataObject = userData.uid
             ? userData.toJSON ? userData.toJSON() : userData
@@ -451,13 +448,23 @@ export const login = (dispatch, firebase, credentials) => {
       if (!userData) return Promise.resolve(null)
 
       // For email auth return uid (createUser is used for creating a profile)
-      if (method === 'signInWithEmailAndPassword') {
+      if (
+        [
+          'signInWithEmailAndPassword',
+          'signInAndRetrieveDataWithEmailAndPassword'
+        ].includes(method)
+      ) {
         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 (
+        [
+          'signInWithCustomToken',
+          'signInAndRetrieveDataWithCustomToken'
+        ].includes(method)
+      ) {
         if (!firebase._.config.updateProfileOnLogin) {
           return { user: userData }
         }
@@ -487,12 +494,17 @@ export const login = (dispatch, firebase, credentials) => {
       // 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 createUserProfile(
+        dispatch,
+        firebase,
+        user,
+        credentials.profile || {
+          email: user.email,
+          displayName: user.providerData[0].displayName || user.email,
+          avatarUrl: user.providerData[0].photoURL,
+          providerData: user.providerData
+        }
+      ).then(profile => ({ profile, ...userData }))
     })
     .catch(err => {
       dispatchLoginError(dispatch, err)

package.json

@@ -97,6 +97,12 @@ export const getLoginMethodAndParams = (firebase, creds) => {
     return { method: 'signInWithRedirect', params: [authProvider] }
   }
   if (token) {
+    const tokenAuth = firebase.auth().signInAndRetrieveDataWithCustomToken
+
+    if (tokenAuth) {
+      return { method: 'signInAndRetrieveDataWithCustomToken', params: [token] }
+    }
+
     return { method: 'signInWithCustomToken', params: [token] }
   }
   if (phoneNumber) {
@@ -110,6 +116,17 @@ export const getLoginMethodAndParams = (firebase, creds) => {
       params: [phoneNumber, applicationVerifier]
     }
   }
+
+  const emailPasswordAuth = firebase.auth()
+    .signInAndRetrieveDataWithEmailAndPassword
+
+  if (emailPasswordAuth) {
+    return {
+      method: 'signInAndRetrieveDataWithEmailAndPassword',
+      params: [email, password]
+    }
+  }
+
   return { method: 'signInWithEmailAndPassword', params: [email, password] }
 }
 

src/actions/auth.js

@@ -46,7 +46,11 @@ export function deleteFile(firebase, { path, dbPath }) {
  * @param  {Object} uploadTaskSnapshot - Snapshot from storage upload task
  * @return {Function} Function for handling upload result
  */
-function createUploadMetaResponseHandler({ fileData, uploadTaskSnapshot }) {
+function createUploadMetaResponseHandler({
+  fileData,
+  firebase,
+  uploadTaskSnapshot
+}) {
   /**
    * Converts upload meta data snapshot into an object (handling both
    * RTDB and Firestore)
@@ -55,18 +59,37 @@ function createUploadMetaResponseHandler({ fileData, uploadTaskSnapshot }) {
    * @return {Object} Upload result including snapshot, key, File
    */
   return function uploadResultFromSnap(metaDataSnapshot) {
+    const { useFirestoreForStorageMeta } = firebase._.config
     const result = {
       snapshot: metaDataSnapshot,
       key: metaDataSnapshot.key || metaDataSnapshot.id,
       File: fileData,
       metaDataSnapshot,
       uploadTaskSnapshot,
       // Support legacy method
-      uploadTaskSnaphot: uploadTaskSnapshot
+      uploadTaskSnaphot: uploadTaskSnapshot,
+      createdAt: useFirestoreForStorageMeta
+        ? firebase.firestore.FieldValue.serverTimestamp()
+        : firebase.database.ServerValue.TIMESTAMP
     }
     if (metaDataSnapshot.id) {
       result.id = metaDataSnapshot.id
     }
+    // Handle different downloadURL patterns (Firebase JS SDK v5.*.* vs v4.*.*)
+    if (metaDataSnapshot.downloadURLs && metaDataSnapshot.downloadURLs[0]) {
+      // Only attach downloadURL if downloadURLs is defined (not defined in v5.*.*)
+      result.downloadURL = metaDataSnapshot.downloadURLs[0]
+    } else if (
+      uploadTaskSnapshot.ref &&
+      typeof uploadTaskSnapshot.ref.getDownloadURL === 'function'
+    ) {
+      // Get downloadURL and attach to response
+      return uploadTaskSnapshot.ref.getDownloadURL().then(downloadURL => ({
+        ...result,
+        downloadURL
+      }))
+    }
+
     return result
   }
 }
@@ -87,34 +110,24 @@ export function writeMetadataToDb({
   dbPath,
   options
 }) {
-  const {
-    metadata: { name, fullPath, downloadURLs, size, contentType }
-  } = uploadTaskSnapshot
   // Support metadata factories from both global config and options
   const { fileMetadataFactory, useFirestoreForStorageMeta } = firebase._.config
   const { metadataFactory } = options
   const metaFactoryFunction = metadataFactory || fileMetadataFactory
 
-  // File metadata object
-  const originalFileMeta = {
-    name,
-    fullPath,
-    size,
-    contentType,
-    downloadURL: downloadURLs[0],
-    createdAt: useFirestoreForStorageMeta
-      ? firebase.firestore.FieldValue.serverTimestamp()
-      : firebase.database.ServerValue.TIMESTAMP
-  }
-
   // Apply fileMetadataFactory if it exists in config
   const fileData = isFunction(metaFactoryFunction)
-    ? metaFactoryFunction(uploadTaskSnapshot, firebase, originalFileMeta)
-    : originalFileMeta
+    ? metaFactoryFunction(
+        uploadTaskSnapshot,
+        firebase,
+        uploadTaskSnapshot.metadata
+      )
+    : uploadTaskSnapshot.metadata
 
   // Create the snapshot handler function
   const resultFromSnap = createUploadMetaResponseHandler({
     fileData,
+    firebase,
     uploadTaskSnapshot
   })
 

src/utils/auth.js

@@ -129,7 +129,7 @@ export const fakeFirebase = {
               email: 'test@test.com',
               providerData: [{}]
             }),
-    signInWithCustomToken: () => {
+    signInAndRetrieveDataWithCustomToken: () => {
       return Promise.resolve({
         toJSON: () => ({
           stsTokenManager: {