@stokr/components-library 2.0.0-beta.27 → 2.0.0-beta.28

package/dist/components/2FA/ResetCode.js

@@ -43,7 +43,10 @@ var ResetCode = function ResetCode(props) {
   }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_Text.default, null, /*#__PURE__*/_react.default.createElement("p", null, "Contact us to reset your 2FA", ' ', /*#__PURE__*/_react.default.createElement("a", {
     href: "https://stokr.zendesk.com/hc/en-us/requests/new",
     target: "_blank",
-    rel: "noreferrer"
+    rel: "noreferrer",
+    style: {
+      textDecoration: 'underline'
+    }
   }, ' ', "https://stokr.zendesk.com/hc/en-us/requests/new")))))));
 };
 exports.ResetCode = ResetCode;

package/dist/components/2FA/enable-2fa-flow.js

@@ -61,7 +61,7 @@ var Enable2FAFlow = function Enable2FAFlow(_ref) {
         return;
       }).catch(function (error) {
         console.log(error);
-        if (error.code === 'auth/requires-recent-login') {
+        if (error.code === 'auth/requires-recent-login' || error.code === 'auth/unsupported-first-factor') {
           onRequiresRecentLoginError && onRequiresRecentLoginError();
         }
       });

package/dist/components/VerifyEmailModal/VerifyEmailModal.js

@@ -54,7 +54,7 @@ var renderSuccessModal = function renderSuccessModal(continueUrl) {
   }, /*#__PURE__*/_react.default.createElement(_Modal.ModalInner, null, /*#__PURE__*/_react.default.createElement(_RegisterConfirmModal.ContainerWithLine, null, /*#__PURE__*/_react.default.createElement(_Text.default, {
     withBorder: true,
     isConfirm: true
-  }, /*#__PURE__*/_react.default.createElement("h3", null, "GREAT! You're verified"), /*#__PURE__*/_react.default.createElement("p", null, "You can now complete your sign up proccess by clicking the button below.")), continueUrl && /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
+  }, /*#__PURE__*/_react.default.createElement("h3", null, "Success! "), /*#__PURE__*/_react.default.createElement("p", null, "You have successfully activated your account")), continueUrl && /*#__PURE__*/_react.default.createElement(_ComponentWrapper.default, {
     noPaddingHorizontal: true
   }, /*#__PURE__*/_react.default.createElement(_Button.default, {
     onClick: function onClick() {

package/dist/components/headerHo/HeaderHo.js

@@ -747,7 +747,7 @@ var HeaderHoClass = /*#__PURE__*/function (_Component) {
         popupError: this.state.popupError,
         popupSuccess: this.state.popupSuccess,
         isModalOpen: isModalOpen.verifyEmail,
-        continueUrl: 'https://signup.stokr.info/',
+        continueUrl: "https://signup.".concat(process.env.REACT_APP_WEBSITE_DOMAIN, "/welcome"),
         error: verifyEmailError,
         isSuccess: !!!verifyEmailError,
         onModalSwitch: function onModalSwitch() {

package/dist/context/AuthContext.js

@@ -68,67 +68,68 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
       return !!accessToken;
     });
     _defineProperty(_assertThisInitialized(_this), "loginUser", /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(email, password) {
-        var user, idToken;
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(email, password, customToken) {
+        var user;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.prev = 0;
-              _context.next = 3;
-              return _Auth.default.login(email, password);
-            case 3:
+              if (!customToken) {
+                _context.next = 7;
+                break;
+              }
+              _context.next = 4;
+              return _Auth.default.signInWithToken(customToken);
+            case 4:
               user = _context.sent;
-              console.log('🚀 ~ file: AuthContext.js:50 ~ user:', user);
-              _context.next = 7;
-              return user.getIdToken();
+              _context.next = 10;
+              break;
             case 7:
-              idToken = _context.sent;
+              _context.next = 9;
+              return _Auth.default.login(email, password);
+            case 9:
+              user = _context.sent;
+            case 10:
               _Auth.default.setAccessToken(user.accessToken);
-
-              // const sessionLogin = await fetchData('auth/session-login', {
-              //   idToken,
-              // })
-              //  console.log('🚀 ~ sessionLogin:', sessionLogin)
-
               _this.setState({
                 firebaseUser: user,
                 isFetchingUser: false
               });
               //if you need user immediatly
               return _context.abrupt("return", user);
-            case 13:
-              _context.prev = 13;
+            case 15:
+              _context.prev = 15;
               _context.t0 = _context["catch"](0);
               console.log('🚀 ~ file: AuthContext.js:56 ~ error:', _context.t0);
               _context.t1 = _context.t0.code;
-              _context.next = _context.t1 === 'auth/multi-factor-auth-required' ? 19 : _context.t1 === 'auth/requires-recent-login' ? 21 : _context.t1 === 'auth/invalid-login-credentials' ? 23 : 25;
+              _context.next = _context.t1 === 'auth/multi-factor-auth-required' ? 21 : _context.t1 === 'auth/requires-recent-login' ? 23 : _context.t1 === 'auth/invalid-login-credentials' ? 25 : 27;
               break;
-            case 19:
+            case 21:
               // Initiate your second factor sign-in flow. (See next step.)
               _this.setState({
                 waitingFor2fa: true,
                 firebaseError: _context.t0
               });
               throw _context.t0;
-            case 21:
+            case 23:
               // The user's last sign-in time does not meet the security threshold.
               _this.logoutUser();
-              return _context.abrupt("break", 28);
-            case 23:
+              return _context.abrupt("break", 30);
+            case 25:
               _context.t0.message = 'The credentials are not correct. Try again?';
               throw _context.t0;
-            case 25:
+            case 27:
               console.log({
                 error: _context.t0
               }); // Handle other errors, such as wrong passwords.
               throw _context.t0;
-            case 28:
+            case 30:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[0, 13]]);
+        }, _callee, null, [[0, 15]]);
       }));
-      return function (_x, _x2) {
+      return function (_x, _x2, _x3) {
         return _ref.apply(this, arguments);
       };
     }());
@@ -163,7 +164,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
           }
         }, _callee2, null, [[0, 7]]);
       }));
-      return function (_x3, _x4) {
+      return function (_x4, _x5) {
         return _ref2.apply(this, arguments);
       };
     }());
@@ -214,7 +215,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
           }
         }, _callee3, null, [[7, 16]]);
       }));
-      return function (_x5, _x6) {
+      return function (_x6, _x7) {
         return _ref3.apply(this, arguments);
       };
     }());
@@ -256,7 +257,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
           }
         }, _callee4, null, [[1, 13]]);
       }));
-      return function (_x7) {
+      return function (_x8) {
         return _ref4.apply(this, arguments);
       };
     }());
@@ -334,7 +335,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
           }
         }, _callee6, null, [[0, 6]]);
       }));
-      return function (_x8, _x9, _x10, _x11) {
+      return function (_x9, _x10, _x11, _x12) {
         return _ref6.apply(this, arguments);
       };
     }());
@@ -348,7 +349,6 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
             (0, _auth.signOut)(_firebaseConfig.auth).then(function () {
               console.log('logged out');
             });
-            //  await fetchData('auth/session-logout')
             _Auth.default.logout();
             delete _axios.default.defaults.headers.common.Authorization;
             _this.setUser(null);
@@ -526,7 +526,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
             }
           }, _callee9, null, [[0, 14]]);
         }));
-        return function (_x12, _x13) {
+        return function (_x13, _x14) {
           return _ref9.apply(this, arguments);
         };
       }());
@@ -588,7 +588,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
           }
         }, _callee11, null, [[0, 9]]);
       }));
-      return function (_x14) {
+      return function (_x15) {
         return _ref11.apply(this, arguments);
       };
     }());
@@ -646,7 +646,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
           }
         }, _callee12, null, [[4, 19]]);
       }));
-      return function (_x15) {
+      return function (_x16) {
         return _ref12.apply(this, arguments);
       };
     }());
@@ -703,12 +703,12 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
           }
         }, _callee13, null, [[4, 18]]);
       }));
-      return function (_x16) {
+      return function (_x17) {
         return _ref13.apply(this, arguments);
       };
     }());
     _defineProperty(_assertThisInitialized(_this), "handleVerifyEmail", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-      var location, query, oobCode, email;
+      var location, query, oobCode, customToken, email;
       return _regeneratorRuntime().wrap(function _callee14$(_context14) {
         while (1) switch (_context14.prev = _context14.next) {
           case 0:
@@ -727,33 +727,39 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
             });
 
             //proceed to signup flow immediately after success
-            window.location.href = "https://signup.".concat(process.env.REACT_APP_WEBSITE_DOMAIN, "/welcome");
-            // this.getUser()
-            _context14.next = 27;
+            //window.location.href = `https://signup.${process.env.REACT_APP_WEBSITE_DOMAIN}/welcome`
+            customToken = query.get('customToken');
+            if (customToken) {
+              _this.loginUser(null, null, customToken);
+              _this.getUser();
+            } else {
+              _this.getUser();
+            }
+            _context14.next = 28;
             break;
-          case 11:
-            _context14.prev = 11;
+          case 12:
+            _context14.prev = 12;
             _context14.t0 = _context14["catch"](3);
             _context14.t1 = _context14.t0 === null || _context14.t0 === void 0 ? void 0 : _context14.t0.code;
-            _context14.next = _context14.t1 === 'auth/expired-action-code' ? 16 : _context14.t1 === 'auth/invalid-action-code' ? 20 : _context14.t1 === 'auth/user-disabled' ? 22 : 24;
+            _context14.next = _context14.t1 === 'auth/expired-action-code' ? 17 : _context14.t1 === 'auth/invalid-action-code' ? 21 : _context14.t1 === 'auth/user-disabled' ? 23 : 25;
             break;
-          case 16:
+          case 17:
             _context14.t0.message = 'The activation link has expired. We are sending you a new one right now.';
             email = query.get('email');
             if (email) {
               _context14.t0.email = email;
               //Auth.resendActivationEmail(email)
             }
-            return _context14.abrupt("break", 25);
-          case 20:
+            return _context14.abrupt("break", 26);
+          case 21:
             _context14.t0.message = 'This link is invalid. Please try verifying email again.';
-            return _context14.abrupt("break", 25);
-          case 22:
+            return _context14.abrupt("break", 26);
+          case 23:
             _context14.t0.message = 'Your account has been disabled. Please contact our support.';
-            return _context14.abrupt("break", 25);
-          case 24:
-            return _context14.abrupt("break", 25);
+            return _context14.abrupt("break", 26);
           case 25:
+            return _context14.abrupt("break", 26);
+          case 26:
             console.log('🚀 ~ file: AuthContext.js:446 ~ error:', _context14.t0);
             _this.setState({
               verifyEmailError: _context14.t0,
@@ -761,11 +767,11 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
               isFetchingUser: false
             });
             //throw error
-          case 27:
+          case 28:
           case "end":
             return _context14.stop();
         }
-      }, _callee14, null, [[3, 11]]);
+      }, _callee14, null, [[3, 12]]);
     })));
     _defineProperty(_assertThisInitialized(_this), "handleResetPassword", /*#__PURE__*/function () {
       var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(password) {
@@ -807,7 +813,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
           }
         }, _callee15, null, [[1, 8]]);
       }));
-      return function (_x17) {
+      return function (_x18) {
         return _ref15.apply(this, arguments);
       };
     }());
@@ -857,7 +863,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
           }
         }, _callee17, null, [[0, 7]]);
       }));
-      return function (_x18, _x19) {
+      return function (_x19, _x20) {
         return _ref17.apply(this, arguments);
       };
     }());
@@ -882,7 +888,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
           }
         }, _callee18, null, [[0, 6]]);
       }));
-      return function (_x20) {
+      return function (_x21) {
         return _ref18.apply(this, arguments);
       };
     }());
@@ -909,7 +915,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
           }
         }, _callee19, null, [[0, 7]]);
       }));
-      return function (_x21) {
+      return function (_x22) {
         return _ref19.apply(this, arguments);
       };
     }());
@@ -952,7 +958,7 @@ var AuthProviderClass = /*#__PURE__*/function (_Component) {
           }
         }, _callee20, null, [[0, 9]]);
       }));
-      return function (_x22, _x23, _x24) {
+      return function (_x23, _x24, _x25) {
         return _ref20.apply(this, arguments);
       };
     }());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stokr/components-library",
-  "version": "2.0.0-beta.27",
+  "version": "2.0.0-beta.28",
   "description": "STOKR - Components Library",
   "main": "dist/index.js",
   "module": "dist/index.js",