@stokr/components-library 1.1.8-beta.7 → 1.1.8-beta.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/context/Auth.js +9 -1
- package/dist/context/AuthContext.js +18 -8
- package/package.json +1 -1
package/dist/context/Auth.js
CHANGED
|
@@ -102,7 +102,15 @@ var Auth = /*#__PURE__*/function () {
|
|
|
102
102
|
}, {
|
|
103
103
|
key: "getFirebaseUser",
|
|
104
104
|
value: function getFirebaseUser() {
|
|
105
|
-
return
|
|
105
|
+
return new Promise(function (resolve, reject) {
|
|
106
|
+
(0, _auth.onAuthStateChanged)(_firebaseConfig.auth, function (user) {
|
|
107
|
+
if (user) {
|
|
108
|
+
resolve(user);
|
|
109
|
+
} else {
|
|
110
|
+
reject('User is signed out');
|
|
111
|
+
}
|
|
112
|
+
});
|
|
113
|
+
});
|
|
106
114
|
}
|
|
107
115
|
}, {
|
|
108
116
|
key: "requestUpdateEmail",
|
|
@@ -375,13 +375,23 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
|
|
|
375
375
|
return _Auth.default.getUser();
|
|
376
376
|
case 9:
|
|
377
377
|
result = _context7.sent;
|
|
378
|
-
firebaseUser = _this.state.firebaseUser
|
|
379
|
-
if (
|
|
380
|
-
|
|
378
|
+
firebaseUser = _this.state.firebaseUser;
|
|
379
|
+
if (firebaseUser) {
|
|
380
|
+
_context7.next = 15;
|
|
381
|
+
break;
|
|
381
382
|
}
|
|
383
|
+
_context7.next = 14;
|
|
384
|
+
return _Auth.default.getFirebaseUser();
|
|
385
|
+
case 14:
|
|
386
|
+
firebaseUser = _context7.sent;
|
|
387
|
+
case 15:
|
|
388
|
+
console.log('🚀 ~ file: AuthContext.js:252 ~ firebaseUser:', firebaseUser);
|
|
382
389
|
|
|
383
390
|
//merge firebaseUser and our user object
|
|
384
|
-
user = _this.patchUserObject(result.user, firebaseUser);
|
|
391
|
+
user = _this.patchUserObject(result.user, firebaseUser);
|
|
392
|
+
console.log('🚀 ~ file: AuthContext.js:259 ~ user:', user);
|
|
393
|
+
|
|
394
|
+
//if user is empty throw an error
|
|
385
395
|
//if user hasn't completed the signup process, redirect to welcome page on signup
|
|
386
396
|
_this.checkUserIsValid(user);
|
|
387
397
|
customValidateGetUser && customValidateGetUser(user);
|
|
@@ -397,19 +407,19 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
|
|
|
397
407
|
|
|
398
408
|
//if you need user info immediately after call (before setState is executed), you can use this
|
|
399
409
|
return _context7.abrupt("return", user);
|
|
400
|
-
case
|
|
401
|
-
_context7.prev =
|
|
410
|
+
case 28:
|
|
411
|
+
_context7.prev = 28;
|
|
402
412
|
_context7.t0 = _context7["catch"](6);
|
|
403
413
|
_this.setState({
|
|
404
414
|
isFetchingUser: false
|
|
405
415
|
});
|
|
406
416
|
console.log("Error in getUser: ".concat(_context7.t0));
|
|
407
417
|
throw _context7.t0;
|
|
408
|
-
case
|
|
418
|
+
case 33:
|
|
409
419
|
case "end":
|
|
410
420
|
return _context7.stop();
|
|
411
421
|
}
|
|
412
|
-
}, _callee7, null, [[6,
|
|
422
|
+
}, _callee7, null, [[6, 28]]);
|
|
413
423
|
})));
|
|
414
424
|
_defineProperty(_assertThisInitialized(_this), "checkUserPhoto", function (avatar) {
|
|
415
425
|
try {
|