Project

General

Profile

« Previous | Next » 

Revision 48551

Added by Argiro Kokogiannaki almost 7 years ago

change the roles | handle common roles with openminted | change role parsing

View differences:

modules/uoa-claims-api/trunk/src/main/java/eu/dnetlib/openaire/rest/inputHandler/UserHandler.java
77 77 
        try {
78 78 
            userInfo = gson.fromJson(br, UserInfo.class);
79 79 
        }catch(Exception e){
80 
            logger.debug("Error in parsing json response. Given json is : "+json);
80 
            logger.debug("Error in parsing json response. Given json is : "+json, e);
81 81 
            return null;
82 82 
        }
83 
        logger.debug("Original response : "+userInfo.toString());
84 83 

  		




  
  84
  
    
        logger.debug("Original response.........: "+userInfo.toString());


  		




  
  85
  
    
        try {


  		




  85
  86
  
    
        if(userInfo != null && userInfo.getEdu_person_entitlements() != null ) {


  		




  
  87
  
    

  		




  86
  88
  
    
            for (int i = 0; i < userInfo.getEdu_person_entitlements().size(); i++) {


  		




  87
  89
  
    
                String role = userInfo.getEdu_person_entitlements().get(i);


  		




  88
  
  
    
                role = role.split("urn:mace:openminted.eu:aai.openminted.eu:group:OpenAIRE\\+")[1];


  		




  
  90
  
    
                role = role.split(":")[role.split(":").length-1];


  		




  89
  91
  
    
                role = role.replace("+"," ");


  		




  
  92
  
    
                logger.debug("Adding parsed role : "+role);


  		




  90
  93
  
    
                userInfo.getEdu_person_entitlements().set(i,role);


  		




  91
  94
  
    
            }


  		




  92
  95
  
    
        }


  		




  
  96
  
    
        }catch(Exception e){


  		




  
  97
  
    
            logger.debug("Error in parsing  Edu_person_entitlements : ",e);


  		




  
  98
  
    
            return null;


  		




  
  99
  
    
        }


  		




  93
  100
  
    
        logger.debug("After handling roles : "+userInfo.toString());


  		




  94
  101
  
    

  		




  95
  102
  
    

  		




  ......




  105
  112
  
    
    }


  		




  106
  113
  
    

  		




  107
  114
  
    
    public static void main(String[] args) throws IOException {


  		




  108
  
  
    
        BasicConfigurator.configure();


  		




  109
  
  
    
        ApplicationContext context = new ClassPathXmlApplicationContext("eu/dnetlib/openaire/rest/springContext-claims-authorization.xml");


  		




  110
  
  
    

  		




  111
  
  
    
        Authorization authorization =  context.getBean(Authorization.class);


  		




  112
  
  
    
        UserHandler userHandler = context.getBean(UserHandler.class);


  		




  113
  
  
    
        System.out.println("\n\nAdmin Roles "+authorization.getAdminRoles().size()+"   "+authorization.getAdminRoles()+"\n\n\n");


  		




  114
  
  
    
        System.out.println("\n\ngetProjectCuratorRoles Roles "+authorization.getProjectCuratorRoles().size()+"   "+authorization.getProjectCuratorRoles()+"\n\n\n");


  		




  115
  
  
    
        System.out.println("\n\ngetRegisteredRoles Roles "+authorization.getRegisteredRoles().size()+"   "+authorization.getRegisteredRoles()+"\n\n\n");


  		




  116
  
  
    

  		




  117
  
  
    
        System.out.println("\n\nIs Admin::\n"+authorization.isAdmin("eyJraWQiOiJvaWRjIiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiIwOTMxNzMwMTMyODMzNjMyQG9wZW5taW50ZWQuZXUiLCJhenAiOiIyNGU4MzE3Ni0xMzEyLTRiYTMtYmMwYi1mZmVlYmVhMTYwM2UiLCJpc3MiOiJodHRwczpcL1wvYWFpLm9wZW5taW50ZWQuZXVcL29pZGNcLyIsImV4cCI6MTQ5ODQ4NTk3NiwiaWF0IjoxNDk4NDcxNTc2LCJqdGkiOiJkMWRlZjc1Yi00MTEyLTRiZDktYTIyNi0wZThhOWI2M2Y3MWQifQ.WVYOb_yO8OaxIIt2jRYEDQBhGGFRDTBw3DgtVV_smuN5yx1ScCj6aehLu3JKPSArme4m2SGF4TEGhpwNJkwhM2WapGtxmtuCmCzYIo_QlC1Yki9hr2OT2rXMcQsJCiKaBSf6pLue6Sn78GMB5yaUTvOQHRgidXGiZXH5lsuZUx15Q6Equ_wzond_rgP9mRheRkTyIFuvvg4PuzmudBc11Ty863vIIQtoWF7_p98zTbHxiNF9lLPwzPZKxDoQ8JeayQEC-jsWVLgxmp-h0jG_Ko5jFVVJeeosqMMucOrs2FT_NKHVYVqB6VVh0C6nOufeiLrNDeMUlDT4dAvKD2zE9w")


  		




  118
  
  
    
                +"\n\n\n");


  		




  119
  
  
    
//        UserHandler.json2UserInfo("{\"sub\":\"123456@openminted.eu\",\"name\":\"όνομα και επιθετο\",\"given_name\":\"όνομα\",\"family_name\":\"επίθετο\",\"email\":\"mail1@mail.com\",\"edu_person_entitlements\":[\"urn:mace:openminted.eu:aai.openminted.eu:group:OpenAIRE+Super+Administrator\",\"urn:mace:openminted.eu:aai.openminted.eu:group:OpenAIRE+User+Manager\"]}");


  		




  
  115
  
    
//        BasicConfigurator.configure();


  		




  
  116
  
    
//        ApplicationContext context = new ClassPathXmlApplicationContext("eu/dnetlib/openaire/rest/springContext-claims-authorization.xml");


  		




  
  117
  
    
//


  		




  
  118
  
    
//        Authorization authorization =  context.getBean(Authorization.class);


  		




  
  119
  
    
//        UserHandler userHandler = context.getBean(UserHandler.class);


  		




  
  120
  
    
//        System.out.println("\n\nAdmin Roles "+authorization.getAdminRoles().size()+"   "+authorization.getAdminRoles()+"\n\n\n");


  		




  
  121
  
    
//        System.out.println("\n\ngetProjectCuratorRoles Roles "+authorization.getProjectCuratorRoles().size()+"   "+authorization.getProjectCuratorRoles()+"\n\n\n");


  		




  
  122
  
    
//        System.out.println("\n\ngetRegisteredRoles Roles "+authorization.getRegisteredRoles().size()+"   "+authorization.getRegisteredRoles()+"\n\n\n");


  		




  
  123
  
    
//        System.out.println("\n\nIs Admin::\n"+authorization.isRegistered("eyJraWQiOiJvaWRjIiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiIwOTMxNzMwMTMyODMzNjMyQG9wZW5taW50ZWQuZXUiLCJhenAiOiIyNGU4MzE3Ni0xMzEyLTRiYTMtYmMwYi1mZmVlYmVhMTYwM2UiLCJpc3MiOiJodHRwczpcL1wvYWFpLm9wZW5taW50ZWQuZXVcL29pZGNcLyIsImV4cCI6MTQ5OTg4MjI4NCwiaWF0IjoxNDk5ODY3ODg0LCJqdGkiOiIxNzJiOWNkYS1kNmZjLTQ3MTgtYTI1My02YTJjYmNiYmI0ZWIifQ.XtKm96oOeRe0_7mzr_NPdFAG6JJN3dh9Oy6-bFHE59UaN3TMuZAYgLND49vryWK_m4s23F_1TvZAN7WMDnkx3YH6RqTUsMS57sJGIOoDg4eYSzgDfLriyaANqp1Fh2PotMXWuFZXmtKdyLYw2jfcnBXjfd7DkMHylsFWII88GQVRFujsrJfjr5DKcz09Ad_tF874r-Emq0ARxtSHjmjp56cKmiia9GcjOgMVRMdUgArVKPToiMoYizXyG51t3yOnYI6JI0batB3UjmocX-YXBJmLZfS3zqlaKuf_hHgcs09EQK_McJ_igpgZ9CeBUHyDzzITtniLmftKB7o_AfxaMw")


  		




  
  124
  
    
//                +"\n\n\n");


  		




  
  125
  
    
//        userHandler.json2UserInfo("{\"sub\":\"123456@openminted.eu\",\"name\":\"όνομα και επιθετο\",\"given_name\":\"όνομα\",\"family_name\":\"επίθετο\",\"email\":\"mail1@mail.com\",\"edu_person_entitlements\":[\"urn:mace:openminted.eu:aai.openminted.eu:group:OpenAIRE+Super+Administrator\",\"urn:mace:openminted.eu:aai.openminted.eu:group:OpenAIRE+User+Manager\"]}");


  		




  120
  126
  
    
//        UserInfo u = userHandler.json2UserInfo("{\"sub\":\"12345678@openminted.eu\",\"name\":\" a name\",\"given_name\":\"a\",\"family_name\":\"name\",\"email\":\"mail2@mail.com\",\"edu_person_scoped_affiliations\":[\"faculty@university\"],\"edu_person_entitlements\":[\"urn:mace:openminted.eu:aai.openminted.eu:group:OpenAIRE+Super+Administrator\"]}");


  		




  121
  127
  
    
//        boolean b=authorization.isProjectCurator(u);


  		




  122
  128
  
    
//        System.out.println(b);


  		




  123
  
  
    
//        UserHandler.json2UserInfo("{\"sub\":\"1234567899@openminted.eu\",\"name\":\" test name\",\"given_name\":\"test\",\"family_name\":\"test surname\",\"email\":\"mail2@mail.com\",\"edu_person_scoped_affiliations\":[\"faculty@uni\"]}");


  		




  124
  
  
    
//        UserHandler.json2UserInfo(null);


  		




  125
  
  
    
//        UserHandler.json2UserInfo("mpla mpla mpla .... {}");


  		




  
  129
  
    
//        userHandler.json2UserInfo("{\"sub\":\"1234567899@openminted.eu\",\"name\":\" test name\",\"given_name\":\"test\",\"family_name\":\"test surname\",\"email\":\"mail2@mail.com\",\"edu_person_scoped_affiliations\":[\"faculty@uni\"]}");


  		




  
  130
  
    
//        userHandler.json2UserInfo(null);


  		




  
  131
  
    
//        userHandler.json2UserInfo("mpla mpla mpla .... {}");


  		




  126
  132
  
    
//        userHandler.getUserInfo("eyJraWQiOiJvaWRjIiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiIwOTMxNzMwMTMyODMzNjMyQG9wZW5taW50ZWQuZXUiLCJhenAiOiIyNGU4MzE3Ni0xMzEyLTRiYTMtYmMwYi1mZmVlYmVhMTYwM2UiLCJpc3MiOiJodHRwczpcL1wvYWFpLm9wZW5taW50ZWQuZXVcL29pZGNcLyIsImV4cCI6MTQ5ODQ4NTk3NiwiaWF0IjoxNDk4NDcxNTc2LCJqdGkiOiJkMWRlZjc1Yi00MTEyLTRiZDktYTIyNi0wZThhOWI2M2Y3MWQifQ.WVYOb_yO8OaxIIt2jRYEDQBhGGFRDTBw3DgtVV_smuN5yx1ScCj6aehLu3JKPSArme4m2SGF4TEGhpwNJkwhM2WapGtxmtuCmCzYIo_QlC1Yki9hr2OT2rXMcQsJCiKaBSf6pLue6Sn78GMB5yaUTvOQHRgidXGiZXH5lsuZUx15Q6Equ_wzond_rgP9mRheRkTyIFuvvg4PuzmudBc11Ty863vIIQtoWF7_p98zTbHxiNF9lLPwzPZKxDoQ8JeayQEC-jsWVLgxmp-h0jG_Ko5jFVVJeeosqMMucOrs2FT_NKHVYVqB6VVh0C6nOufeiLrNDeMUlDT4dAvKD2zE9w");


  		




  127
  133
  
    
    }


  		




  128
  134
  
    
}


  		












  

    
      modules/uoa-claims-api/trunk/src/main/resources/eu/dnetlib/openaire/rest/springContext-claims-authorization.properties
    
  





  1
  1
  
    

  		




  2
  2
  
    
services.claims.authorization.userInfoUrl = http://mpagasas.di.uoa.gr:8080/uoa-user-management-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=


  		




  3
  3
  
    
services.claims.authorization.originServer = http://scoobydoo.di.uoa.gr:5000


  		




  4
  
  
    
services.claims.authorization.registeredRoles = Super Administrator,Portal Administrator,Expert - Community,Expert - Funder,Curator - Claim,Curator - Project,Curator - Community,Curator - Institution,Cuthor,Registered,User Manager


  		




  5
  
  
    
services.claims.authorization.adminRoles = Super Administrator,Curator - Claim,Portal Administrator


  		




  6
  
  
    
services.claims.authorization.projectCuratorRoles = Curator - Project


  		




  
  4
  
    
services.claims.authorization.registeredRoles = OpenAIRE Super Administrator,OpenAIRE Portal Administrator,OpenAIRE Expert - Community,OpenAIRE Expert - Funder,OpenAIRE Curator - Claim,OpenAIRE Curator - Project,OpenAIRE Curator - Community,OpenAIRE Curator - Institution,OpenAIRE Author,Registered User,User Manager


  		




  
  5
  
    
services.claims.authorization.adminRoles = OpenAIRE Super Administrator,OpenAIRE Curator - Claim,OpenAIRE Portal Administrator


  		




  
  6
  
    
services.claims.authorization.projectCuratorRoles = OpenAIRE Curator - Project


  		












  

    
      modules/uoa-claims-api/trunk/src/main/resources/eu/dnetlib/openaire/rest/springContext-claims-authorization.xml
    
  





  15
  15
  
    
        http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd


  		




  16
  16
  
    
	http://dnetlib.eu/springbeans/template http://dnetlib.eu/springbeans/template.xsd"


  		




  17
  17
  
    
       default-autowire="byName">


  		




  18
  
  
    

  		




  
  18
  
    
    <!--Un comment in order to run the tests / Comment to deploy-->


  		




  
  19
  
    
    <!--<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">-->


  		




  
  20
  
    
    <!--<property name="locations" value="classpath:eu/dnetlib/openaire/rest/springContext-claims-authorization.properties"/>-->


  		




  
  21
  
    
    <!--</bean>-->


  		




  19
  22
  
    
    <bean id="userHandler" class="eu.dnetlib.openaire.rest.inputHandler.UserHandler" >


  		




  20
  23
  
    
        <property name="userInfoUrl" value="${services.claims.authorization.userInfoUrl}"/>


  		




  21
  24
  
    
    </bean>


  		












Also available in:  Unified diff