ef-keycloak-connect 1.5.1 → 1.5.2

package/package.json

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

package/services/keycloakService.js

@@ -171,8 +171,9 @@ class KeycloakService extends Keycloak {
 
                                             //Fetching Groups data for each user.
                                             try {
-
+                                                let permissions = intrsopectionResponse.data.authorization.permissions;
                                                 let teamData = await this.getUserSupervisedGroups(responseObject.id, responseObject.username);
+                                                //let teamData = await this.getUserSupervisedGroups(responseObject.id, permissions);
                                                 responseObject.userTeam = teamData.userTeam;
                                                 responseObject.supervisedTeams = teamData.supervisedTeams;
 
@@ -796,6 +797,147 @@ class KeycloakService extends Keycloak {
 
     }
 
+    
+    //function to be used only in teams implementation, this function contains teams implementation with permissions/policies
+    /*
+    async getUserSupervisedGroups(userId, permissions) {
+
+        return new Promise(async (resolve, reject) => {
+
+            let error;
+            let token;
+            var URL = keycloakConfig["auth-server-url"] + 'realms/' + keycloakConfig.realm + '/protocol/openid-connect/token';
+
+            try {
+
+                var config = {
+                    method: 'post',
+                    url: URL,
+                    headers: {
+                        'Accept': 'application/json',
+                        'cache-control': 'no-cache',
+                        'Content-Type': 'application/x-www-form-urlencoded'
+                    },
+                    data: {
+                        client_id: keycloakConfig.CLIENT_ID,
+                        username: keycloakConfig.USERNAME_ADMIN,
+                        password: keycloakConfig.PASSWORD_ADMIN,
+                        grant_type: keycloakConfig.GRANT_TYPE,
+                        client_secret: keycloakConfig.credentials.secret
+                    }
+                };
+
+                try {
+
+                    let adminTokenResponse = await requestController.httpRequest(config, true);
+                    token = adminTokenResponse.data.access_token;
+
+                    config.method = 'get';
+                    delete config.data;
+                    delete config.url;
+
+                    let URL2 = keycloakConfig["auth-server-url"] + 'admin/realms/' + keycloakConfig.realm + '/users/' + userId + '/groups';
+                    config.url = URL2;
+                    config.headers.Authorization = 'Bearer ' + token;
+
+                    try {
+
+                        let userGroup = await requestController.httpRequest(config, true);
+                        let team = {};
+
+                        if (userGroup.data.length != 0) {
+
+
+                            let groups = userGroup.data;
+                            let userTeam = {};
+
+                            let filteredTeams = groups.filter(group => !group.name.includes('_permission'));
+
+                            if (filteredTeams.length > 0) {
+
+                                userTeam = {
+                                    'teamId': filteredTeams[0].id,
+                                    'teamName': filteredTeams[0].name
+                                }
+
+                                team.userTeam = userTeam;
+
+                                config.method = 'get';
+                                delete config.data;
+                                delete config.url;
+
+
+                                let teamPermission = permissions.filter(permission => permission.rsname == 'teams-dashboard');
+                                team.supervisedTeams = [];
+
+                                if (teamPermission.length > 0) {
+
+                                    let permissionScopes = teamPermission[0].scopes;
+
+                                    for (let scope of permissionScopes) {
+                                        let teamName = scope.split('-group');
+
+                                        let URL3 = keycloakConfig["auth-server-url"] + 'admin/realms/' + keycloakConfig.realm + '/groups?search=' + teamName[0] + '&exact=true';
+                                        config.url = URL3
+
+                                        try {
+                                            let groupData = await requestController.httpRequest(config, true);
+
+                                            if (groupData.data.length > 0) {
+
+                                                let supervisedTeam = {
+                                                    'teamId': groupData.data[0].id,
+                                                    'teamName': groupData.data[0].name
+                                                }
+
+                                                team.supervisedTeams.push(supervisedTeam);
+                                            }
+                                        } catch {
+                                            error = await this.checkErrorType(er);
+                                            reject(error);
+                                        }
+                                    }
+
+                                    resolve(team);
+
+                                } else {
+                                    resolve(team);
+                                }
+
+                            } else {
+                                reject({
+                                    status: 403,
+                                    errorMessage: 'No Teams group assigned to User, please assign one Team to user. If user has no team then assign it default group.'
+                                });
+                            }
+                        } else {
+
+                            team.userTeam = {};
+                            team.supervisedTeams = [];
+
+                            resolve(team);
+                        }
+
+                    } catch (er) {
+
+                        error = await this.checkErrorType(er);
+                        reject(error);
+                    }
+                } catch (er) {
+
+                    error = await this.checkErrorType(er);
+                    reject(error);
+                }
+            } catch (er) {
+
+                error = await this.checkErrorType(er);
+                reject(error);
+            };
+        });
+
+    }
+    */
+
     //function to be used only in teams implementation
     async getTeamUsers(keycloakObj, groupsIdsArr, userToken) {
 
@@ -1090,14 +1232,22 @@ class KeycloakService extends Keycloak {
 
                         } catch (err) {
 
-                            if (err.response) {
+                            if (err.response && err.response.status !== 404) {
+
                                 reject({
                                     status: err.response.status,
                                     errorMessage: err.response.data
                                 });
-                            }
 
-                            reject(err);
+                            } else if(err.message){
+
+                                if(err.message !== 'Request failed with status code 404'){
+                                    reject(err);
+                                }
+                                
+                            }else{
+                                continue;
+                            }
 
                         }