@nibssplc/cams-sdk-react 1.0.0-rc.103 → 1.0.0-rc.105

package/dist/index.cjs.js

@@ -643,32 +643,26 @@ function useCAMSMSALAuth(options) {
         });
     }); }, []);
     var logout = React.useCallback(function () { return __awaiter$1(_this, void 0, void 0, function () {
-        var err_2, camsError;
+        var camsError;
         return __generator$1(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _a.trys.push([0, 2, , 3]);
-                    camsSdk.Logger.info("Logging User Out");
-                    setAccessToken("");
-                    setIdToken("");
-                    setError(null);
-                    setRequiresMFA(false);
-                    setIsAuthenticated(false);
-                    if (typeof window !== "undefined") {
-                        localStorage.removeItem(storageKey);
-                        deleteCookie(storageKey + "-PROFILE");
-                    }
-                    return [4 /*yield*/, instance.logoutRedirect()];
-                case 1:
-                    _a.sent();
-                    return [3 /*break*/, 3];
-                case 2:
-                    err_2 = _a.sent();
-                    camsError = new camsSdk.CAMSError(camsSdk.CAMSErrorType.API_VALIDATION_ERROR, "Logout failed: " + err_2);
-                    setError(camsError);
-                    return [3 /*break*/, 3];
-                case 3: return [2 /*return*/];
+            try {
+                camsSdk.Logger.info("Logging User Out");
+                setAccessToken("");
+                setIdToken("");
+                setError(null);
+                setRequiresMFA(false);
+                setIsAuthenticated(false);
+                if (typeof window !== "undefined") {
+                    localStorage.removeItem(storageKey);
+                    deleteCookie(storageKey + "-PROFILE");
+                }
+                // await instance.logoutRedirect();
+            }
+            catch (err) {
+                camsError = new camsSdk.CAMSError(camsSdk.CAMSErrorType.API_VALIDATION_ERROR, "Logout failed: " + err);
+                setError(camsError);
             }
+            return [2 /*return*/];
         });
     }); }, [instance, storageKey]);
     return {
@@ -1512,15 +1506,20 @@ var useCredentialsHandler = function (onAuthComplete) {
     var _a = React.useState(false), loading = _a[0], setLoading = _a[1];
     var _b = React.useState(0), attemptCount = _b[0], setAttemptCount = _b[1];
     var _c = React.useState(false), isMaxAttemptsReached = _c[0], setIsMaxAttemptsReached = _c[1];
-    var handleSubmitCredentials = React.useMemo(function () { return function (CredentialsAuthEndpoint, credentials) { return __awaiter$1(void 0, void 0, void 0, function () {
-        var currentAttempt, authenticator, response, error_2, currentAttempt;
+    var handleSubmitCredentials = React.useCallback(function (CredentialsAuthEndpoint, credentials) { return __awaiter$1(void 0, void 0, void 0, function () {
+        var authenticator, response, error_2;
         return __generator$1(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     _a.trys.push([0, 2, 3, 4]);
                     setLoading(true);
-                    currentAttempt = attemptCount + 1;
-                    setAttemptCount(currentAttempt);
+                    setAttemptCount(function (prev) {
+                        var currentAttempt = prev + 1;
+                        if (currentAttempt >= MAX_ATTEMPTS) {
+                            setIsMaxAttemptsReached(true);
+                        }
+                        return currentAttempt;
+                    });
                     authenticator = new camsSdk.CAMSMFAAuthenticator();
                     return [4 /*yield*/, authenticator.LoginADCredentials(credentials, CredentialsAuthEndpoint)];
                 case 1:
@@ -1530,24 +1529,12 @@ var useCredentialsHandler = function (onAuthComplete) {
                         return [2 /*return*/, true];
                     }
                     else {
-                        if (currentAttempt >= MAX_ATTEMPTS) {
-                            setIsMaxAttemptsReached(true);
-                            onAuthComplete(false, {
-                                message: "Maximum attempts reached",
-                            });
-                        }
-                        else {
-                            onAuthComplete(false, response.response.data);
-                        }
+                        onAuthComplete(false, response.response.data);
                         return [2 /*return*/, false];
                     }
                 case 2:
                     error_2 = _a.sent();
                     console.error(error_2);
-                    currentAttempt = attemptCount + 1;
-                    if (currentAttempt >= MAX_ATTEMPTS) {
-                        setIsMaxAttemptsReached(true);
-                    }
                     onAuthComplete(false, error_2.response.data);
                     return [2 /*return*/, false];
                 case 3:
@@ -1556,7 +1543,7 @@ var useCredentialsHandler = function (onAuthComplete) {
                 case 4: return [2 /*return*/];
             }
         });
-    }); }; }, []);
+    }); }, [onAuthComplete]);
     return {
         handleSubmitCredentials: handleSubmitCredentials,
         loading: loading,
@@ -1827,15 +1814,20 @@ var DefaultLoginPage = function (_a) {
                                         }, disabled: isLoading, children: [jsxRuntime.jsx(lucideReact.KeyIcon, { className: "text-[#506f4a]", size: 64 }), jsxRuntime.jsx("span", { children: "Create a Passkey" })] }))] }), jsxRuntime.jsxs(CardFooter, { className: "flex items-center justify-center mt-6 space-x-2 text-gray-400 text-sm", children: [jsxRuntime.jsx(lucideReact.ShieldCheck, { className: "w-4 h-4 text-[#506f4a] pulse-glow" }), jsxRuntime.jsx("span", { children: "Powered By NIBSS" })] })] }) }) }, "landing"), jsxRuntime.jsx(ADLoginModal, { open: showADModal, onOpenChange: setShowADModal, isLoading: context.isLoading || isCredAuthLoading, setIsLoading: setIsCredAuthLoading, onLogin: function (_a) { return __awaiter$1(void 0, [_a], void 0, function (_b) {
                     var username = _b.username, password = _b.password, MFACode = _b.MFACode;
                     return __generator$1(this, function (_c) {
-                        // Implement your AD login logic here
-                        console.log("AD Login:", { username: username, MFACode: MFACode });
-                        handleSubmitCredentials(CredentialsAuthEndpoint, {
-                            username: username,
-                            password: password,
-                            MFACode: MFACode,
-                            appCode: context.appCode,
-                        });
-                        return [2 /*return*/];
+                        switch (_c.label) {
+                            case 0:
+                                // Implement your AD login logic here
+                                console.log("AD Login:", { username: username, MFACode: MFACode });
+                                return [4 /*yield*/, handleSubmitCredentials(CredentialsAuthEndpoint, {
+                                        username: username,
+                                        password: password,
+                                        MFACode: MFACode,
+                                        appCode: context.appCode,
+                                    })];
+                            case 1:
+                                _c.sent();
+                                return [2 /*return*/];
+                        }
                     });
                 }); } })] }));
 };