@nibssplc/cams-sdk-react 1.0.0-rc.67 → 1.0.0-rc.69

package/dist/components/MFAGate.d.ts

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

package/dist/components/UnifiedCAMSProvider.d.ts

@@ -1,7 +1,6 @@
 import React from "react";
 import { PublicClientApplication, Configuration } from "@azure/msal-browser";
 import { UseCAMSAuthOptions } from "../hooks/useCAMSAuth";
-import { UseCAMSMSALAuthOptions } from "../hooks/useCAMSMSALAuth";
 import { useCAMSContext } from "../context/CAMSContext";
 interface BaseProviderProps {
     children: React.ReactNode;
@@ -10,8 +9,9 @@ interface BaseProviderProps {
 interface RegularProviderProps extends BaseProviderProps, Omit<UseCAMSAuthOptions, "appCode"> {
     mode: "REGULAR";
 }
-interface MSALProviderProps extends BaseProviderProps, Omit<UseCAMSMSALAuthOptions, "MFAEndpoint"> {
+interface MSALProviderProps extends BaseProviderProps {
     mode: "MSAL";
+    ValidateUserEndpoint: string;
     msalConfig: Configuration;
     msalInstance?: PublicClientApplication;
     onAuthSuccess?: (tokens: {

package/dist/hooks/useCAMSMSALAuth.d.ts

@@ -1,5 +1,5 @@
 import "../utils/crypto-polyfill";
-import { CAMSError, MFAAuthenticatedResponse } from "@nibssplc/cams-sdk";
+import { CAMSError, type MFAAuthenticatedResponse } from "@nibssplc/cams-sdk";
 export interface UseCAMSMSALAuthOptions {
     onTokenExpired?: () => void;
     scopes?: string[];
@@ -8,7 +8,7 @@ export interface UseCAMSMSALAuthOptions {
     messageOrigin?: string;
     appCode: string;
     allowedOrigins?: string[];
-    MFAEndpoint?: string;
+    ValidateUserEndpoint: string;
     activeCookiePeriod?: number;
 }
 export interface UseCAMSMSALAuthReturn {

package/dist/index.cjs.js

@@ -433,7 +433,7 @@ var deleteCookie = function (name) {
 
 function useCAMSMSALAuth(options) {
     var _this = this;
-    var optStorageKey = options.storageKey, optScopes = options.scopes, prompt = options.prompt, appCode = options.appCode, MFAEndpoint = options.MFAEndpoint, _a = options.activeCookiePeriod, activeCookiePeriod = _a === void 0 ? 1 : _a;
+    var optStorageKey = options.storageKey, optScopes = options.scopes, prompt = options.prompt, appCode = options.appCode, ValidateUserEndpoint = options.ValidateUserEndpoint, _a = options.activeCookiePeriod, activeCookiePeriod = _a === void 0 ? 1 : _a;
     var storageKey = optStorageKey || "CAMS-MSAL-AUTH-SDK";
     var _b = msalReact.useMsal(), instance = _b.instance, inProgress = _b.inProgress, accounts = _b.accounts;
     var account = msalReact.useAccount(accounts[0] || {});
@@ -515,7 +515,7 @@ function useCAMSMSALAuth(options) {
                         accessToken: response.accessToken,
                         idToken: response.idToken,
                         provider: "MSAL",
-                        APIAuthEndpoint: MFAEndpoint,
+                        APIAuthEndpoint: ValidateUserEndpoint,
                     };
                     authenticator = new camsSdk.CAMSMFAAuthenticator();
                     return [4 /*yield*/, authenticator.GetUserMFAConfig(mfaConfig)];
@@ -523,9 +523,9 @@ function useCAMSMSALAuth(options) {
                     userConfig = _b.sent();
                     camsSdk.Logger.debug("MFA Authenticator initialized:", userConfig);
                     console.log("MFA Authenticator initialized:", userConfig);
-                    setRequiresMFA(userConfig.userInfo.isMFAEnabled);
                     // Don't persist as authenticated until MFA is complete
-                    if (typeof window !== "undefined") {
+                    if (typeof window !== "undefined" && userConfig.isValid) {
+                        setRequiresMFA(userConfig.userInfo.isMFAEnabled);
                         localStorage.setItem(storageKey, JSON.stringify({
                             isAuthenticated: false,
                             requiresMFA: userConfig.userInfo.isMFAEnabled,
@@ -560,7 +560,15 @@ function useCAMSMSALAuth(options) {
                 case 5: return [2 /*return*/];
             }
         });
-    }); }, [instance, scopes, prompt, appCode, MFAEndpoint, storageKey, inProgress]);
+    }); }, [
+        instance,
+        scopes,
+        prompt,
+        appCode,
+        ValidateUserEndpoint,
+        storageKey,
+        inProgress,
+    ]);
     var completeMFA = React.useCallback(function (data) { return __awaiter$1(_this, void 0, void 0, function () {
         return __generator$1(this, function (_a) {
             camsSdk.Logger.info("Completed MFA.. Setting State");
@@ -573,7 +581,11 @@ function useCAMSMSALAuth(options) {
                         accessToken: accessToken,
                         idToken: idToken,
                     }));
-                    setCookie("CAMS-MSAL-AUTH-SDK-PROFILE", JSON.stringify({ state: "AUTH_SUCCESS", role: data.data.role, profile: __assign({}, data) }), activeCookiePeriod);
+                    setCookie("CAMS-MSAL-AUTH-SDK-PROFILE", JSON.stringify({
+                        state: "AUTH_SUCCESS",
+                        role: data.userInfo.role,
+                        profile: __assign({}, data),
+                    }), activeCookiePeriod);
                     setRequiresMFA(false);
                     // Set requiresMFA to false after storage update
                     camsSdk.Logger.debug("MFA completed successfully, storage updated", {
@@ -949,8 +961,8 @@ function CAMSProviderCore(props) {
         ? __assign(__assign({}, props), { appCode: appCode })
         : { appCode: "" });
     var msalAuth = useCAMSMSALAuth(mode === "MSAL"
-        ? __assign(__assign({}, props), { appCode: appCode })
-        : { appCode: "" });
+        ? __assign(__assign({}, props), { appCode: appCode, ValidateUserEndpoint: props.ValidateUserEndpoint })
+        : { appCode: "", ValidateUserEndpoint: "" });
     var auth = mode === "REGULAR" ? regularAuth : msalAuth;
     var profileStorageKey = "".concat(auth.storageKey, "-PROFILE");
     var getInitialProfile = function () {
@@ -1580,7 +1592,7 @@ var MFAOptions = function (_a) {
     var _j = useOTPHandler({
         email: ((_c = (_b = context.user) === null || _b === void 0 ? void 0 : _b.profile) === null || _c === void 0 ? void 0 : _c.email) || "",
         appCode: context.appCode || "",
-        MFAEndpoint: MFAEndpoints.ValidateMFA,
+        MFAEndpoint: MFAEndpoints.ValidateUserMFA,
         onAuthComplete: function (state, data) {
             console.log("Completed Auth. Handling MFA", state);
             if (state) {
@@ -1756,13 +1768,13 @@ var DefaultLoginPage = function (_a) {
                 context.requiresMFA = false;
                 context.setUserProfile({
                     state: "AUTH_SUCCESS",
-                    role: data.data.role,
+                    message: data.message,
+                    role: data.userInfo.role,
                     profile: {
-                        id: data.data.id,
-                        name: data.data.name,
-                        email: data.data.email,
-                        isMFAEnabled: data.data.isMFAEnabled,
-                        message: data.message,
+                        id: data.userInfo.id,
+                        name: data.userInfo.name,
+                        email: data.userInfo.email,
+                        isMFAEnabled: data.userInfo.isMFAEnabled,
                         tokens: data.tokens,
                     },
                 });
@@ -1812,7 +1824,8 @@ var ErrorFallback = function (_a) {
 };
 
 var MFAEndpointsSchema = z.object({
-    ValidateMFA: z.url("MFAEndpoint must be a valid URL"),
+    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"),
     RetrieveAuthChallenge: z.url("MFA RetrieveAuthChallenge must be a valid URL"),