@basiq/connect-auth 0.1.85 → 0.1.88

package/dist/connect-auth.esm.js

@@ -822,7 +822,8 @@ var verifySmsCode = /*#__PURE__*/function () {
             return _context.abrupt("return", {
               data: json,
               headers: result.headers,
-              statusCode: result.status
+              statusCode: result.status,
+              ok: true
             });
 
           case 15:
@@ -834,14 +835,16 @@ var verifySmsCode = /*#__PURE__*/function () {
             return _context.abrupt("return", {
               headers: result.headers,
               statusCode: result.status,
-              error: result.statusText || 'Something went wrong'
+              error: result.statusText || 'Something went wrong',
+              ok: false
             });
 
           case 17:
             return _context.abrupt("return", {
               headers: result.headers,
               statusCode: result.status,
-              error: result.statusText || 'Something went wrong'
+              error: result.statusText || 'Something went wrong',
+              ok: false
             });
 
           case 18:
@@ -906,7 +909,8 @@ var authUser = /*#__PURE__*/function () {
             return _context2.abrupt("return", {
               data: json,
               headers: result.headers,
-              statusCode: result.status
+              statusCode: result.status,
+              ok: true
             });
 
           case 15:
@@ -915,7 +919,7 @@ var authUser = /*#__PURE__*/function () {
               break;
             }
 
-            if (!(result.status === 403)) {
+            if (![403, 404].includes(result.status)) {
               _context2.next = 20;
               break;
             }
@@ -936,14 +940,16 @@ var authUser = /*#__PURE__*/function () {
             return _context2.abrupt("return", {
               headers: result.headers,
               statusCode: result.status,
-              error: _json.message || result.statusText || 'Something went wrong'
+              error: (_json == null ? void 0 : _json.message) || result.statusText || 'Something went wrong',
+              ok: false
             });
 
           case 25:
             return _context2.abrupt("return", {
               headers: result.headers,
               statusCode: result.status,
-              error: result.statusText || 'Something went wrong'
+              error: result.statusText || 'Something went wrong',
+              ok: false
             });
 
           case 26:
@@ -1003,7 +1009,8 @@ function StartScreen(props) {
   var onContinue = props.onContinue,
       appName = props.appName,
       shadow = props.shadow,
-      authId = props.authId;
+      authId = props.authId,
+      showErrorScreen = props.showErrorScreen;
 
   var _useState = useState(false),
       loading = _useState[0],
@@ -1014,8 +1021,7 @@ function StartScreen(props) {
 
   var handleContinue = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _response$data, response;
-
+      var response;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -1033,9 +1039,11 @@ function StartScreen(props) {
             case 4:
               response = _context.sent;
 
-              if ((response == null ? void 0 : (_response$data = response.data) == null ? void 0 : _response$data.status) === 'code-sent') {
+              if (response != null && response.ok) {
                 setLoading(false);
                 onContinue();
+              } else {
+                showErrorScreen(response == null ? void 0 : response.statusCode.toString());
               }
 
             case 6:
@@ -1287,7 +1295,7 @@ function App() {
   useEffect(function () {
     var getData = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var id, _response$data, response, _response$data2, _response$data3, _response$data5, _response$data5$partn, _response$data4, _response$data6, _response$data6$partn;
+        var id, response, _response$data, _response$data2, _response$data4, _response$data4$partn, _response$data3, _response$data5, _response$data5$partn;
 
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
@@ -1296,7 +1304,7 @@ function App() {
                 id = window.location.pathname.substring(1);
 
                 if (!((id == null ? void 0 : id.length) > 0)) {
-                  _context.next = 11;
+                  _context.next = 10;
                   break;
                 }
 
@@ -1308,28 +1316,30 @@ function App() {
               case 6:
                 response = _context.sent;
 
-                if ((response == null ? void 0 : (_response$data = response.data) == null ? void 0 : _response$data.status) === 'code-not-sent') {
+                if (response != null && response.ok) {
                   setCurrentScreen(1);
-                  setMobile(response == null ? void 0 : (_response$data2 = response.data) == null ? void 0 : _response$data2.mobile);
+                  setMobile(response == null ? void 0 : (_response$data = response.data) == null ? void 0 : _response$data.mobile);
 
-                  if (response != null && (_response$data3 = response.data) != null && _response$data3.appName) {
-                    setAppName(response == null ? void 0 : (_response$data4 = response.data) == null ? void 0 : _response$data4.appName);
+                  if (response != null && (_response$data2 = response.data) != null && _response$data2.appName) {
+                    setAppName(response == null ? void 0 : (_response$data3 = response.data) == null ? void 0 : _response$data3.appName);
                   }
 
-                  if (response != null && (_response$data5 = response.data) != null && (_response$data5$partn = _response$data5.partner) != null && _response$data5$partn.logoUrl) {
-                    setLogo(response == null ? void 0 : (_response$data6 = response.data) == null ? void 0 : (_response$data6$partn = _response$data6.partner) == null ? void 0 : _response$data6$partn.logoUrl);
+                  if (response != null && (_response$data4 = response.data) != null && (_response$data4$partn = _response$data4.partner) != null && _response$data4$partn.logoUrl) {
+                    setLogo(response == null ? void 0 : (_response$data5 = response.data) == null ? void 0 : (_response$data5$partn = _response$data5.partner) == null ? void 0 : _response$data5$partn.logoUrl);
                   }
                 } else {
                   showErrorScreen(response == null ? void 0 : response.statusCode.toString());
                 }
 
-                setLoading(false);
-                _context.next = 12;
+                _context.next = 11;
                 break;
 
-              case 11:
+              case 10:
                 showErrorScreen('404');
 
+              case 11:
+                setLoading(false);
+
               case 12:
               case "end":
                 return _context.stop();