@nibssplc/cams-sdk-react 0.0.1-beta.32 → 0.0.1-beta.34

package/dist/hooks/useCAMSMSALAuth.d.ts

@@ -12,7 +12,6 @@ export interface UseCAMSMSALAuthReturn {
     logout: () => Promise<void>;
     isAuthenticated: boolean;
     isLoading: boolean;
-    isMFAPending: boolean;
     error: CAMSError | null;
     token: string | null;
     idToken: string | null;

package/dist/index.cjs.js

@@ -16718,45 +16718,39 @@ function useCAMSMSALAuth(options) {
     var _c = React__default.useState(null), token = _c[0], setToken = _c[1];
     var _d = React__default.useState(null), idToken = _d[0], setIdToken = _d[1];
     var _e = React__default.useState(null), accessToken = _e[0], setAccessToken = _e[1];
-    var _f = React__default.useState(false), isMFAPending = _f[0], setIsMFAPending = _f[1];
-    var _g = React__default.useState(false), hasRedirected = _g[0], setHasRedirected = _g[1];
     var isLoading = inProgress !== InteractionStatus.None;
-    var isAuthenticated = !!account && !!token && !isMFAPending;
+    var isAuthenticated = !!account && !!token;
     var scopes = options.scopes || ["openid", "profile", "email"];
-    React__default.useEffect(function () {
-        if (account && !isMFAPending && !hasRedirected) {
-            // Get token in foreground popup
-            instance
-                .acquireTokenPopup({
-                scopes: scopes,
-                account: account,
-                prompt: options.prompt || "login",
-            })
-                .then(function (response) {
-                var _a;
-                setToken(response.accessToken);
-                setAccessToken(response.accessToken);
-                setIdToken(response.idToken);
-                setIsMFAPending(true);
-                setHasRedirected(true);
-                // Small delay to ensure popup closes before redirect
-                setTimeout(function () {
-                    if (typeof window !== "undefined" && process.env.NODE_ENV !== 'test') {
-                        window.location.href = options.mfaUrl;
-                    }
-                }, 100);
-                (_a = options.onAuthSuccess) === null || _a === void 0 ? void 0 : _a.call(options, response.accessToken);
-            })
-                .catch(function (err) {
-                var _a;
-                var camsError = new camsSdk.CAMSError(camsSdk.CAMSErrorType.API_VALIDATION_ERROR, "Failed to acquire token: " + err);
-                setError(camsError);
-                (_a = options.onAuthError) === null || _a === void 0 ? void 0 : _a.call(options, camsError);
-            });
-        }
-    }, [account, instance, isMFAPending, hasRedirected]);
+    // useEffect(() => {
+    //   const handleRedirect = async () => {
+    //     try {
+    //       const response = await instance.handleRedirectPromise();
+    //       if (response) {
+    //         const account = response.account;
+    //         instance.setActiveAccount(account);
+    //         const tokenResponse = await instance.acquireTokenSilent({
+    //           scopes,
+    //           account,
+    //         });
+    //         setToken(tokenResponse.accessToken);
+    //         setAccessToken(tokenResponse.accessToken);
+    //         setIdToken(tokenResponse.idToken);
+    //         options.onAuthSuccess?.(tokenResponse.accessToken);
+    //         if (
+    //           typeof window !== "undefined" &&
+    //           process.env.NODE_ENV !== "test"
+    //         ) {
+    //           window.location.href = options.mfaUrl!;
+    //         }
+    //       }
+    //     } catch (err) {
+    //       console.error("Redirect handling failed:", err);
+    //     }
+    //   };
+    //   handleRedirect();
+    // }, []);
     var login = React__default.useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
-        var err_1, redirectErr_1, camsError_1, camsError;
+        var err_1, camsError_1, camsError;
         var _a, _b, _c;
         return __generator(this, function (_d) {
             switch (_d.label) {
@@ -16764,40 +16758,49 @@ function useCAMSMSALAuth(options) {
                     setError(null);
                     _d.label = 1;
                 case 1:
-                    _d.trys.push([1, 3, , 8]);
-                    return [4 /*yield*/, instance.loginRedirect({
+                    _d.trys.push([1, 3, , 4]);
+                    // await instance.loginRedirect({
+                    //   scopes,
+                    //   prompt: options.prompt || "login",
+                    // });
+                    return [4 /*yield*/, instance
+                            .loginPopup({
                             scopes: scopes,
                             prompt: options.prompt || "login",
+                        })
+                            .then(function (response) {
+                            var _a;
+                            setToken(response.accessToken);
+                            setAccessToken(response.accessToken);
+                            setIdToken(response.idToken);
+                            (_a = options.onAuthSuccess) === null || _a === void 0 ? void 0 : _a.call(options, response.accessToken);
+                            if (typeof window !== "undefined" &&
+                                process.env.NODE_ENV !== "test") {
+                                window.location.href = options.mfaUrl;
+                            }
                         })];
                 case 2:
+                    // await instance.loginRedirect({
+                    //   scopes,
+                    //   prompt: options.prompt || "login",
+                    // });
                     _d.sent();
-                    return [3 /*break*/, 8];
+                    return [3 /*break*/, 4];
                 case 3:
                     err_1 = _d.sent();
-                    if (!(err_1.errorCode === "popup_window_error" ||
-                        ((_a = err_1.message) === null || _a === void 0 ? void 0 : _a.includes("popup")))) return [3 /*break*/, 7];
-                    _d.label = 4;
-                case 4:
-                    _d.trys.push([4, 6, , 7]);
-                    return [4 /*yield*/, instance.loginRedirect({
-                            scopes: scopes,
-                            prompt: options.prompt || "login",
-                        })];
-                case 5:
-                    _d.sent();
-                    return [2 /*return*/];
-                case 6:
-                    redirectErr_1 = _d.sent();
-                    camsError_1 = new camsSdk.CAMSError(camsSdk.CAMSErrorType.POPUP_BLOCKED, "Both popup and redirect failed: " + redirectErr_1);
-                    setError(camsError_1);
-                    (_b = options.onAuthError) === null || _b === void 0 ? void 0 : _b.call(options, camsError_1);
-                    return [2 /*return*/];
-                case 7:
+                    // If popup is blocked
+                    if (err_1.errorCode === "popup_window_error" ||
+                        ((_a = err_1.message) === null || _a === void 0 ? void 0 : _a.includes("popup"))) {
+                        camsError_1 = new camsSdk.CAMSError(camsSdk.CAMSErrorType.POPUP_BLOCKED, "Both popup and redirect failed: " + err_1);
+                        setError(camsError_1);
+                        (_b = options.onAuthError) === null || _b === void 0 ? void 0 : _b.call(options, camsError_1);
+                        return [2 /*return*/];
+                    }
                     camsError = new camsSdk.CAMSError(camsSdk.CAMSErrorType.API_VALIDATION_ERROR, "Login failed: " + err_1);
                     setError(camsError);
                     (_c = options.onAuthError) === null || _c === void 0 ? void 0 : _c.call(options, camsError);
-                    return [3 /*break*/, 8];
-                case 8: return [2 /*return*/];
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
             }
         });
     }); }, [instance, scopes, options]);
@@ -16812,8 +16815,6 @@ function useCAMSMSALAuth(options) {
                     _a.sent();
                     setToken(null);
                     setError(null);
-                    setIsMFAPending(false);
-                    setHasRedirected(false);
                     return [3 /*break*/, 3];
                 case 2:
                     err_2 = _a.sent();
@@ -16829,7 +16830,6 @@ function useCAMSMSALAuth(options) {
         logout: logout,
         isAuthenticated: isAuthenticated,
         isLoading: isLoading,
-        isMFAPending: isMFAPending,
         error: error,
         token: token,
         idToken: idToken,