powr-sdk-web 4.4.1 → 4.4.2

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 _t7 in e) "default" !== _t7 && {}.hasOwnProperty.call(e, _t7) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t7)) && (i.get || i.set) ? o(f, _t7, i) : f[_t7] = e[_t7]); 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 _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 _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); }
@@ -116,6 +116,14 @@ 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),
+    showOtpModal = _useState30[0],
+    setShowOtpModal = _useState30[1];
+  var _useState31 = (0, _react.useState)(false),
+    _useState32 = _slicedToArray(_useState31, 2),
+    isPhoneVerified = _useState32[0],
+    setIsPhoneVerified = _useState32[1];
   var shouldShowToggle = mode === 'toggle';
   var handleInputChange = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(e) {
@@ -195,6 +203,7 @@ var PowrLogin = function PowrLogin(_ref) {
             confirmationResult = _context2.v;
             setFirebaseConfirm(confirmationResult);
             setFirebaseOtpSent(true);
+            setShowOtpModal(true);
             setSuccess('OTP sent to your phone!');
             _context2.n = 8;
             break;
@@ -260,23 +269,24 @@ var PowrLogin = function PowrLogin(_ref) {
             return firebaseConfirm.confirm(otp);
           case 3:
             result = _context3.v;
-            _context3.n = 4;
-            return handleSubmit(null, true);
-          case 4:
-            _context3.n = 6;
+            setIsPhoneVerified(true);
+            setShowOtpModal(false);
+            setSuccess('Phone number verified successfully! Now you can sign up.');
+            setOtp('');
+            _context3.n = 5;
             break;
-          case 5:
-            _context3.p = 5;
+          case 4:
+            _context3.p = 4;
             _t3 = _context3.v;
             setError('Invalid OTP. Please try again.');
-          case 6:
-            _context3.p = 6;
+          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);
@@ -306,8 +316,7 @@ var PowrLogin = function PowrLogin(_ref) {
         data,
         ok,
         _args4 = arguments,
-        _t4,
-        _t5;
+        _t4;
       return _regenerator().w(function (_context4) {
         while (1) switch (_context4.p = _context4.n) {
           case 0:
@@ -348,8 +357,8 @@ var PowrLogin = function PowrLogin(_ref) {
             if (!isLogin && formData.password !== formData.confirmPassword) {
               errors.confirmPassword = 'Passwords do not match';
             }
-            if (!isLogin && (!otp || !firebaseConfirm)) {
-              errors.otp = 'Please verify OTP before signing up';
+            if (!isLogin && !isPhoneVerified) {
+              errors.phoneOrEmail = 'Please verify your phone number first';
             }
             if (!(Object.keys(errors).length > 0)) {
               _context4.n = 1;
@@ -359,35 +368,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;
-            _t4 = _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,
@@ -397,12 +378,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;
@@ -438,20 +419,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;
-            _t5 = _context4.v;
+          case 3:
+            _context4.p = 3;
+            _t4 = _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);
@@ -467,6 +448,8 @@ var PowrLogin = function PowrLogin(_ref) {
     setOtp('');
     setFirebaseOtpSent(false);
     setFirebaseConfirm(null);
+    setShowOtpModal(false);
+    setIsPhoneVerified(false);
     setFormData({
       phoneOrEmail: '',
       password: '',
@@ -476,7 +459,7 @@ var PowrLogin = function PowrLogin(_ref) {
   };
   var handleGetOtp = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5() {
-      var _yield$apiCall2, data, ok, _t6;
+      var _yield$apiCall2, data, ok, _t5;
       return _regenerator().w(function (_context5) {
         while (1) switch (_context5.p = _context5.n) {
           case 0:
@@ -515,7 +498,7 @@ var PowrLogin = function PowrLogin(_ref) {
             break;
           case 4:
             _context5.p = 4;
-            _t6 = _context5.v;
+            _t5 = _context5.v;
             setError('Network error. Please try again.');
           case 5:
             _context5.p = 5;
@@ -595,35 +578,20 @@ var PowrLogin = function PowrLogin(_ref) {
     style: styles.fieldError
   }, fieldErrors.phoneOrEmail), !isLogin && /*#__PURE__*/_react["default"].createElement("div", {
     style: styles.helpText
-  }, "Registration requires phone verification for security"), !isLogin && isValidPhone(formData.phoneOrEmail) && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, !firebaseOtpSent ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("button", {
+  }, "Registration requires phone verification for security"), !isLogin && isValidPhone(formData.phoneOrEmail) && !isPhoneVerified && /*#__PURE__*/_react["default"].createElement("button", {
     type: "button",
     onClick: function onClick() {
       return sendFirebaseOtp(formatPhone(formData.phoneOrEmail));
     },
-    style: styles.otpButton,
+    style: _objectSpread(_objectSpread({}, styles.otpButton), {}, {
+      marginTop: '8px'
+    }),
     disabled: otpLoading
-  }, otpLoading ? 'Sending OTP...' : 'Send OTP to Phone'), /*#__PURE__*/_react["default"].createElement("div", {
+  }, otpLoading ? 'Sending OTP...' : 'Verify Phone Number'), !isLogin && isPhoneVerified && /*#__PURE__*/_react["default"].createElement("div", {
+    style: styles.successText
+  }, "\u2705 Phone number verified successfully!"), /*#__PURE__*/_react["default"].createElement("div", {
     id: "recaptcha-container"
-  })) : /*#__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", {
-    type: "text",
-    id: "otp",
-    name: "otp",
-    value: otp,
-    onChange: function onChange(e) {
-      return setOtp(e.target.value);
-    },
-    style: styles.input,
-    placeholder: "Enter OTP received",
-    required: true
-  }), /*#__PURE__*/_react["default"].createElement("button", {
-    type: "button",
-    onClick: verifyFirebaseOtp,
-    style: styles.otpButton,
-    disabled: loading || !otp
-  }, loading ? 'Verifying...' : 'Verify OTP & Sign Up')))), /*#__PURE__*/_react["default"].createElement("div", {
+  })), /*#__PURE__*/_react["default"].createElement("div", {
     style: styles.formGroup
   }, /*#__PURE__*/_react["default"].createElement("label", {
     htmlFor: "password",
@@ -737,7 +705,55 @@ var PowrLogin = function PowrLogin(_ref) {
   }, "Sign in here") : /*#__PURE__*/_react["default"].createElement("a", {
     href: "/login",
     style: styles.navigationLink
-  }, "Sign in here"))))));
+  }, "Sign in here"))))), showOtpModal && /*#__PURE__*/_react["default"].createElement("div", {
+    style: styles.modalOverlay
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    style: styles.modalContent
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    style: styles.modalHeader
+  }, /*#__PURE__*/_react["default"].createElement("h2", {
+    style: styles.modalTitle
+  }, "Verify Phone Number"), /*#__PURE__*/_react["default"].createElement("button", {
+    onClick: function onClick() {
+      setShowOtpModal(false);
+      setOtp('');
+      setError('');
+    },
+    style: styles.closeButton
+  }, "\xD7")), /*#__PURE__*/_react["default"].createElement("p", {
+    style: styles.modalText
+  }, "We've sent a verification code to ", /*#__PURE__*/_react["default"].createElement("strong", null, formData.phoneOrEmail)), /*#__PURE__*/_react["default"].createElement("div", {
+    style: styles.formGroup
+  }, /*#__PURE__*/_react["default"].createElement("label", {
+    htmlFor: "modalOtp",
+    style: styles.label
+  }, "Enter OTP"), /*#__PURE__*/_react["default"].createElement("input", {
+    type: "text",
+    id: "modalOtp",
+    value: otp,
+    onChange: function onChange(e) {
+      return setOtp(e.target.value);
+    },
+    style: styles.input,
+    placeholder: "Enter 6-digit OTP",
+    maxLength: "6",
+    autoFocus: true
+  })), error && /*#__PURE__*/_react["default"].createElement("div", {
+    style: styles.errorMessage
+  }, error), /*#__PURE__*/_react["default"].createElement("div", {
+    style: styles.modalButtons
+  }, /*#__PURE__*/_react["default"].createElement("button", {
+    onClick: function onClick() {
+      setShowOtpModal(false);
+      setOtp('');
+      setError('');
+    },
+    style: styles.cancelButton
+  }, "Cancel"), /*#__PURE__*/_react["default"].createElement("button", {
+    onClick: verifyFirebaseOtp,
+    disabled: loading || !otp || otp.length < 6,
+    style: _objectSpread(_objectSpread({}, styles.button), loading || !otp || otp.length < 6 ? styles.buttonDisabled : {})
+  }, loading ? 'Verifying...' : 'Verify')))));
 };
 var styles = {
   container: {
@@ -878,6 +894,17 @@ var styles = {
     fontSize: '14px',
     fontWeight: '500'
   },
+  successText: {
+    background: '#f0fdf4',
+    color: '#16a34a',
+    padding: '8px 12px',
+    borderRadius: '6px',
+    border: '1px solid #bbf7d0',
+    fontSize: '12px',
+    fontWeight: '500',
+    marginTop: '8px',
+    textAlign: 'center'
+  },
   toggleSection: {
     marginTop: '24px',
     textAlign: 'center',

package/package.json

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