Commit 032148ba authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Minor changes

parent ac7b3dc1

gms/src/main/java/it/inaf/ia2/gms/authn/OAuth2Config.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -3,7 +3,6 @@ package it.inaf.ia2.gms.authn; 
import java.util.List;

import java.util.List;

import org.springframework.beans.factory.ObjectProvider;

import org.springframework.beans.factory.ObjectProvider;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso;

import org.springframework.boot.autoconfigure.security.oauth2.resource.DefaultUserInfoRestTemplateFactory;

import org.springframework.boot.autoconfigure.security.oauth2.resource.DefaultUserInfoRestTemplateFactory;

import org.springframework.boot.autoconfigure.security.oauth2.resource.UserInfoRestTemplateCustomizer;

import org.springframework.boot.autoconfigure.security.oauth2.resource.UserInfoRestTemplateCustomizer;

import org.springframework.boot.autoconfigure.security.oauth2.resource.UserInfoRestTemplateFactory;

import org.springframework.boot.autoconfigure.security.oauth2.resource.UserInfoRestTemplateFactory;
@@ -22,7 +21,6 @@ import org.springframework.security.oauth2.provider.token.RemoteTokenServices; 
 * Boot ResourceServerTokenServicesConfiguration.

 * Boot ResourceServerTokenServicesConfiguration.

 */

 */

@Configuration

@Configuration

@EnableOAuth2Sso

public class OAuth2Config extends AuthorizationServerEndpointsConfiguration {

public class OAuth2Config extends AuthorizationServerEndpointsConfiguration {





    @Value("${security.oauth2.resource.jwk.key-set-uri}")

    @Value("${security.oauth2.resource.jwk.key-set-uri}")

gms/src/main/java/it/inaf/ia2/gms/authn/SecurityConfig.java

+4 −3
Original line number Original line Diff line number Diff line 
package it.inaf.ia2.gms.authn;

package it.inaf.ia2.gms.authn;





import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso;

import org.springframework.context.annotation.Configuration;

import org.springframework.context.annotation.Configuration;

import org.springframework.core.annotation.Order;

import org.springframework.security.config.annotation.web.builders.HttpSecurity;

import org.springframework.security.config.annotation.web.builders.HttpSecurity;

import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;

import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;





@Configuration

@Configuration

@Order(1000)

@EnableOAuth2Sso

public class SecurityConfig extends WebSecurityConfigurerAdapter {

public class SecurityConfig extends WebSecurityConfigurerAdapter {





    @Override

    @Override

    protected void configure(HttpSecurity http) throws Exception {

    public void configure(HttpSecurity http) throws Exception {

        super.configure(http);

        http.csrf().disable();

        http.csrf().disable();

    }

    }

}
 
}

gms/src/main/java/it/inaf/ia2/gms/controller/GroupsController.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ public class GroupsController { 
    @Autowired

    @Autowired

    private SessionData session;

    private SessionData session;





    @Autowired

    private UsersService usersService;

    private UsersService usersService;





    @Autowired

    @Autowired

gms/src/main/java/it/inaf/ia2/gms/model/PaginatedData.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ public class PaginatedData<T> { 
        } else {

        } else {

            int firstElementIndex = (currentPage - 1) * pageSize;

            int firstElementIndex = (currentPage - 1) * pageSize;

            int lastElementIndex = Math.min(currentPage * pageSize - 1, totalItems - 1);

            int lastElementIndex = Math.min(currentPage * pageSize - 1, totalItems - 1);

            items = new ArrayList<>(allItems.subList(firstElementIndex, lastElementIndex));

            items = new ArrayList<>(allItems.subList(firstElementIndex, lastElementIndex + 1));

        }

        }





        links = new ArrayList<>();

        links = new ArrayList<>();

gms/src/main/java/it/inaf/ia2/gms/service/GroupsService.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ import java.util.ArrayList; 
import java.util.HashMap;

import java.util.HashMap;

import java.util.Map;

import java.util.Map;

import java.util.UUID;

import java.util.UUID;

import org.springframework.transaction.annotation.Transactional;





@Service

@Service

public class GroupsService {

public class GroupsService {
@@ -47,6 +48,7 @@ public class GroupsService { 
        }

        }

    }

    }





    @Transactional

    public Group addGroup(String parentId, String groupName, User user) {

    public Group addGroup(String parentId, String groupName, User user) {





        Group parent = getGroupById(parentId);

        Group parent = getGroupById(parentId);
@@ -70,6 +72,7 @@ public class GroupsService { 
        return group;

        return group;

    }

    }





    @Transactional

    public List<GroupNode> getSubgroups(Group parent, User user) {

    public List<GroupNode> getSubgroups(Group parent, User user) {





        List<UserGroupPermission> permissions = getAllPermissions(user);

        List<UserGroupPermission> permissions = getAllPermissions(user);
@@ -97,7 +100,7 @@ public class GroupsService { 




        GroupNode groupNode = nodesMap.get(group.getId());

        GroupNode groupNode = nodesMap.get(group.getId());

        if (groupNode == null) {

        if (groupNode == null) {

            return null;

            return new ArrayList<>();

        }

        }

        return groupNode.getPermissions();

        return groupNode.getPermissions();

    }

    }