ef-keycloak-connect 1.7.8 → 1.7.9

package/README.md

@@ -40,7 +40,6 @@ This adapter is extended from keycloak-connect and have functionalities of both
   - getRealmRoles
   - assignRoleToUser
   - authenticateFinesse
-  - getUserDetailsById
   
 ```
 ### Example
@@ -457,53 +456,5 @@ Response:
      "status": 400,
      "message": "Refresh Token expired, please login again"
    }
-
-### getUserDetailsById( userId )
-
-This function returns user object against given user id. The information contains the details of user except its team and roles. If userId is incorrect then it returns 404 error response.
-
-It takes 1 argument:
-   
-   - userId: The keycloak id of a given user.
-   
-Response:
-
-  - If the userId is valid then a user details object is returned in reponse along with status code 200. 
-
-  ```js
-  {
-    "id": "66498b60-d6d1-45c9-9a04-e8d43f1ce3ce",
-    "createdTimestamp": 1748601962666,
-    "username": "admin",
-    "enabled": true,
-    "totp": false,
-    "emailVerified": false,
-    "firstName": "",
-    "lastName": "",
-    "disableableCredentialTypes": [],
-    "requiredActions": [],
-    "notBefore": 0,
-    "access": {
-        "manageGroupMembership": true,
-        "view": true,
-        "mapRoles": true,
-        "impersonate": true,
-        "manage": true
-    }
-  }
-
- - If userId is incorrect then it returns 404 error response.
- 
- ```js
-   {
-    "error": {
-        "error_message": "User Details API Error: Error occurred while getting user against user id",
-        "error_detail": {
-            "status": 404,
-            "reason": "No user exist in keycloak against given user id: 66498b60-d6d1-45c9-9a04-e8d43f1ce3cd"
-        }
-    }
-  }
-
       
        

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ef-keycloak-connect",
-  "version": "1.7.8",
+  "version": "1.7.9",
   "description": "Node JS keycloak adapter for authentication and authorization.",
   "main": "index.js",
   "scripts": {

package/services/keycloakService.js

@@ -47,7 +47,7 @@ class KeycloakService extends Keycloak {
       let attributesFromToken = token.keycloak_User.attributes
 
       if ( is2FAEnabled ) {     // if 2FA is enabled then running the 2FA flow
-        if ( !twoFAChannel || twoFAChannel == '' || ( twoFAChannel !== 'app' && twoFAChannel !== 'sms' ) ) {
+        if ( !twoFAChannel || twoFAChannel == '' || ( twoFAChannel !== 'app' && twoFAChannel !== 'sms' && twoFAChannel !== 'rsa' ) ) {
           return Promise.reject( { status: 400, error_message: 'twoFAChannel parameter is empty or invalid' } )
         }
 
@@ -59,25 +59,42 @@ class KeycloakService extends Keycloak {
         // checking if user attributes in keycloak exist or not to confirm 2FA registration
         if ( !attributesFromToken || !attributesFromToken.is2FARegistered || attributesFromToken.is2FARegistered == 'false' ) {
 
+          // getting admin access token to update the user attributes for RSA & Auht Apps
+          const adminData = await this.getAccessToken( keycloakConfig.USERNAME_ADMIN, keycloakConfig.PASSWORD_ADMIN );
+          const adminToken = adminData.access_token;
+
           // appending extra information regarding 2FA in response object
           tempToken.is2FARegistered = false
           tempToken.twoFAChannel = twoFAChannel
           tempToken.message = "2FA registration required"
 
+          // handling RSA authenticator scenario exclusively
+          if ( twoFAChannel === 'rsa' ) {
+
+            tempToken.is2FARegistered = true;
+            tempToken.message = "OTP required.";
+
+            //updating user attributes for RSA MFA
+            let newAttributes = {};
+            if ( attributesFromToken ) newAttributes = attributesFromToken;
+            newAttributes.twoFAChannel = "rsa";
+            newAttributes.is2FARegistered = true;
+
+            await this.updateUserAttributes( adminToken, token.keycloak_User.id, newAttributes );
+          }
+
           // if 2FA is required through authenticator app then performing necessary operation in keycloak user attributes
-          if ( twoFAChannel == 'app' ) {
+          else if ( twoFAChannel == 'app' ) {
+
             // QR Code and Secret Code generation based on username
             const qrSetup = await this.getQRCode( user_name )
             if ( qrSetup ) {
+
               tempToken.otpSecret = qrSetup.secret
               tempToken.qrImage = qrSetup.image
             }
             else return Promise.reject( { error: 404, error_message: 'Error occurred while generating QR code.' } )
 
-            // getting admin access token to update the user attributes
-            const adminData = await this.getAccessToken( keycloakConfig.USERNAME_ADMIN, keycloakConfig.PASSWORD_ADMIN )
-            const adminToken = adminData.access_token
-
             //updating user attributes for 2FA
             let newAttributes = {}
             if ( attributesFromToken ) newAttributes = attributesFromToken
@@ -88,11 +105,10 @@ class KeycloakService extends Keycloak {
             // saving the Secret Code into KeyCloak as user attribute to validate the OTP on each login
             await this.updateUserAttributes( adminToken, token.keycloak_User.id, newAttributes )
           }
-        }
-        else if ( attributesFromToken.is2FARegistered[ 0 ] == 'true' ) {     // if user has already registered for 2FA
+        } else if ( attributesFromToken.is2FARegistered[ 0 ] == 'true' ) {     // if user has already registered for 2FA
           tempToken.is2FARegistered = true
           tempToken.twoFAChannel = attributesFromToken.twoFAChannel[ 0 ]
-          tempToken.message = "OTP required"
+          tempToken.message = "OTP required."
 
           if ( attributesFromToken.twoFAChannel[ 0 ] == 'sms' ) {
             if ( !attributesFromToken.phoneNumber ) {
@@ -257,7 +273,6 @@ class KeycloakService extends Keycloak {
     } );
   }
 
-
   // function for getting user details against user id (and extracting attributes)
   async getUserDetailsById( userId ) {
 
@@ -557,6 +572,47 @@ class KeycloakService extends Keycloak {
         }
       }
 
+      // running OTP validation flow for RSA Authenticator
+      else if ( userAttributes.twoFAChannel[ 0 ] === 'rsa' ) {
+        // setting up SecurID API for MFA
+        let URL = keycloakConfig.RSA_Server_URL + "mfa/v1_1/authn/initialize";
+
+        // configuring headers & payload
+        let config = {
+          method: "post",
+          url: URL,
+          headers: {
+            "Content-Type": "application/json",
+            "client-key": keycloakConfig.RSA_Client_Key,
+          },
+          data: {
+            clientId: keycloakConfig.RSA_Client_ID,
+            subjectName: username,
+            subjectCredentials: [
+              {
+                methodId: "SECURID",
+                collectedInputs: [ { name: "SECURID", value: otpToValidate } ],
+              },
+            ],
+            context: {
+              authnAttemptId: "",
+              messageId: username + "2faAttempt",
+              inResponseTo: "",
+            },
+          },
+        };
+
+        try {
+          let verificationStatus = await requestController.httpRequest( config, false );
+          if ( verificationStatus.status !== 200 || !verificationStatus.data || ( verificationStatus.data.attemptResponseCode !== 'SUCCESS' && verificationStatus.data.attemptReasonCode !== 'CREDENTIAL_VERIFIED' ) ) {
+            throw false
+          }
+        }
+        catch ( err ) {
+          return Promise.reject( { error: 400, error_message: "Error occured while verifying token from RSA SecurID. This may be due to invalid token, invalid configurations or some issue with SecurID." } )
+        }
+
+      }
     }
     else return Promise.reject( { error: 400, error_message: 'Error occurred while fetching user attributes.' } )
 
@@ -596,9 +652,9 @@ class KeycloakService extends Keycloak {
         data: {
           username: user_name,
           password: user_password,
-          client_id: keycloakConfig.CLIENT_ID,
-          client_secret: keycloakConfig.credentials.secret,
-          grant_type: keycloakConfig.GRANT_TYPE,
+          client_id: keycloakConfig?.CLIENT_ID,
+          client_secret: keycloakConfig?.credentials?.secret,
+          grant_type: keycloakConfig?.GRANT_TYPE,
         },
 
       };
@@ -608,9 +664,10 @@ class KeycloakService extends Keycloak {
         //  T.O.K.E.N   R.E.Q.U.E.S.T   # 1   ( P.E.R.M.I.S.S.I.O.N.S   N.O.T    I.N.C.L.U.D.E.D)
         let tokenResponse = await requestController.httpRequest( config, true );
 
-        if ( tokenResponse.data.access_token ) {
+        if ( tokenResponse?.data?.access_token ) {
 
-          token = tokenResponse.data.access_token;
+          token = tokenResponse?.data?.access_token;
+          refresh_token = tokenResponse?.data?.refresh_token;
 
           //To fetch introspect token to handle errors.
           let config_introspect = { ...config };
@@ -624,13 +681,13 @@ class KeycloakService extends Keycloak {
 
             let intro_token_response = await requestController.httpRequest( config_introspect, true );
 
-            if ( Object.keys( intro_token_response.data ).length > 0 ) {
+            if ( Object.keys( intro_token_response?.data ).length > 0 ) {
 
               try {
 
                 let config1 = { ...config };
-                config1.data.username = keycloakConfig.USERNAME_ADMIN;
-                config1.data.password = keycloakConfig.PASSWORD_ADMIN;
+                config1.data.username = keycloakConfig?.USERNAME_ADMIN;
+                config1.data.password = keycloakConfig?.PASSWORD_ADMIN;
                 delete config1.data.token;
 
                 config1.url = keycloakConfig[ "auth-server-url" ] + "realms/" + realm_name + "/protocol/openid-connect/token";
@@ -639,7 +696,7 @@ class KeycloakService extends Keycloak {
 
                 if ( adminTokenResponse.data.access_token ) {
 
-                  let admin_token = adminTokenResponse.data.access_token;
+                  let admin_token = adminTokenResponse?.data?.access_token;
 
                   try {
 
@@ -655,18 +712,18 @@ class KeycloakService extends Keycloak {
                       responseObject = {
 
                         id: getuserDetails.data[ 0 ].id,
-                        firstName: getuserDetails.data[ 0 ].firstName ? getuserDetails.data[ 0 ].firstName : "",
-                        lastName: getuserDetails.data[ 0 ].lastName ? getuserDetails.data[ 0 ].lastName : "",
-                        username: getuserDetails.data[ 0 ].username,
-                        roles: ( 'realm_access' in intro_token_response.data && 'roles' in intro_token_response.data.realm_access ) ? intro_token_response.data.realm_access.roles : [],
+                        firstName: getuserDetails?.data[ 0 ]?.firstName ? getuserDetails.data[ 0 ]?.firstName : "",
+                        lastName: getuserDetails?.data[ 0 ]?.lastName ? getuserDetails.data[ 0 ]?.lastName : "",
+                        username: getuserDetails?.data[ 0 ]?.username,
+                        roles: ( 'realm_access' in intro_token_response.data && 'roles' in intro_token_response?.data?.realm_access ) ? intro_token_response?.data?.realm_access.roles : [],
                         realm: realm_name,
 
                       };
 
                       //Adding user custom attribute to our token object data.
-                      if ( getuserDetails.data[ 0 ].attributes ) {
+                      if ( getuserDetails?.data[ 0 ]?.attributes ) {
 
-                        responseObject.attributes = getuserDetails.data[ 0 ].attributes;
+                        responseObject.attributes = getuserDetails?.data[ 0 ]?.attributes;
                       } else {
 
                         responseObject.attributes = {};
@@ -678,7 +735,7 @@ class KeycloakService extends Keycloak {
                       //Fetching Groups data for each user.
                       try {
 
-                        let teamData = await this.getUserSupervisedGroups( responseObject.id, admin_token, type );
+                        let teamData = await this.getUserSupervisedGroups( responseObject?.id, responseObject?.username, admin_token, type, responseObject?.roles );
 
                         //Check for Permission Groups assignment and roles assignment against them
                         const checkUserRoleAndPermissions = this.checkUserRoleAndPermissions( teamData, responseObject );
@@ -696,8 +753,8 @@ class KeycloakService extends Keycloak {
 
                         delete teamData.permissionGroups;
 
-                        responseObject.userTeam = teamData.userTeam;
-                        responseObject.supervisedTeams = teamData.supervisedTeams;
+                        responseObject.userTeam = teamData?.userTeam;
+                        responseObject.supervisedTeams = teamData?.supervisedTeams;
 
                       } catch ( er ) {
 
@@ -752,15 +809,15 @@ class KeycloakService extends Keycloak {
               data: {
                 username: user_name,
                 password: user_password,
-                client_id: keycloakConfig.CLIENT_ID,
-                client_secret: keycloakConfig.credentials.secret,
-                grant_type: keycloakConfig.GRANT_TYPE,
+                client_id: keycloakConfig?.CLIENT_ID,
+                client_secret: keycloakConfig.credentials?.secret,
+                grant_type: keycloakConfig?.GRANT_TYPE,
               },
 
             };
 
             config.data.grant_type = "urn:ietf:params:oauth:grant-type:uma-ticket";
-            config.data.audience = keycloakConfig.CLIENT_ID;
+            config.data.audience = keycloakConfig?.CLIENT_ID;
             config.headers.Authorization = "Bearer " + token;
 
             //  T.O.K.E.N   R.E.Q.U.E.S.T   # 2   (A.C.C.E.S.S   T.O.K.E.N   W.I.T.H   P.E.R.M.I.S.S.I.O.N.S)
@@ -769,12 +826,11 @@ class KeycloakService extends Keycloak {
               let rptResponse = await requestController.httpRequest( config, true );
 
               if ( rptResponse.data.access_token ) {
-                token = rptResponse.data.access_token;
-                refresh_token = rptResponse.data.refresh_token;
+                let rpt_token = rptResponse?.data?.access_token;
 
                 let userToken = token;
-                config.data.grant_type = keycloakConfig.GRANT_TYPE;
-                config.data.token = token;
+                config.data.grant_type = keycloakConfig?.GRANT_TYPE;
+                config.data.token = rpt_token;
                 URL = URL + "/introspect";
                 config.url = URL;
 
@@ -782,10 +838,10 @@ class KeycloakService extends Keycloak {
                 try {
 
                   let intrsopectionResponse = await requestController.httpRequest( config, true );
-                  intrsopectionResponse.data.access_token = token;
+                  intrsopectionResponse.data.access_token = rpt_token;
 
                   responseObject.permittedResources = {
-                    Resources: ( intrsopectionResponse.data.authorization.permissions.length > 0 ) ? intrsopectionResponse.data.authorization.permissions : []
+                    Resources: ( intrsopectionResponse?.data?.authorization?.permissions?.length > 0 ) ? intrsopectionResponse?.data?.authorization?.permissions : []
                   }
 
                   //  T.O.K.E.N   R.E.Q.U.E.S.T   # 4   ( A.D.M.I.N.  T.O.K.E.N)
@@ -1709,7 +1765,7 @@ class KeycloakService extends Keycloak {
     } );
   }
 
-  async getUserSupervisedGroups( userId, adminToken, type ) {
+  async getUserSupervisedGroups( userId, username, adminToken, type, roles ) {
 
     return new Promise( async ( resolve, reject ) => {
 
@@ -1734,7 +1790,7 @@ class KeycloakService extends Keycloak {
         try {
 
           let userTeams = await requestController.httpRequest( config, true );
-          const { userTeam, supervisedTeams } = userTeams.data;
+          const { userTeam, supervisedTeams } = userTeams?.data;
 
           if ( Object.keys( userTeam ).length == 0 && type != 'CX' ) {
             reject( {
@@ -1746,15 +1802,27 @@ class KeycloakService extends Keycloak {
             } );
           }
 
+          // Only add teams where user is actually supervisor
+          const filteredSupervisedTeams = supervisedTeams.filter(
+            team =>
+              // Condition 1: Check if user is the primary supervisor
+              team?.supervisor_Id === userId ||
+              // Condition 2: Check if user is in the secondary supervisors array
+              ( team?.secondarySupervisors || [] ).some( supervisor => supervisor?.username === username )
+          );
+
           team.userTeam = userTeam;
-          team.supervisedTeams = supervisedTeams;
+          team.supervisedTeams = filteredSupervisedTeams;
 
         } catch ( er ) {
 
-          error = await errorService.handleError( er );
+          if ( !roles.includes( "admin" ) ) {
 
-          // Log the error and proceed with default values
-          console.error( "User Team Fetch Error: An error occurred while fetching the user's team:", error );
+            error = await errorService.handleError( er );
+
+            // Log the error and proceed with default values
+            console.error( "User Team Fetch Error: An error occurred while fetching the user's team:", error );
+          }
 
         }
 
@@ -1769,15 +1837,15 @@ class KeycloakService extends Keycloak {
 
           if ( userGroup.data.length != 0 ) {
 
-            let groups = userGroup.data;
-            let permissionGroups = groups.filter( group => group.name.includes( "_permission" ) );
+            let groups = userGroup?.data;
+            let permissionGroups = groups.filter( group => group?.name.includes( "_permission" ) );
 
             if ( permissionGroups.length > 0 ) {
 
               team.permissionGroups = [];
 
               permissionGroups.forEach( perGroup => {
-                team.permissionGroups.push( perGroup.name );
+                team.permissionGroups.push( perGroup?.name );
               } );
             }
 
@@ -2759,13 +2827,12 @@ class KeycloakService extends Keycloak {
     } );
   }
 
-  //Create a Finesse user during login.
   async createUser( userObject, token ) {
 
     let assignRole = [];
     let assignGroups = [];
 
-    assignGroups = userObject.roles.includes( "supervisor" ) ? [ "agents_permission", "senior_agents_permission" ] : [ "agents_permission" ];
+    assignGroups = userObject?.roles.includes( "supervisor" ) ? [ "agents_permission", "senior_agents_permission" ] : [ "agents_permission" ];
 
 
     return new Promise( async ( resolve, reject ) => {
@@ -2774,20 +2841,20 @@ class KeycloakService extends Keycloak {
 
       let data = {
 
-        username: userObject.username,
-        firstName: userObject.firstName,
-        lastName: userObject.lastName,
+        username: userObject?.username,
+        firstName: userObject?.firstName,
+        lastName: userObject?.lastName,
         enabled: true,
         credentials: [
           {
             type: "password",
-            value: userObject.password,
+            value: userObject?.password,
             temporary: false,
           },
         ],
         attributes: {
-          "user_name": `${userObject.loginName}`,
-          "extension": `${userObject.extension}`
+          "user_name": `${userObject?.loginName}`,
+          "extension": `${userObject?.extension}`
         },
         groups: assignGroups
       };
@@ -2809,18 +2876,18 @@ class KeycloakService extends Keycloak {
         let newUser = await requestController.httpRequest( config, false );
 
         //Get the user id at time of creation
-        let userLocation = newUser.headers.location;
+        let userLocation = newUser?.headers?.location;
         let userLocationSplit = userLocation.split( "/" );
-        let userId = userLocationSplit[ userLocationSplit.length - 1 ];
+        let userId = userLocationSplit[ userLocationSplit?.length - 1 ];
 
         //Get list of all the roles in keycloak realm
         /* Storing all the realm roles in Global realmRoles list.If some role come from finesse which doesn't
         exist in realmRoles list then we call keycloak roles api again to update realmRoles list. */
-        if ( userObject.roles != [] ) {
+        if ( userObject?.roles != [] ) {
 
           if ( realmRoles.length > 0 ) {
 
-            let check = checkForMissingRole( realmRoles, userObject.roles );
+            let check = checkForMissingRole( realmRoles, userObject?.roles );
 
             if ( !check ) {
 
@@ -2835,13 +2902,13 @@ class KeycloakService extends Keycloak {
           //checking whether role exist in realmRoles object array:
           for ( let role of realmRoles ) {
 
-            userObject.roles.forEach( ( userRole ) => {
+            userObject?.roles?.forEach( ( userRole ) => {
 
-              if ( role.name == userRole.toLocaleLowerCase() ) {
+              if ( role?.name == userRole.toLocaleLowerCase() ) {
 
                 assignRole.push( {
-                  id: role.id,
-                  name: role.name,
+                  id: role?.id,
+                  name: role?.name,
                 } );
               }
             } );
@@ -2865,7 +2932,7 @@ class KeycloakService extends Keycloak {
         }
 
 
-        let ciscoTeamId = userObject.group.id;
+        let ciscoTeamId = userObject?.group?.id;
 
         //Check whether team of Agent already exists in CX Core or not
         let URL1 = `${keycloakConfig[ "ef-server-url" ]}team?ids=${ciscoTeamId}`;
@@ -2901,14 +2968,14 @@ class KeycloakService extends Keycloak {
           let createAgentCXTeam;
 
           //This means the team doesn't exist in CX Core. We need to create a team
-          if ( getAgentCXTeam.data.length == 0 ) {
+          if ( getAgentCXTeam?.data.length == 0 ) {
 
             //Setting URL to Create CX team of Agent
             let URL2 = `${keycloakConfig[ "ef-server-url" ]}team`;
 
             let data = {
-              "team_Id": userObject.group.id,
-              "team_name": userObject.group.name,
+              "team_Id": userObject?.group?.id,
+              "team_name": userObject?.group?.name,
               "supervisor_Id": "",
               "source": "CISCO",
               "created_by": "1"
@@ -2940,10 +3007,10 @@ class KeycloakService extends Keycloak {
 
           let data = {
             "id": userId,
-            "username": userObject.username.toLocaleLowerCase(),
-            "firstName": userObject.firstName,
-            "lastName": userObject.lastName,
-            "roles": userObject.roles
+            "username": userObject?.username.toLocaleLowerCase(),
+            "firstName": userObject?.firstName,
+            "lastName": userObject?.lastName,
+            "roles": userObject?.roles
           }
 
           config2.url = URL3;
@@ -2965,11 +3032,11 @@ class KeycloakService extends Keycloak {
           }
 
           //Assign Agent to a team
-          let URL4 = `${keycloakConfig[ "ef-server-url" ]}team/${userObject.group.id}/member`;
+          let URL4 = `${keycloakConfig[ "ef-server-url" ]}team/${userObject?.group?.id}/member`;
 
           data = {
             "type": "agent",
-            "usernames": [ userObject.username.toLocaleLowerCase() ]
+            "usernames": [ userObject?.username.toLocaleLowerCase() ]
           }
 
           config2.url = URL4;
@@ -3004,11 +3071,11 @@ class KeycloakService extends Keycloak {
 
 
 
-        if ( userObject.roles.includes( "supervisor" ) && userObject.supervisedGroups.length > 0 ) {
+        if ( userObject?.roles?.includes( "supervisor" ) && userObject?.supervisedGroups?.length > 0 ) {
 
-          for ( let supervisedGroup of userObject.supervisedGroups ) {
+          for ( let supervisedGroup of userObject?.supervisedGroups ) {
 
-            let supervisorTeamId = supervisedGroup.id;
+            let supervisorTeamId = supervisedGroup?.id;
 
             //Check whether team of Supervisor already exists in CX Core or not
             let URL5 = `${keycloakConfig[ "ef-server-url" ]}team?ids=${supervisorTeamId}`;
@@ -3020,14 +3087,14 @@ class KeycloakService extends Keycloak {
               let getSupervisorCXTeam = await requestController.httpRequest( config1, false );
 
               //This means the team doesn't exist in CX Core. We need to create a team
-              if ( getSupervisorCXTeam.data.length == 0 ) {
+              if ( getSupervisorCXTeam?.data.length == 0 ) {
 
                 //Creating or Updating Supervisor team in CX Core.
                 let URL6 = `${keycloakConfig[ "ef-server-url" ]}team`;
 
                 let data = {
                   "team_Id": supervisorTeamId,
-                  "team_name": supervisedGroup.name,
+                  "team_name": supervisedGroup?.name,
                   "supervisor_Id": userId,
                   "source": "CISCO",
                   "created_by": "1"
@@ -3055,25 +3122,21 @@ class KeycloakService extends Keycloak {
 
               } else {
 
-                console.log( getSupervisorCXTeam.data[ 0 ].supervisor_Id );
-
                 //Adding this supervisor as Secondary Supervisor
-                if ( getSupervisorCXTeam.data[ 0 ].supervisor_Id != null ) {
+                if ( getSupervisorCXTeam?.data[ 0 ]?.supervisor_Id != null ) {
 
                   //Assign Secondary Supervisor to a team
                   let URL7 = `${keycloakConfig[ "ef-server-url" ]}team/${supervisorTeamId}/member`;
 
                   data = {
                     "type": "secondary-supervisor",
-                    "usernames": [ userObject.username.toLocaleLowerCase() ]
+                    "usernames": [ userObject?.username.toLocaleLowerCase() ]
                   }
 
                   config2.method = 'post';
                   config2.url = URL7;
                   config2.data = data;
 
-                  console.log( config2 );
-
                   try {
 
                     //Assigning Secondary Supervisor to CX team
@@ -3096,7 +3159,7 @@ class KeycloakService extends Keycloak {
                   let URL8 = `${keycloakConfig[ "ef-server-url" ]}team/${supervisorTeamId}`;
 
                   let data = {
-                    "team_name": getSupervisorCXTeam.data[ 0 ].team_name,
+                    "team_name": getSupervisorCXTeam?.data[ 0 ]?.team_name,
                     "supervisor_Id": userId
                   }
 
@@ -3186,17 +3249,17 @@ class KeycloakService extends Keycloak {
 
       try {
 
-        let rptToken = await this.getTokenRPT( username, password, keycloakAuthToken.access_token );
-        let introspectToken = await this.getIntrospectToken( rptToken.access_token );
+        let rptToken = await this.getTokenRPT( username, password, keycloakAuthToken?.access_token );
+        let introspectToken = await this.getIntrospectToken( rptToken?.access_token );
 
         let keyObj = {
-          id: introspectToken.sub,
-          username: introspectToken.username,
-          firstName: introspectToken.given_name,
-          lastName: introspectToken.family_name,
-          roles: introspectToken.realm_access.roles,
+          id: introspectToken?.sub,
+          username: introspectToken?.username,
+          firstName: introspectToken?.given_name,
+          lastName: introspectToken?.family_name,
+          roles: introspectToken?.realm_access?.roles,
           permittedResources: {
-            Resources: introspectToken.authorization.permissions,
+            Resources: introspectToken?.authorization?.permissions,
           }
         }
 
@@ -3209,14 +3272,14 @@ class KeycloakService extends Keycloak {
           url: URL,
           headers: {
             "Content-Type": "application/json",
-            Authorization: `Bearer ${keycloakAdminToken.access_token}`,
+            Authorization: `Bearer ${keycloakAdminToken?.access_token}`,
           }
         };
 
         try {
 
           let userDataResponse = await requestController.httpRequest( config, false );
-          userAttributes = userDataResponse.data.attributes;
+          userAttributes = userDataResponse?.data?.attributes;
 
         } catch ( err ) {
 
@@ -3231,21 +3294,21 @@ class KeycloakService extends Keycloak {
         }
 
         //Comparing the basic info of Finesse User and Normal User.
-        if ( ( finObj.username ).toLowerCase() != keyObj.username
-          || finObj.firstName != keyObj.firstName
-          || finObj.lastName != keyObj.lastName
-          || ( userAttributes.user_name && finObj.loginName !== userAttributes.user_name[ 0 ] )
-          || ( userAttributes.extension && finObj.extension !== userAttributes.extension[ 0 ] )
-          || ( !userAttributes.user_name )
+        if ( ( finObj?.username ).toLowerCase() != keyObj?.username
+          || finObj?.firstName != keyObj?.firstName
+          || finObj?.lastName != keyObj?.lastName
+          || ( userAttributes?.user_name && finObj?.loginName !== userAttributes?.user_name[ 0 ] )
+          || ( userAttributes?.extension && finObj?.extension !== userAttributes?.extension[ 0 ] )
+          || ( !userAttributes?.user_name )
         ) {
 
           data = {
-            username: ( finObj.username ).toLowerCase(),
-            firstName: finObj.firstName,
-            lastName: finObj.lastName,
+            username: ( finObj?.username ).toLowerCase(),
+            firstName: finObj?.firstName,
+            lastName: finObj?.lastName,
             attributes: {
-              "user_name": `${finObj.loginName}`,
-              "extension": `${finObj.extension}`
+              "user_name": `${finObj?.loginName}`,
+              "extension": `${finObj?.extension}`
             }
           };
         }
@@ -3281,40 +3344,40 @@ class KeycloakService extends Keycloak {
 
         //Role to Add to keycloak user during Update process.
         //rolesToAdd = finObj.roles.filter( role => !keyObj.roles.includes( role ) );
-        rolesToAdd = finObj.roles;
+        rolesToAdd = finObj?.roles;
 
         //Role to Remove from keycloak user during Update process.
         let ignoreRoles = [ 'offline_access', 'uma_authorization' ];
-        rolesToRemove = keyObj.roles.filter( role => (
-          !finObj.roles.includes( role ) &&
+        rolesToRemove = keyObj?.roles.filter( role => (
+          !finObj?.roles.includes( role ) &&
           !ignoreRoles.includes( role ) &&
           role.indexOf( "default-roles" ) == -1 ) );
 
         //Updating group data in case it is not similar.
-        let finesseGroups = finObj.roles.includes( "supervisor" ) ? [ "agents_permission", "senior_agents_permission" ] : [ "agents_permission" ];
+        let finesseGroups = finObj?.roles.includes( "supervisor" ) ? [ "agents_permission", "senior_agents_permission" ] : [ "agents_permission" ];
 
         try {
 
-          let token = keycloakAdminToken.access_token;
+          let token = keycloakAdminToken?.access_token;
 
           let userGroups = await this.getKeycloakUserGroups( keyObj.id, token );
 
           keycloakGroups = userGroups.map( group => {
             return {
-              id: group.id,
-              name: group.name
+              id: group?.id,
+              name: group?.name
             }
           } );
 
           //find if senior_agents_permission group is assigned to user already against an agent role.
-          let isSeniorAgent = keycloakGroups.some( group => group.name == 'senior_agents_permission' );
+          let isSeniorAgent = keycloakGroups.some( group => group?.name == 'senior_agents_permission' );
 
-          if ( isSeniorAgent && keyObj.roles.includes( 'agent' ) && !finesseGroups.includes( 'senior_agents_permission' ) ) {
+          if ( isSeniorAgent && keyObj?.roles.includes( 'agent' ) && !finesseGroups.includes( 'senior_agents_permission' ) ) {
             finesseGroups.push( 'senior_agents_permission' );
           }
 
-          groupsToAdd = finesseGroups.filter( group => !keycloakGroups.find( keygroup => keygroup.name == group ) );
-          groupsToRemove = keycloakGroups.filter( group => !finesseGroups.includes( group.name ) );
+          groupsToAdd = finesseGroups.filter( group => !keycloakGroups.find( keygroup => keygroup?.name == group ) );
+          groupsToRemove = keycloakGroups.filter( group => !finesseGroups.includes( group?.name ) );
 
           //Adding and Removing Roles from Keycloak
           try {
@@ -3323,12 +3386,12 @@ class KeycloakService extends Keycloak {
               const rolesPromises = [];
 
               if ( rolesToAdd.length > 0 ) {
-                let addRolesPromise = this.addOrRemoveUserRole( keyObj.id, rolesToAdd, 'add', token );
+                let addRolesPromise = this.addOrRemoveUserRole( keyObj?.id, rolesToAdd, 'add', token );
                 rolesPromises.push( addRolesPromise );
               }
 
               if ( rolesToRemove.length > 0 ) {
-                let removeRolesPromise = this.addOrRemoveUserRole( keyObj.id, rolesToRemove, 'remove', token );
+                let removeRolesPromise = this.addOrRemoveUserRole( keyObj?.id, rolesToRemove, 'remove', token );
                 rolesPromises.push( removeRolesPromise );
               }
 
@@ -3343,16 +3406,16 @@ class KeycloakService extends Keycloak {
 
                 //Fetching Ids of all the groups to add to current Keycloak User.
                 groupsToAdd = await this.gettingGroupByGroupName( groupsToAdd, token );
-                await this.addOrRemoveUserGroup( keyObj.id, groupsToAdd, 'add', token );
+                await this.addOrRemoveUserGroup( keyObj?.id, groupsToAdd, 'add', token );
               }
 
               if ( groupsToRemove.length > 0 ) {
 
-                await this.addOrRemoveUserGroup( keyObj.id, groupsToRemove, 'remove', token );
+                await this.addOrRemoveUserGroup( keyObj?.id, groupsToRemove, 'remove', token );
               }
 
               //Checking Agent Case first, if agent team in CX is not same as agent team in finesse then update it
-              let userId = keyObj.id;
+              let userId = keyObj?.id;
               let config1 = {
 
                 method: "get",
@@ -3383,36 +3446,36 @@ class KeycloakService extends Keycloak {
 
                 let userTeams = await requestController.httpRequest( config1, true );
 
-                const { userTeam, supervisedTeams } = userTeams.data;
+                const { userTeam, supervisedTeams } = userTeams?.data;
 
                 let supervisedTeamsFiltered = [];
 
-                if ( supervisedTeams.length > 0 ) {
+                if ( supervisedTeams?.length > 0 ) {
 
                   //Fetching list of all primary and seconday supervised teams of current user (Whether in CX or Cisco)
                   supervisedTeamsFiltered = supervisedTeams.filter( team => {
-                    const isPrimarySupervisor = team.supervisor.username.toLocaleLowerCase() === username.toLocaleLowerCase();
-                    const isSecondarySupervisor = team.secondarySupervisors.some( secSupervisor => secSupervisor.username.toLocaleLowerCase() === username.toLocaleLowerCase() );
+                    const isPrimarySupervisor = team?.supervisor?.username?.toLocaleLowerCase() === username?.toLocaleLowerCase();
+                    const isSecondarySupervisor = team?.secondarySupervisors?.some( secSupervisor => secSupervisor?.username?.toLocaleLowerCase() === username?.toLocaleLowerCase() );
 
                     return isPrimarySupervisor || isSecondarySupervisor;
                   } ).map( team => {
                     let type;
-                    if ( team.supervisor.username.toLocaleLowerCase() === username.toLocaleLowerCase() ) {
+                    if ( team?.supervisor?.username?.toLocaleLowerCase() === username?.toLocaleLowerCase() ) {
                       type = 'supervisor';
-                    } else if ( team.secondarySupervisors.some( secSupervisor => secSupervisor.username.toLocaleLowerCase() === username.toLocaleLowerCase() ) ) {
+                    } else if ( team?.secondarySupervisors?.some( secSupervisor => secSupervisor?.username?.toLocaleLowerCase() === username?.toLocaleLowerCase() ) ) {
                       type = 'secondary supervisor';
                     }
 
-                    return { teamId: team.teamId, teamName: team.teamName, type, source: team.source };
+                    return { teamId: team?.teamId, teamName: team?.teamName, type, source: team?.source };
                   } );
                 }
 
                 //If Agent team in finesse is different from Agent Team in finesse
-                if ( finObj.group.id !== userTeam.teamId ) {
+                if ( finObj?.group?.id !== userTeam?.teamId ) {
 
                   //We have to both add agent to a team corresponding to Finesse and remove it from CX team.
                   //Removing agent from CX team first
-                  let URL3 = `${keycloakConfig[ "ef-server-url" ]}team/${userTeam.teamId}/member?type=agent&usernames=${finObj.username.toLowerCase()}`;
+                  let URL3 = `${keycloakConfig[ "ef-server-url" ]}team/${userTeam?.teamId}/member?type=agent&usernames=${finObj?.username?.toLowerCase()}`;
 
                   config1.method = 'delete';
                   config1.url = URL3;
@@ -3446,14 +3509,14 @@ class KeycloakService extends Keycloak {
                     let createAgentCXTeam;
 
                     //This means the team doesn't exist in CX Core. We need to create a team
-                    if ( getAgentCXTeam.data.length == 0 ) {
+                    if ( getAgentCXTeam?.data?.length == 0 ) {
 
                       //Setting URL to Create CX team of Agent
                       let URL5 = `${keycloakConfig[ "ef-server-url" ]}team`;
 
                       let data = {
-                        "team_Id": finObj.group.id,
-                        "team_name": finObj.group.name,
+                        "team_Id": finObj?.group?.id,
+                        "team_name": finObj?.group?.name,
                         "supervisor_Id": "",
                         "source": "CISCO",
                         "created_by": "1"
@@ -3485,7 +3548,7 @@ class KeycloakService extends Keycloak {
 
                     data = {
                       "type": "agent",
-                      "usernames": [ finObj.username.toLowerCase() ]
+                      "usernames": [ finObj?.username?.toLowerCase() ]
                     }
 
                     config2.url = URL6;
@@ -3520,16 +3583,16 @@ class KeycloakService extends Keycloak {
                 }
 
                 //If no team is assigned to supervise to current user in Cisco, remove its all supervised teams from CX
-                if ( !finObj.supervisedGroups && supervisedTeamsFiltered.length > 0 ) {
+                if ( !finObj?.supervisedGroups && supervisedTeamsFiltered.length > 0 ) {
 
                   for ( let supervisedTeam of supervisedTeamsFiltered ) {
 
-                    if ( supervisedTeam.source === 'CISCO' ) {
+                    if ( supervisedTeam?.source === 'CISCO' ) {
 
-                      if ( supervisedTeam.type === 'secondary supervisor' ) {
+                      if ( supervisedTeam?.type === 'secondary supervisor' ) {
 
                         //Removing user from Secondary Supervisor in CX Core
-                        let URL13 = `${keycloakConfig[ "ef-server-url" ]}team/${supervisedTeam.teamId}/member?type=secondary-supervisor&usernames=${finObj.username.toLowerCase()}`;
+                        let URL13 = `${keycloakConfig[ "ef-server-url" ]}team/${supervisedTeam.teamId}/member?type=secondary-supervisor&usernames=${finObj?.username?.toLowerCase()}`;
 
                         config2.method = 'delete';
                         config2.url = URL13;
@@ -3554,10 +3617,10 @@ class KeycloakService extends Keycloak {
                       } else {
 
                         //Removing user from Supervising team in CX Core or not
-                        let URL7 = `${keycloakConfig[ "ef-server-url" ]}team/${supervisedTeam.teamId}`;
+                        let URL7 = `${keycloakConfig[ "ef-server-url" ]}team/${supervisedTeam?.teamId}`;
 
                         let data = {
-                          "team_name": supervisedTeam.teamName,
+                          "team_name": supervisedTeam?.teamName,
                           "supervisor_Id": null
                         }
 
@@ -3588,22 +3651,22 @@ class KeycloakService extends Keycloak {
 
                 //Supervisor Case. Filtering out teams to add and teams to remove from Supervisor
                 //First check that We have supervised Groups in finesse
-                if ( finObj.supervisedGroups ) {
+                if ( finObj?.supervisedGroups ) {
 
-                  let finesseSupervisedGroups = finObj.supervisedGroups;
+                  let finesseSupervisedGroups = finObj?.supervisedGroups;
 
                   // Fetching All the ids of CX Supervised Teams of current Supervisor
-                  const teamIdsInSupervisedTeams = new Set( supervisedTeamsFiltered.map( team => team.teamId ) );
+                  const teamIdsInSupervisedTeams = new Set( supervisedTeamsFiltered.map( team => team?.teamId ) );
 
                   // Teams in which we need to add current user as Supervisor
-                  const teamsToAddInCX = finesseSupervisedGroups.filter( item => !teamIdsInSupervisedTeams.has( item.id ) );
+                  const teamsToAddInCX = finesseSupervisedGroups.filter( item => !teamIdsInSupervisedTeams.has( item?.id ) );
 
                   if ( teamsToAddInCX.length > 0 ) {
 
                     //Adding current user as supervisor in all the given teamsToAddInCX teams.
                     for ( let teamToAdd of teamsToAddInCX ) {
 
-                      let supervisorTeamId = teamToAdd.id;
+                      let supervisorTeamId = teamToAdd?.id;
 
                       //Check whether team of Supervisor already exists in CX Core or not
                       let URL8 = `${keycloakConfig[ "ef-server-url" ]}team?ids=${supervisorTeamId}`;
@@ -3622,7 +3685,7 @@ class KeycloakService extends Keycloak {
 
                           let data = {
                             "team_Id": supervisorTeamId,
-                            "team_name": teamToAdd.name,
+                            "team_name": teamToAdd?.name,
                             "supervisor_Id": userId,
                             "source": "CISCO",
                             "created_by": "1"
@@ -3651,14 +3714,14 @@ class KeycloakService extends Keycloak {
                         } else {
 
                           //If the supervisor is already assigned to team, add current user as secondary supervisor.
-                          if ( getSupervisorCXTeam.data[ 0 ].supervisor_Id != null ) {
+                          if ( getSupervisorCXTeam?.data[ 0 ]?.supervisor_Id != null ) {
 
                             //Assign Agent to a team
                             let URL10 = `${keycloakConfig[ "ef-server-url" ]}team/${supervisorTeamId}/member`;
 
                             data = {
                               "type": "secondary-supervisor",
-                              "usernames": [ finObj.username.toLowerCase() ]
+                              "usernames": [ finObj?.username?.toLowerCase() ]
                             }
 
                             config2.method = 'post';
@@ -3730,10 +3793,10 @@ class KeycloakService extends Keycloak {
 
 
                   // Fetching All the ids of Finesse Supervised Teams of current Supervisor
-                  const idsInFinesseSupervisedGroups = new Set( finesseSupervisedGroups.map( item => item.id ) );
+                  const idsInFinesseSupervisedGroups = new Set( finesseSupervisedGroups.map( item => item?.id ) );
 
                   // Teams in which we need to remove current user as Supervisor
-                  const teamsToRemoveFromCX = supervisedTeamsFiltered.filter( team => !idsInFinesseSupervisedGroups.has( team.teamId ) );
+                  const teamsToRemoveFromCX = supervisedTeamsFiltered.filter( team => !idsInFinesseSupervisedGroups.has( team?.teamId ) );
 
                   //Removing teams that Supervisor is not supervising anymore in finesse.
                   if ( teamsToRemoveFromCX.length > 0 ) {
@@ -3741,12 +3804,12 @@ class KeycloakService extends Keycloak {
                     for ( let supervisedTeam of teamsToRemoveFromCX ) {
 
                       //Only removing user from supervising teams that are from Cisco
-                      if ( supervisedTeam.source === 'CISCO' ) {
+                      if ( supervisedTeam?.source === 'CISCO' ) {
 
-                        if ( supervisedTeam.type === 'secondary supervisor' ) {
+                        if ( supervisedTeam?.type === 'secondary supervisor' ) {
 
                           //Removing user from Secondary Supervisor in CX Core
-                          let URL11 = `${keycloakConfig[ "ef-server-url" ]}team/${supervisedTeam.teamId}/member?type=secondary-supervisor&usernames=${finObj.username.toLowerCase()}`;
+                          let URL11 = `${keycloakConfig[ "ef-server-url" ]}team/${supervisedTeam?.teamId}/member?type=secondary-supervisor&usernames=${finObj?.username?.toLowerCase()}`;
 
                           config2.method = 'delete';
                           config2.url = URL11;
@@ -3771,10 +3834,9 @@ class KeycloakService extends Keycloak {
                         } else {
 
                           //Removing user from Supervising team in CX Core
-                          let URL12 = `${keycloakConfig[ "ef-server-url" ]}team/${supervisedTeam.teamId}`;
-
+                          let URL12 = `${keycloakConfig[ "ef-server-url" ]}team/${supervisedTeam?.teamId}`;
                           let data = {
-                            "team_name": supervisedTeam.teamName,
+                            "team_name": supervisedTeam?.teamName,
                             "supervisor_Id": null
                           }