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

package/dist/index.esm.js

@@ -16704,7 +16704,7 @@ function useCAMSMSALAuth(options) {
         if (account && !isMFAPending) {
             // Get token in foreground popup
             instance
-                .acquireTokenPopup({
+                .acquireTokenSilent({
                 scopes: scopes,
                 account: account,
                 prompt: options.prompt || "select_account",
@@ -16747,29 +16747,48 @@ function useCAMSMSALAuth(options) {
         }
     }, [account, instance, isMFAPending]);
     var login = useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
-        var err_1, camsError;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var err_1, redirectErr_1, camsError_1, camsError;
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     setError(null);
-                    _b.label = 1;
+                    _d.label = 1;
                 case 1:
-                    _b.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, instance.loginRedirect({
+                    _d.trys.push([1, 3, , 8]);
+                    return [4 /*yield*/, instance.loginPopup({
                             scopes: scopes,
                             prompt: options.prompt || "select_account",
                         })];
                 case 2:
-                    _b.sent();
-                    return [3 /*break*/, 4];
+                    _d.sent();
+                    return [3 /*break*/, 8];
                 case 3:
-                    err_1 = _b.sent();
+                    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 || "select_account",
+                        })];
+                case 5:
+                    _d.sent();
+                    return [2 /*return*/];
+                case 6:
+                    redirectErr_1 = _d.sent();
+                    camsError_1 = new CAMSError(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:
                     camsError = new CAMSError(CAMSErrorType.API_VALIDATION_ERROR, "Login failed: " + err_1);
                     setError(camsError);
-                    (_a = options.onAuthError) === null || _a === void 0 ? void 0 : _a.call(options, camsError);
-                    return [3 /*break*/, 4];
-                case 4: return [2 /*return*/];
+                    (_c = options.onAuthError) === null || _c === void 0 ? void 0 : _c.call(options, camsError);
+                    return [3 /*break*/, 8];
+                case 8: return [2 /*return*/];
             }
         });
     }); }, [instance, scopes, options]);