@nibssplc/cams-sdk-react 0.0.1-beta.21 → 0.0.1-beta.22

package/dist/index.cjs.js

@@ -16720,68 +16720,75 @@ function useCAMSMSALAuth(options) {
     var isAuthenticated = !!account && !!token && !isMFAPending;
     var scopes = options.scopes || ["openid", "profile", "email"];
     React__default.useEffect(function () {
-        if (account && !token && !isMFAPending) {
-            login().catch(function (err) {
-                // Error is already handled in login function
-                console.error("Failed to automatically log in on mount:", err);
+        if (account && !isMFAPending) {
+            // Get token in foreground popup
+            instance
+                .acquireTokenPopup({
+                scopes: scopes,
+                account: account,
+                prompt: options.prompt || "select_account",
+            })
+                .then(function (response) {
+                var _a, _b;
+                if (options.mfaUrl) {
+                    setIsMFAPending(true);
+                    (_a = options.onMFARequired) === null || _a === void 0 ? void 0 : _a.call(options, response.accessToken, account);
+                    if (typeof window !== "undefined") {
+                        window.location.href = options.mfaUrl;
+                    }
+                }
+                else {
+                    setToken(response.accessToken);
+                    setProfile({
+                        type: "AUTH_SUCCESS",
+                        userProfile: {
+                            name: account.name || "",
+                            email: account.username || "",
+                            isAuthenticated: true,
+                            mfaIsEnabled: true,
+                            message: "Authentication successful",
+                            userType: "USER",
+                            tokens: {
+                                Nonce: "",
+                                Bearer: response.accessToken,
+                            },
+                        },
+                    });
+                    (_b = options.onAuthSuccess) === null || _b === void 0 ? void 0 : _b.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]);
     var login = React__default.useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
-        var loginResponse, tokenResponse, err_1, camsError;
-        var _a, _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var err_1, camsError;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     setError(null);
-                    _d.label = 1;
+                    _b.label = 1;
                 case 1:
-                    _d.trys.push([1, 5, , 6]);
-                    return [4 /*yield*/, instance.loginPopup({
+                    _b.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, instance.loginRedirect({
                             scopes: scopes,
                             prompt: options.prompt || "select_account",
                         })];
                 case 2:
-                    loginResponse = _d.sent();
-                    if (!loginResponse.account) return [3 /*break*/, 4];
-                    return [4 /*yield*/, instance.acquireTokenPopup({
-                            scopes: scopes,
-                            account: loginResponse.account,
-                        })];
+                    _b.sent();
+                    return [3 /*break*/, 4];
                 case 3:
-                    tokenResponse = _d.sent();
-                    if (options.mfaUrl) {
-                        setIsMFAPending(true);
-                        (_a = options.onMFARequired) === null || _a === void 0 ? void 0 : _a.call(options, tokenResponse.accessToken, loginResponse.account);
-                    }
-                    else {
-                        setToken(tokenResponse.accessToken);
-                        setProfile({
-                            type: "AUTH_SUCCESS",
-                            userProfile: {
-                                name: loginResponse.account.name || "",
-                                email: loginResponse.account.username || "",
-                                isAuthenticated: true,
-                                mfaIsEnabled: true,
-                                message: "Authentication successful",
-                                userType: "USER",
-                                tokens: {
-                                    Nonce: "",
-                                    Bearer: tokenResponse.accessToken,
-                                },
-                            },
-                        });
-                        (_b = options.onAuthSuccess) === null || _b === void 0 ? void 0 : _b.call(options, tokenResponse.accessToken);
-                    }
-                    _d.label = 4;
-                case 4: return [3 /*break*/, 6];
-                case 5:
-                    err_1 = _d.sent();
+                    err_1 = _b.sent();
                     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*/, 6];
-                case 6: return [2 /*return*/];
+                    (_a = options.onAuthError) === null || _a === void 0 ? void 0 : _a.call(options, camsError);
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
             }
         });
     }); }, [instance, scopes, options]);