@nibssplc/cams-sdk-react 1.0.0-rc.70 → 1.0.0-rc.72

package/dist/components/MFAGate.d.ts

@@ -1,6 +1,5 @@
 import z from "zod";
 declare const MFAEndpointsSchema: z.ZodObject<{
-    ValidateUser: z.ZodURL;
     ValidateUserMFA: z.ZodURL;
     RegisterNewChallenge: z.ZodURL;
     RegisterVerify: z.ZodURL;

package/dist/context/CAMSContext.d.ts

@@ -11,6 +11,7 @@ interface RegularCAMSContextValue extends BaseCAMSContextValue, UseCAMSAuthRetur
     authMode: "REGULAR";
 }
 interface MSALCAMSContextValue extends BaseCAMSContextValue, UseCAMSMSALAuthReturn {
+    email: string;
     authMode: "MSAL";
     onAuthSuccess?: (tokens: {
         accessToken: string;

package/dist/hooks/useCAMSMSALAuth.d.ts

@@ -21,6 +21,7 @@ export interface UseCAMSMSALAuthReturn {
     idToken: string;
     accessToken: string;
     appCode: string;
+    email: string;
     requiresMFA: boolean;
     completeMFA: (data: MFAAuthenticatedResponse) => Promise<MFAAuthenticatedResponse>;
     setRequiresMFA: React.Dispatch<React.SetStateAction<boolean>>;

package/dist/index.cjs.js

@@ -440,9 +440,10 @@ function useCAMSMSALAuth(options) {
     var _c = React.useState(null), error = _c[0], setError = _c[1];
     var _d = React.useState(""), idToken = _d[0], setIdToken = _d[1];
     var _e = React.useState(""), accessToken = _e[0], setAccessToken = _e[1];
+    var _f = React.useState(""), email = _f[0], setEmail = _f[1];
     // const [mfaAuthenticator, setMfaAuthenticator] =
     //   useState<CAMSMFAAuthenticator | null>(null);
-    var _f = React.useState(false), requiresMFA = _f[0], setRequiresMFA = _f[1];
+    var _g = React.useState(false), requiresMFA = _g[0], setRequiresMFA = _g[1];
     var isLoading = inProgress !== msalBrowser.InteractionStatus.None;
     var isAuthenticated = !!account && !!accessToken && !requiresMFA;
     var scopes = optScopes || ["openid", "profile", "email"];
@@ -521,17 +522,17 @@ function useCAMSMSALAuth(options) {
                     return [4 /*yield*/, authenticator.GetUserMFAConfig(mfaConfig)];
                 case 3:
                     userConfig = _b.sent();
-                    camsSdk.Logger.debug("MFA Authenticator initialized:", userConfig);
-                    console.log("MFA Authenticator initialized:", userConfig);
+                    camsSdk.Logger.info("MFA Authenticator initialized:", userConfig);
                     // Don't persist as authenticated until MFA is complete
                     if (typeof window !== "undefined" && userConfig.isValid) {
-                        setRequiresMFA(userConfig.userInfo.isMFAEnabled);
                         localStorage.setItem(storageKey, JSON.stringify({
                             isAuthenticated: false,
                             requiresMFA: userConfig.userInfo.isMFAEnabled,
                             accessToken: response.accessToken,
                             idToken: response.idToken,
                         }));
+                        setEmail(userConfig.userInfo.email);
+                        setRequiresMFA(userConfig.userInfo.isMFAEnabled);
                     }
                     return [3 /*break*/, 5];
                 case 4:
@@ -651,6 +652,7 @@ function useCAMSMSALAuth(options) {
         isAuthenticated: isAuthenticated,
         isLoading: isLoading,
         error: error,
+        email: email,
         idToken: idToken,
         accessToken: accessToken,
         appCode: appCode,
@@ -1542,59 +1544,33 @@ var useCredentialsHandler = function (onAuthComplete) {
 };
 
 var MFAOptions = function (_a) {
-    var _b, _c;
+    var _b, _c, _d, _e, _f;
     var onComplete = _a.onComplete, onAuthFailed = _a.onAuthFailed, MFAEndpoints = _a.MFAEndpoints, usePassKey = _a.usePassKey;
-    var _d = React.useState(""), value = _d[0], setValue = _d[1];
-    var _e = React.useState(false), otpVisible = _e[0], setOtpVisible = _e[1];
-    var _f = React.useState(false), showSuccessAnimation = _f[0], setShowSuccessAnimation = _f[1];
-    var _g = React.useState(null), authType = _g[0], setAuthType = _g[1];
+    var _g = React.useState(""), value = _g[0], setValue = _g[1];
+    var _h = React.useState(false), otpVisible = _h[0], setOtpVisible = _h[1];
+    var _j = React.useState(false), showSuccessAnimation = _j[0], setShowSuccessAnimation = _j[1];
+    var _k = React.useState(null), authType = _k[0], setAuthType = _k[1];
     var context = useCAMSContext();
-    var _h = context.authMode === "MSAL" && "sendEmailOTP" in context
+    var _l = context.authMode === "MSAL" && "sendEmailOTP" in context
         ? context
-        : { sendEmailOTP: null, completeMFA: null, logout: function () { return __awaiter$1(void 0, void 0, void 0, function () { return __generator$1(this, function (_a) {
+        : { completeMFA: null, logout: function () { return __awaiter$1(void 0, void 0, void 0, function () { return __generator$1(this, function (_a) {
                 return [2 /*return*/];
-            }); }); } }; _h.sendEmailOTP; var completeMFA = _h.completeMFA, logout = _h.logout;
+            }); }); } }, completeMFA = _l.completeMFA, logout = _l.logout;
     context.authMode === "MSAL" ? context.accessToken : "";
     context.authMode === "MSAL" ? context.idToken : "";
     var authenticate = useWebAuthn().authenticate;
     var authenticator = new camsSdk.CAMSMFAAuthenticator();
-    // const handleFIDOLogin = async () => {
-    //   try {
-    //     // 1. Fetch authentication challenge from your server
-    //     console.log("Requesting authentication challenge from server...");
-    //     const { data: options } = await axiosInstance.post(
-    //       MFAEndpoints.RetrieveAuthChallenge,
-    //       {}
-    //     );
-    //     console.log("Received challenge:", options);
-    //     // 2. Call the SDK to trigger the browser's passkey authentication UI
-    //     console.log("Calling SDK authenticate function...");
-    //     const assertionResponse = await authenticate({
-    //       ...options,
-    //       userVerification: "discouraged",
-    //     });
-    //     console.log(
-    //       "Authentication assertion received from client:",
-    //       assertionResponse
-    //     );
-    //     // 3. Send the assertion back to the server for verification
-    //     console.log("Sending assertion to server for verification...");
-    //     await axiosInstance.post(
-    //       MFAEndpoints.AuthChallengeVerify,
-    //       assertionResponse
-    //     );
-    //     toast.success("🔑 Sign-in successful!");
-    //   } catch (error) {
-    //     console.error("Authentication failed:", error);
-    //     toast.error("❌ Could not sign in.");
-    //   }
-    // };
-    var _j = useOTPHandler({
-        email: ((_c = (_b = context.user) === null || _b === void 0 ? void 0 : _b.profile) === null || _c === void 0 ? void 0 : _c.email) || "",
+    camsSdk.Logger.debug("User context:", {
+        user: context.user,
+        profile: (_b = context.user) === null || _b === void 0 ? void 0 : _b.profile,
+        email: (_d = (_c = context.user) === null || _c === void 0 ? void 0 : _c.profile) === null || _d === void 0 ? void 0 : _d.email,
+    });
+    var _m = useOTPHandler({
+        email: ((_f = (_e = context.user) === null || _e === void 0 ? void 0 : _e.profile) === null || _f === void 0 ? void 0 : _f.email) || context.email,
         appCode: context.appCode || "",
         MFAEndpoint: MFAEndpoints.ValidateUserMFA,
         onAuthComplete: function (state, data) {
-            console.log("Completed Auth. Handling MFA", state);
+            console.log("Completed Auth. Handling MFA", state, data);
             if (state) {
                 // Call completeMFA to update context state
                 if (completeMFA && data) {
@@ -1619,7 +1595,7 @@ var MFAOptions = function (_a) {
                 }
             }
         },
-    }), handleSubmitOTP = _j.handleSubmitOTP, loading = _j.loading, attemptCount = _j.attemptCount, remainingAttempts = _j.remainingAttempts, isMaxAttemptsReached = _j.isMaxAttemptsReached, resetAttempts = _j.resetAttempts;
+    }), handleSubmitOTP = _m.handleSubmitOTP, loading = _m.loading, attemptCount = _m.attemptCount, remainingAttempts = _m.remainingAttempts, isMaxAttemptsReached = _m.isMaxAttemptsReached, resetAttempts = _m.resetAttempts;
     var handleGoBack = function () {
         setAuthType(null);
         setOtpVisible(false);
@@ -1824,7 +1800,6 @@ var ErrorFallback = function (_a) {
 };
 
 var MFAEndpointsSchema = z.object({
-    ValidateUser: z.url("ValidateUser Endpoint must be a valid URL"),
     ValidateUserMFA: z.url("ValidateUser MFA Endpoint must be a valid URL"),
     RegisterNewChallenge: z.url("MFA RegisterNewChallenge must be a valid URL"),
     RegisterVerify: z.url("MFA RegisterVerify must be a valid URL"),
@@ -1838,6 +1813,7 @@ var MFAGate = function (_a) {
     // loginComponent: LoginComponent = DefaultLoginPage,
     usePassKey = _c === void 0 ? false : _c, _d = _a.useADLogin, useADLogin = _d === void 0 ? false : _d, CredentialsAuthEndpoint = _a.CredentialsAuthEndpoint, PassKeysRegisterProps = _a.PassKeysRegisterProps, MFAEndpoints = _a.MFAEndpoints, requiresMFA = _a.requiresMFA, onAuthSuccess = _a.onAuthSuccess, onAuthError = _a.onAuthError;
     var context = useCAMSContext();
+    var _e = React.useState("Loading"), authState = _e[0], setAuthState = _e[1];
     var validatedMFAEndpoints = React.useMemo(function () {
         var parsed = MFAEndpointsSchema.safeParse(MFAEndpoints);
         if (!parsed.success) {
@@ -1882,30 +1858,50 @@ var MFAGate = function (_a) {
         });
     }); }, [context, onAuthError]);
     React.useEffect(function () {
-        if (requiresMFA === false &&
-            "accessToken" in context &&
-            context.accessToken &&
-            "setRequiresMFA" in context) {
-            context.setRequiresMFA(false);
+        if (context.isLoading) {
+            setAuthState("Loading");
+            return;
+        }
+        if (!context.isAuthenticated) {
+            setAuthState("Unauthenticated");
+            return;
         }
-    }, [requiresMFA, context]);
+        // Small delay to ensure all context updates are processed
+        var timer = setTimeout(function () {
+            var shouldRequireMFA = requiresMFA !== null && requiresMFA !== void 0 ? requiresMFA : ("requiresMFA" in context ? context.requiresMFA : false);
+            var accessToken = "accessToken" in context ? context.accessToken : "";
+            if (shouldRequireMFA && accessToken) {
+                setAuthState("MFA_Required");
+            }
+            else {
+                setAuthState("Authenticated");
+            }
+        }, 50);
+        return function () { return clearTimeout(timer); };
+    }, [
+        context.isLoading,
+        context.isAuthenticated,
+        // context["requiresMFA"],
+        requiresMFA,
+        context,
+    ]);
     if (useADLogin && !CredentialsAuthEndpoint)
         return jsxRuntime.jsx(ErrorFallback, { message: "Invalid AD Login Configuration." });
     if (!validatedMFAEndpoints)
         return jsxRuntime.jsx(ErrorFallback, { message: "Invalid MFA Configuration." });
     if (context.authMode !== "MSAL")
         return jsxRuntime.jsx(jsxRuntime.Fragment, { children: children });
-    if (context.isLoading)
-        return fallback;
-    if (!context.isAuthenticated) {
-        var shouldRequireMFA = requiresMFA !== null && requiresMFA !== void 0 ? requiresMFA : ("requiresMFA" in context ? context.requiresMFA : false);
-        var accessToken = "accessToken" in context ? context.accessToken : "";
-        if (shouldRequireMFA && accessToken) {
+    switch (authState) {
+        case "Loading":
+            return fallback;
+        case "MFA_Required":
             return (jsxRuntime.jsx(MFAOptions, { MFAEndpoints: validatedMFAEndpoints, usePassKey: usePassKey, onComplete: handleComplete, onAuthFailed: handleAuthFailed }));
-        }
-        return (jsxRuntime.jsx(DefaultLoginPage, { usePassKey: usePassKey, useADLogin: useADLogin, MFAEndpoints: MFAEndpoints, PassKeysRegisterProps: PassKeysRegisterProps, CredentialsAuthEndpoint: CredentialsAuthEndpoint }));
+        case "Authenticated":
+            return jsxRuntime.jsx(jsxRuntime.Fragment, { children: children });
+        case "Unauthenticated":
+        default:
+            return (jsxRuntime.jsx(DefaultLoginPage, { usePassKey: usePassKey, useADLogin: useADLogin, MFAEndpoints: MFAEndpoints, PassKeysRegisterProps: PassKeysRegisterProps, CredentialsAuthEndpoint: CredentialsAuthEndpoint }));
     }
-    return jsxRuntime.jsx(jsxRuntime.Fragment, { children: children });
 };
 
 exports.CAMSMSALProvider = CAMSMSALProvider;