@basiq/connect-auth 1.0.5 → 1.0.7

package/dist/connect-auth.esm.js

@@ -923,6 +923,8 @@ function StartScreen(props) {
     shadow = props.shadow,
     authRequestId = props.authRequestId,
     showErrorScreen = props.showErrorScreen,
+    smsSent = props.smsSent,
+    setSmsSent = props.setSmsSent,
     test = props.test;
   var _useState = useState(false),
     loading = _useState[0],
@@ -946,8 +948,8 @@ function StartScreen(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setLoading(true);
-            if (!authRequestId) {
-              _context.next = 6;
+            if (!(authRequestId && !smsSent)) {
+              _context.next = 8;
               break;
             }
             _context.next = 4;
@@ -958,12 +960,20 @@ function StartScreen(props) {
           case 4:
             response = _context.sent;
             if (response != null && response.ok) {
+              setSmsSent(true);
               setLoading(false);
               onContinue();
             } else {
               showErrorScreen(response == null ? void 0 : response.statusCode.toString());
             }
-          case 6:
+            _context.next = 9;
+            break;
+          case 8:
+            if (smsSent) {
+              setLoading(false);
+              onContinue();
+            }
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -1088,7 +1098,7 @@ function AuthScreen(_ref) {
     return function (_x) {
       return _ref2.apply(this, arguments);
     };
-  }(), [smsCode, error, authRequestId]);
+  }(), [smsCode, error, authRequestId, action, test]);
   var buttons = [{
     label: t('continue'),
     onClick: function onClick() {
@@ -1199,6 +1209,9 @@ function App(props) {
   var _useState9 = useState(''),
     errorCode = _useState9[0],
     setErrorCode = _useState9[1];
+  var _useState10 = useState(false),
+    smsSent = _useState10[0],
+    setSmsSent = _useState10[1];
   var handleConnectionsScroll = function handleConnectionsScroll(event) {
     setShadow(detectScrollToBottom(event));
   };
@@ -1209,25 +1222,28 @@ function App(props) {
   useEffect(function () {
     var getData = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var _window$location$path, id, action, response, _response$data, _response$data2, _response$data4, _response$data3, _response$data5;
+        var id, actionParam, response, _response$data, _response$data2, _response$data4, _response$data3, _response$data5;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _window$location$path = window.location.pathname.substring(1).split('?action='), id = _window$location$path[0], action = _window$location$path[1];
-              action && setAction(action);
+              id = window.location.pathname.substring(1);
+              actionParam = window.location.search.split('?action=')[1];
+              if ((actionParam == null ? void 0 : actionParam.length) > 0) {
+                setAction(actionParam);
+              }
               if (!((id == null ? void 0 : id.length) > 0)) {
-                _context.next = 11;
+                _context.next = 12;
                 break;
               }
               setAuthId(id);
               setLoading(true);
-              _context.next = 7;
+              _context.next = 8;
               return authUser({
                 authRequestId: id,
                 method: 'GET',
                 test: test
               });
-            case 7:
+            case 8:
               response = _context.sent;
               if (response != null && response.ok) {
                 setCurrentScreen(1);
@@ -1241,13 +1257,13 @@ function App(props) {
               } else {
                 showErrorScreen(response == null ? void 0 : response.statusCode.toString());
               }
-              _context.next = 12;
+              _context.next = 13;
               break;
-            case 11:
-              showErrorScreen('404');
             case 12:
-              setLoading(false);
+              showErrorScreen('404');
             case 13:
+              setLoading(false);
+            case 14:
             case "end":
               return _context.stop();
           }
@@ -1277,6 +1293,8 @@ function App(props) {
             return setCurrentScreen(2);
           },
           authRequestId: authId,
+          smsSent: smsSent,
+          setSmsSent: setSmsSent,
           test: test
         });
       case 2: