From 84c00cfff72443f18ed0d326038c2b53161ece7f Mon Sep 17 00:00:00 2001 From: prescottprue Date: Mon, 26 Nov 2018 17:42:26 -0800 Subject: [PATCH 1/2] v2.2.4 *fix(auth): switch back to using signInWithEmailAndPassword for email auth - #467 --- package-lock.json | 101 ++++++++++++++++++++++++++++------------------ package.json | 2 +- src/utils/auth.js | 11 +---- 3 files changed, 64 insertions(+), 50 deletions(-) diff --git a/package-lock.json b/package-lock.json index 73cd5ad29..b79572c8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "react-redux-firebase", - "version": "2.2.3", + "version": "2.2.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2189,7 +2189,7 @@ "dependencies": { "uglify-js": { "version": "1.3.5", - "resolved": "http://registry.npmjs.org/uglify-js/-/uglify-js-1.3.5.tgz", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-1.3.5.tgz", "integrity": "sha1-S1v/+Rhu/7qoiOTJ6UvZ/EyUkp0=", "dev": true } @@ -2611,14 +2611,28 @@ "dev": true }, "codecov": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.0.2.tgz", - "integrity": "sha512-9ljtIROIjPIUmMRqO+XuDITDoV8xRrZmA0jcEq6p2hg2+wY9wGmLfreAZGIL72IzUfdEDZaU8+Vjidg1fBQ8GQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.1.0.tgz", + "integrity": "sha512-aWQc/rtHbcWEQLka6WmBAOpV58J2TwyXqlpAQGhQaSiEUoigTTUk6lLd2vB3kXkhnDyzyH74RXfmV4dq2txmdA==", "dev": true, "requires": { - "argv": "0.0.2", - "request": "^2.81.0", - "urlgrey": "0.4.4" + "argv": "^0.0.2", + "ignore-walk": "^3.0.1", + "js-yaml": "^3.12.0", + "request": "^2.87.0", + "urlgrey": "^0.4.4" + }, + "dependencies": { + "js-yaml": { + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", + "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + } } }, "collapse-white-space": { @@ -4875,7 +4889,7 @@ }, "faye-websocket": { "version": "0.9.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz", "integrity": "sha512-1nXODEWzxGS1MpN3PU1cKWwK49z+6Lyg3XNzv0GMXkyceLLEpdGMdWjZIimBhuBJ6iSXrX/30YHQ+B0YyMiHKQ==", "dev": true, "requires": { @@ -4884,7 +4898,7 @@ "dependencies": { "websocket-driver": { "version": "0.6.4", - "resolved": false, + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.4.tgz", "integrity": "sha512-atbcQUKqc92CrGseGMiQBYjAKC0CXNsnALo7cvHoalMcfKMzxcjs9VxHq1T22nDCICuC5GB/ZTJAtiNyq0V19g==", "dev": true, "requires": { @@ -4893,7 +4907,7 @@ "dependencies": { "websocket-extensions": { "version": "0.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz", "integrity": "sha512-j3+ycRZsSqNQZdpj5r+UZJHNlYKR3EGpL9cbVHf60+K9BuLJdNebVXrVzmDlLzN+im56Ll9BssyG8BwRmDlEQw==", "dev": true } @@ -4903,7 +4917,7 @@ }, "jsonwebtoken": { "version": "5.7.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-5.7.0.tgz", "integrity": "sha512-VP2HXX7tJ73v5ZGGTFdgILhOBwGSDlPP4qArdrq6YbDVJ9YJflcNE/fbuGHPlefPkbM1+7rFzz1eTq1xICsJxA==", "dev": true, "requires": { @@ -4914,7 +4928,7 @@ "dependencies": { "jws": { "version": "3.1.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.3.tgz", "integrity": "sha512-KiwFJo7lfoVFV6AbEjZLvfY6dUnFVHliKdoEKtd0P+AN5wBGv8a25qYf0qgXrTzB6vArpnXi67reRpXo2EBUKw==", "dev": true, "requires": { @@ -4924,7 +4938,7 @@ "dependencies": { "base64url": { "version": "1.0.6", - "resolved": false, + "resolved": "https://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz", "integrity": "sha512-YJUNcKuU8Df1LhS3s9OzoYCAOZYHgAUGnDlPgXFCaJZwRzZLcnQ7uM9KRY6EFaJRvzxZqw2w+wCDigwpe+4XUw==", "dev": true, "requires": { @@ -4934,7 +4948,7 @@ "dependencies": { "concat-stream": { "version": "1.4.10", - "resolved": false, + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz", "integrity": "sha512-hB2ZF9QT0ix27ojlJ97Fv7C/46tBKgRTGepOossaCmnXZU4dxnWcn55i5Xk0WTXwcZ1IUKqsWWottibqlYggUA==", "dev": true, "requires": { @@ -4945,13 +4959,13 @@ "dependencies": { "inherits": { "version": "2.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==", "dev": true }, "readable-stream": { "version": "1.1.14", - "resolved": false, + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", "dev": true, "requires": { @@ -4963,19 +4977,19 @@ "dependencies": { "core-util-is": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", "dev": true }, "isarray": { "version": "0.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", "dev": true }, "string_decoder": { "version": "0.10.31", - "resolved": false, + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==", "dev": true } @@ -4983,7 +4997,7 @@ }, "typedarray": { "version": "0.0.6", - "resolved": false, + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", "dev": true } @@ -4991,7 +5005,7 @@ }, "meow": { "version": "2.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/meow/-/meow-2.0.0.tgz", "integrity": "sha512-X7rkdgy5Wxxp2MhCiAOkC3lqfkrJkt3iXvW4BY0rYQIn3GMvYvBTsAPEmHHTjTeVzBelrRcQa2F80rYfigz2+A==", "dev": true, "requires": { @@ -5003,7 +5017,7 @@ "dependencies": { "camelcase-keys": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz", "integrity": "sha512-hwNYKTjJTlDabjJp2xn0h8bRmOpObvXVgYbQmR+Xob/EeBDtYea3xttjr5hqiWqLWtI3/6xO7x1ZAktQ9up+ag==", "dev": true, "requires": { @@ -5013,13 +5027,13 @@ "dependencies": { "camelcase": { "version": "1.2.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==", "dev": true }, "map-obj": { "version": "1.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", "dev": true } @@ -5027,7 +5041,7 @@ }, "indent-string": { "version": "1.2.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz", "integrity": "sha512-Z1vqf6lDC3f4N2mWqRywY6odjRatPNGDZgUr4DY9MLC14+Fp2/y+CI/RnNGlb8hD6ckscE/8DlZUwHUaiDBshg==", "dev": true, "requires": { @@ -5038,13 +5052,13 @@ "dependencies": { "get-stdin": { "version": "4.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==", "dev": true }, "repeating": { "version": "1.1.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz", "integrity": "sha512-Nh30JLeMHdoI+AsQ5eblhZ7YlTsM9wiJQe/AHIunlK3KWzvXhXb36IJ7K1IOeRjIOtzMjdUHjwXUFxKJoPTSOg==", "dev": true, "requires": { @@ -5053,7 +5067,7 @@ "dependencies": { "is-finite": { "version": "1.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz", "integrity": "sha512-F/Vjbc68OaPWG9b+wfcG0egINwKP4CVT/Nah121WZ5e1v0OzJeqecnqXeyERJisyQ+42pgakX27WI9leMwsVlA==", "dev": true, "requires": { @@ -5062,7 +5076,7 @@ "dependencies": { "number-is-nan": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz", "integrity": "sha512-XMFr+QWyCsZjZRn9LXA0SkPqanwQmD59vzQp8ufguk8bVdHq4RteGh3kpQe/wrqVicacPgnGR5cPWvkGXmfSrw==", "dev": true } @@ -5074,13 +5088,13 @@ }, "minimist": { "version": "1.2.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==", "dev": true }, "object-assign": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz", "integrity": "sha512-LpUkixU1BUMQ6bwUHbOue4IGGbdRbxi+IEZw7zHniw78erlxrKGHbhfLbHIsI35LGbGqys6QOrjVmLnD2ie+1A==", "dev": true } @@ -5090,7 +5104,7 @@ }, "jwa": { "version": "1.1.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz", "integrity": "sha512-VUr8nmKQLWi3Gf0O6EU7M1/tBlxVMvScdKKMLGvCBYexNbFPVoCMnedScvB8hONjHPs2lTEonny6sLEpVOCduw==", "dev": true, "requires": { @@ -5101,13 +5115,13 @@ "dependencies": { "buffer-equal-constant-time": { "version": "1.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==", "dev": true }, "ecdsa-sig-formatter": { "version": "1.0.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.5.tgz", "integrity": "sha512-+iTWaj9CQHnvYQ7keATosCbg6I60hVQoT3SGAva2dHwGuWe9enc3Irl60Bb6Mm9+eEZ9xukm1UMrEY1dSHC03A==", "dev": true, "requires": { @@ -5116,7 +5130,7 @@ "dependencies": { "base64-url": { "version": "1.2.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz", "integrity": "sha512-m1UfGF9P4pHtsRXXJ+yqtXQAYKU8gzvzRh9l0UDqFbGXfUP9DB4lcJUbE4Z6yeHDyVYi52FW31suA1OdycMNOw==", "dev": true } @@ -5128,13 +5142,13 @@ }, "ms": { "version": "0.7.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", "integrity": "sha512-lRLiIR9fSNpnP6TC4v8+4OU7oStC01esuNowdQ34L+Gk8e5Puoc88IqJ+XAY/B3Mn2ZKis8l8HX90oU8ivzUHg==", "dev": true }, "xtend": { "version": "4.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", "integrity": "sha512-iTwvhNBRetXWe81+VcIw5YeadVSWyze7uA7nVnpP13ulrpnJ3UfQm5ApGnrkmxDJFdrblRdZs0EvaTCIfei5oQ==", "dev": true } @@ -5142,7 +5156,7 @@ }, "rsvp": { "version": "3.2.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.2.1.tgz", "integrity": "sha512-Rf4YVNYpKjZ6ASAmibcwTNciQ5Co5Ztq6iZPEykHpkoflnD/K5ryE/rHehFsTm4NJj8nKDhbi3eKBWGogmNnkg==", "dev": true }, @@ -7480,6 +7494,15 @@ "integrity": "sha1-YSKJv7PCIOGGpYEYYY1b6MG6sCE=", "dev": true }, + "ignore-walk": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", + "dev": true, + "requires": { + "minimatch": "^3.0.4" + } + }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", diff --git a/package.json b/package.json index 05fa57ea8..50e0e6362 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-redux-firebase", - "version": "2.2.3", + "version": "2.2.4", "description": "Redux integration for Firebase. Comes with a Higher Order Components for use with React.", "main": "lib/index.js", "module": "es/index.js", diff --git a/src/utils/auth.js b/src/utils/auth.js index 8af6b4a89..42eb05aa7 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -143,16 +143,7 @@ export const getLoginMethodAndParams = (firebase, creds) => { } // Email/Password Auth - // Check for new sign in method (see #484 for more info) - const emailPasswordAuth = firebase.auth() - .signInAndRetrieveDataWithEmailAndPassword - if (emailPasswordAuth) { - return { - method: 'signInAndRetrieveDataWithEmailAndPassword', - params: [email, password] - } - } - + // Note: usage of signInAndRetrieveDataWithEmailAndPassword removed since it is deprecated (see #484 for more info) return { method: 'signInWithEmailAndPassword', params: [email, password] } } From 7fc420d70787acf018cb1b7ad39d13c91bd0ed12 Mon Sep 17 00:00:00 2001 From: prescottprue Date: Mon, 26 Nov 2018 17:51:18 -0800 Subject: [PATCH 2/2] Keep signInAndRetrieveDataWithEmailAndPassword as fallback if signInWithEmailAndPassword does not exist --- src/utils/auth.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/utils/auth.js b/src/utils/auth.js index 42eb05aa7..a622b43b6 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -142,8 +142,16 @@ export const getLoginMethodAndParams = (firebase, creds) => { } } + // Check for new sign in method (see #484 for more info) + // Note: usage of signInAndRetrieveDataWithEmailAndPassword is now a fallback since it is deprecated (see #484 for more info) + if (!firebase.auth().signInWithEmailAndPassword) { + return { + method: 'signInAndRetrieveDataWithEmailAndPassword', + params: [email, password] + } + } + // Email/Password Auth - // Note: usage of signInAndRetrieveDataWithEmailAndPassword removed since it is deprecated (see #484 for more info) return { method: 'signInWithEmailAndPassword', params: [email, password] } }