powr-sdk-web 4.2.5 → 4.2.6

package/dist/auth/index.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _auth = require("../utils/auth");
 var _firebase = require("../utils/firebase");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t6 in e) "default" !== _t6 && {}.hasOwnProperty.call(e, _t6) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t6)) && (i.get || i.set) ? o(f, _t6, i) : f[_t6] = e[_t6]); return f; })(e, t); }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t5 in e) "default" !== _t5 && {}.hasOwnProperty.call(e, _t5) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t5)) && (i.get || i.set) ? o(f, _t5, i) : f[_t5] = e[_t5]); return f; })(e, t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
@@ -115,6 +115,10 @@ var PowrLogin = function PowrLogin(_ref) {
     _useState28 = _slicedToArray(_useState27, 2),
     firebaseConfirm = _useState28[0],
     setFirebaseConfirm = _useState28[1];
+  var _useState29 = (0, _react.useState)(false),
+    _useState30 = _slicedToArray(_useState29, 2),
+    otpVerified = _useState30[0],
+    setOtpVerified = _useState30[1];
   var shouldShowToggle = mode === 'toggle';
   var handleInputChange = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(e) {
@@ -183,7 +187,7 @@ var PowrLogin = function PowrLogin(_ref) {
   }();
   var verifyFirebaseOtp = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
-      var result, _t2;
+      var _t2;
       return _regenerator().w(function (_context3) {
         while (1) switch (_context3.p = _context3.n) {
           case 0:
@@ -200,24 +204,23 @@ var PowrLogin = function PowrLogin(_ref) {
             _context3.n = 3;
             return firebaseConfirm.confirm(otp);
           case 3:
-            result = _context3.v;
-            _context3.n = 4;
-            return handleSubmit(null, true);
-          case 4:
-            _context3.n = 6;
+            setOtpVerified(true);
+            setSuccess('OTP verified! Please set your password to complete registration.');
+            _context3.n = 5;
             break;
-          case 5:
-            _context3.p = 5;
+          case 4:
+            _context3.p = 4;
             _t2 = _context3.v;
             setError('Invalid OTP. Please try again.');
-          case 6:
-            _context3.p = 6;
+            setOtpVerified(false);
+          case 5:
+            _context3.p = 5;
             setLoading(false);
-            return _context3.f(6);
-          case 7:
+            return _context3.f(5);
+          case 6:
             return _context3.a(2);
         }
-      }, _callee3, null, [[1, 5, 6, 7]]);
+      }, _callee3, null, [[1, 4, 5, 6]]);
     }));
     return function verifyFirebaseOtp() {
       return _ref4.apply(this, arguments);
@@ -237,22 +240,10 @@ var PowrLogin = function PowrLogin(_ref) {
   };
   var handleSubmit = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(e) {
-      var skipPhoneValidation,
-        errors,
-        value,
-        isEmail,
-        endpoint,
-        payload,
-        _yield$apiCall,
-        data,
-        ok,
-        _args4 = arguments,
-        _t3,
-        _t4;
+      var errors, value, isEmail, endpoint, payload, _yield$apiCall, data, ok, _t3;
       return _regenerator().w(function (_context4) {
         while (1) switch (_context4.p = _context4.n) {
           case 0:
-            skipPhoneValidation = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : false;
             if (e) e.preventDefault();
             setLoading(true);
             setError('');
@@ -280,7 +271,7 @@ var PowrLogin = function PowrLogin(_ref) {
             if (!isLogin && formData.password !== formData.confirmPassword) {
               errors.confirmPassword = 'Passwords do not match';
             }
-            if (!isLogin && (!otp || !firebaseConfirm)) {
+            if (!isLogin && !otpVerified) {
               errors.otp = 'Please verify OTP before signing up';
             }
             if (!(Object.keys(errors).length > 0)) {
@@ -291,35 +282,7 @@ var PowrLogin = function PowrLogin(_ref) {
             setLoading(false);
             return _context4.a(2);
           case 1:
-            if (isLogin) {
-              _context4.n = 7;
-              break;
-            }
-            _context4.p = 2;
-            if (!(firebaseConfirm && otp)) {
-              _context4.n = 4;
-              break;
-            }
-            _context4.n = 3;
-            return firebaseConfirm.confirm(otp);
-          case 3:
-            _context4.n = 5;
-            break;
-          case 4:
-            setError('Please verify OTP before signing up');
-            setLoading(false);
-            return _context4.a(2);
-          case 5:
-            _context4.n = 7;
-            break;
-          case 6:
-            _context4.p = 6;
-            _t3 = _context4.v;
-            setError('Invalid OTP. Please try again.');
-            setLoading(false);
-            return _context4.a(2);
-          case 7:
-            _context4.p = 7;
+            _context4.p = 1;
             endpoint = isLogin ? "/auth/login" : "/auth/register";
             payload = isLogin ? {
               phoneOrEmail: formData.phoneOrEmail,
@@ -329,12 +292,12 @@ var PowrLogin = function PowrLogin(_ref) {
               phoneOrEmail: formData.phoneOrEmail,
               password: formData.password
             };
-            _context4.n = 8;
+            _context4.n = 2;
             return (0, _auth.apiCall)(apiUrl, endpoint, projectId, {
               method: 'POST',
               body: payload
             });
-          case 8:
+          case 2:
             _yield$apiCall = _context4.v;
             data = _yield$apiCall.data;
             ok = _yield$apiCall.ok;
@@ -366,20 +329,20 @@ var PowrLogin = function PowrLogin(_ref) {
                 setError("".concat(isLogin ? 'Login' : 'Registration', " failed. Please try again."));
               }
             }
-            _context4.n = 10;
+            _context4.n = 4;
             break;
-          case 9:
-            _context4.p = 9;
-            _t4 = _context4.v;
+          case 3:
+            _context4.p = 3;
+            _t3 = _context4.v;
             setError('Network error. Please try again.');
-          case 10:
-            _context4.p = 10;
+          case 4:
+            _context4.p = 4;
             setLoading(false);
-            return _context4.f(10);
-          case 11:
+            return _context4.f(4);
+          case 5:
             return _context4.a(2);
         }
-      }, _callee4, null, [[7, 9, 10, 11], [2, 6]]);
+      }, _callee4, null, [[1, 3, 4, 5]]);
     }));
     return function handleSubmit(_x3) {
       return _ref5.apply(this, arguments);
@@ -401,7 +364,7 @@ var PowrLogin = function PowrLogin(_ref) {
   };
   var handleGetOtp = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5() {
-      var _yield$apiCall2, data, ok, _t5;
+      var _yield$apiCall2, data, ok, _t4;
       return _regenerator().w(function (_context5) {
         while (1) switch (_context5.p = _context5.n) {
           case 0:
@@ -440,7 +403,7 @@ var PowrLogin = function PowrLogin(_ref) {
             break;
           case 4:
             _context5.p = 4;
-            _t5 = _context5.v;
+            _t4 = _context5.v;
             setError('Network error. Please try again.');
           case 5:
             _context5.p = 5;
@@ -527,7 +490,7 @@ var PowrLogin = function PowrLogin(_ref) {
     disabled: otpLoading
   }, otpLoading ? 'Sending OTP...' : 'Send OTP to Phone'), /*#__PURE__*/_react["default"].createElement("div", {
     id: "recaptcha-container"
-  })) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("label", {
+  })) : !otpVerified ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("label", {
     htmlFor: "otp",
     style: styles.label
   }, "Enter OTP"), /*#__PURE__*/_react["default"].createElement("input", {
@@ -546,7 +509,12 @@ var PowrLogin = function PowrLogin(_ref) {
     onClick: verifyFirebaseOtp,
     style: styles.otpButton,
     disabled: loading || !otp
-  }, loading ? 'Verifying...' : 'Verify OTP & Sign Up')))), /*#__PURE__*/_react["default"].createElement("div", {
+  }, loading ? 'Verifying...' : 'Verify OTP')) : /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      color: '#16a34a',
+      marginBottom: 8
+    }
+  }, "OTP verified! Now set your password and sign up."))), /*#__PURE__*/_react["default"].createElement("div", {
     style: styles.formGroup
   }, /*#__PURE__*/_react["default"].createElement("label", {
     htmlFor: "password",
@@ -561,14 +529,16 @@ var PowrLogin = function PowrLogin(_ref) {
     onChange: handleInputChange,
     style: _objectSpread(_objectSpread(_objectSpread({}, styles.input), styles.passwordInput), fieldErrors.password ? styles.inputError : {}),
     placeholder: "Enter your password",
-    required: true
+    required: true,
+    disabled: !isLogin && !otpVerified
   }), /*#__PURE__*/_react["default"].createElement("button", {
     type: "button",
     onClick: function onClick() {
       return setShowPassword(!showPassword);
     },
     style: styles.eyeButton,
-    tabIndex: -1
+    tabIndex: -1,
+    disabled: !isLogin && !otpVerified
   }, showPassword ? /*#__PURE__*/_react["default"].createElement("span", {
     style: styles.eyeIcon
   }, "\uD83D\uDC41\uFE0F") : /*#__PURE__*/_react["default"].createElement("span", {
@@ -590,14 +560,16 @@ var PowrLogin = function PowrLogin(_ref) {
     onChange: handleInputChange,
     style: _objectSpread(_objectSpread(_objectSpread({}, styles.input), styles.passwordInput), fieldErrors.confirmPassword ? styles.inputError : {}),
     placeholder: "Confirm your password",
-    required: true
+    required: true,
+    disabled: !otpVerified
   }), /*#__PURE__*/_react["default"].createElement("button", {
     type: "button",
     onClick: function onClick() {
       return setShowConfirmPassword(!showConfirmPassword);
     },
     style: styles.eyeButton,
-    tabIndex: -1
+    tabIndex: -1,
+    disabled: !otpVerified
   }, showConfirmPassword ? /*#__PURE__*/_react["default"].createElement("span", {
     style: styles.eyeIcon
   }, "\uD83D\uDC41\uFE0F") : /*#__PURE__*/_react["default"].createElement("span", {
@@ -620,21 +592,35 @@ var PowrLogin = function PowrLogin(_ref) {
     },
     style: styles.forgotPasswordLink
   }, "Forgot password?")), isLogin && showOtpOption && /*#__PURE__*/_react["default"].createElement("div", {
-    style: styles.otpSection
-  }, /*#__PURE__*/_react["default"].createElement("p", {
-    style: styles.otpText
-  }, "Having trouble signing in? Get a one-time password sent to your phone or email."), /*#__PURE__*/_react["default"].createElement("button", {
+    style: styles.formGroup
+  }, /*#__PURE__*/_react["default"].createElement("label", {
+    htmlFor: "password",
+    style: styles.label
+  }, "Password"), /*#__PURE__*/_react["default"].createElement("div", {
+    style: styles.passwordContainer
+  }, /*#__PURE__*/_react["default"].createElement("input", {
+    type: showPassword ? "text" : "password",
+    id: "password",
+    name: "password",
+    value: formData.password,
+    onChange: handleInputChange,
+    style: _objectSpread(_objectSpread(_objectSpread({}, styles.input), styles.passwordInput), fieldErrors.password ? styles.inputError : {}),
+    placeholder: "Enter your password",
+    required: true
+  }), /*#__PURE__*/_react["default"].createElement("button", {
     type: "button",
-    onClick: handleGetOtp,
-    disabled: otpLoading,
-    style: _objectSpread(_objectSpread({}, styles.otpButton), otpLoading ? styles.buttonDisabled : {})
-  }, otpLoading ? /*#__PURE__*/_react["default"].createElement("div", {
-    style: styles.spinner
-  }) : 'Get OTP')), error && /*#__PURE__*/_react["default"].createElement("div", {
-    style: styles.errorMessage
-  }, error), success && /*#__PURE__*/_react["default"].createElement("div", {
-    style: styles.successMessage
-  }, success), /*#__PURE__*/_react["default"].createElement("button", {
+    onClick: function onClick() {
+      return setShowPassword(!showPassword);
+    },
+    style: styles.eyeButton,
+    tabIndex: -1
+  }, showPassword ? /*#__PURE__*/_react["default"].createElement("span", {
+    style: styles.eyeIcon
+  }, "\uD83D\uDC41\uFE0F") : /*#__PURE__*/_react["default"].createElement("span", {
+    style: styles.eyeIcon
+  }, "\uD83D\uDC41\uFE0F\u200D\uD83D\uDDE8\uFE0F"))), fieldErrors.password && /*#__PURE__*/_react["default"].createElement("div", {
+    style: styles.fieldError
+  }, fieldErrors.password)), /*#__PURE__*/_react["default"].createElement("button", {
     type: "submit",
     disabled: loading,
     style: _objectSpread(_objectSpread({}, styles.button), loading ? styles.buttonDisabled : {})

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "powr-sdk-web",
-    "version": "4.2.5",
+    "version": "4.2.6",
     "main": "dist/index.js",
     "scripts": {
         "build": "babel src -d dist --copy-files",