@nibssplc/cams-sdk-react 0.0.1-beta.42 → 0.0.1-beta.44

package/dist/hooks/useCAMSMSALAuth.d.ts

@@ -14,8 +14,8 @@ export interface UseCAMSMSALAuthReturn {
     isAuthenticated: boolean;
     isLoading: boolean;
     error: CAMSError | null;
-    token: string | null;
-    idToken: string | null;
-    accessToken: string | null;
+    idToken: string;
+    accessToken: string;
+    appCode: string;
 }
 export declare function useCAMSMSALAuth(options?: UseCAMSMSALAuthOptions): UseCAMSMSALAuthReturn;

package/dist/index.cjs.js

@@ -16716,9 +16716,10 @@ function useCAMSMSALAuth(options) {
     var account = useAccount(accounts[0] || {});
     var storageKey = "CAMS-MSAL-AUTH-SDK";
     var _b = React__default.useState(null), error = _b[0], setError = _b[1];
-    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 _c = React__default.useState(""), token = _c[0], setToken = _c[1];
+    var _d = React__default.useState(""), idToken = _d[0], setIdToken = _d[1];
+    var _e = React__default.useState(""), appCode = _e[0], setAppCode = _e[1];
+    var _f = React__default.useState(""), accessToken = _f[0], setAccessToken = _f[1];
     var isLoading = inProgress !== InteractionStatus.None;
     var isAuthenticated = !!account && !!token;
     var scopes = options.scopes || ["openid", "profile", "email"];
@@ -16736,11 +16737,12 @@ function useCAMSMSALAuth(options) {
             var stored = localStorage.getItem(storageKey);
             if (stored) {
                 try {
-                    var _a = JSON.parse(stored), accessToken_1 = _a.accessToken, idToken_1 = _a.idToken;
+                    var _a = JSON.parse(stored), accessToken_1 = _a.accessToken, idToken_1 = _a.idToken, appCode_1 = _a.appCode;
                     if (accessToken_1 && isTokenValid(accessToken_1)) {
                         setToken(accessToken_1);
                         setAccessToken(accessToken_1);
                         setIdToken(idToken_1);
+                        setAppCode(appCode_1);
                     }
                     else {
                         localStorage.removeItem(storageKey);
@@ -16814,13 +16816,21 @@ function useCAMSMSALAuth(options) {
                                     idToken: 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") {
                                 // Center the popup window
                                 var left = (window.screen.width - 500) / 2;
                                 var top_1 = (window.screen.height - 600) / 2;
-                                window.open(options.mfaUrl, "_blank", "width=500,height=600,left=".concat(left, ",top=").concat(top_1, ",scrollbars=yes,resizable=yes"));
+                                var authWindow = window.open(options.mfaUrl, "_blank", "width=500,height=600,left=".concat(left, ",top=").concat(top_1, ",scrollbars=yes,resizable=yes"));
+                                if (!authWindow) {
+                                    camsSdk.Logger.error("Popup window blocked");
+                                    throw new camsSdk.CAMSError(camsSdk.CAMSErrorType.POPUP_BLOCKED, "Popup blocked by browser. Please allow popups and try again.");
+                                }
+                                if (authWindow.closed) {
+                                    camsSdk.Logger.error("Popup immediately closed by blocker");
+                                    throw new camsSdk.CAMSError(camsSdk.CAMSErrorType.POPUP_BLOCKED, "Popup blocked by browser. Please allow popups and try again.");
+                                }
+                                (_a = options.onAuthSuccess) === null || _a === void 0 ? void 0 : _a.call(options, response.accessToken);
                             }
                         })];
                 case 2:
@@ -16857,9 +16867,9 @@ function useCAMSMSALAuth(options) {
                     return [4 /*yield*/, instance.logoutRedirect()];
                 case 1:
                     _a.sent();
-                    setToken(null);
-                    setAccessToken(null);
-                    setIdToken(null);
+                    setToken("");
+                    setAccessToken("");
+                    setIdToken("");
                     setError(null);
                     if (typeof window !== "undefined") {
                         localStorage.removeItem(storageKey);
@@ -16881,9 +16891,9 @@ function useCAMSMSALAuth(options) {
         isAuthenticated: isAuthenticated,
         isLoading: isLoading,
         error: error,
-        token: token,
         idToken: idToken,
         accessToken: accessToken,
+        appCode: appCode,
     };
 }