Compare commits
No commits in common. "902b4f0d484b75d20e5e1cf0d6d08da367d62196" and "726417e9707051262cec8ea32d951b0bf9ae5898" have entirely different histories.
902b4f0d48
...
726417e970
|
@ -12,7 +12,6 @@ public class Properties {
|
|||
private String accessToken;
|
||||
private String redirect;
|
||||
private String authoritiesMapper;
|
||||
private Boolean keycloak;
|
||||
|
||||
public Properties() {
|
||||
}
|
||||
|
@ -72,12 +71,4 @@ public class Properties {
|
|||
public void setAuthoritiesMapper(String authoritiesMapper) {
|
||||
this.authoritiesMapper = authoritiesMapper;
|
||||
}
|
||||
|
||||
public Boolean getKeycloak() {
|
||||
return keycloak;
|
||||
}
|
||||
|
||||
public void setKeycloak(Boolean keycloak) {
|
||||
this.keycloak = keycloak;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,13 +1,11 @@
|
|||
package eu.dnetlib.loginservice.security.initiliazers;
|
||||
|
||||
import com.sun.org.apache.xpath.internal.operations.Bool;
|
||||
import eu.dnetlib.loginservice.properties.Properties;
|
||||
import eu.dnetlib.loginservice.utils.ScopeReader;
|
||||
import org.mitre.oauth2.model.ClientDetailsEntity;
|
||||
import org.mitre.oauth2.model.RegisteredClient;
|
||||
import org.mitre.openid.connect.config.ServerConfiguration;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
|
@ -30,20 +28,10 @@ public class Configurations {
|
|||
String issuer = properties.getOidc().getIssuer();
|
||||
ServerConfiguration serverConfiguration = new ServerConfiguration();
|
||||
serverConfiguration.setIssuer(issuer);
|
||||
Boolean keycloak = properties.getKeycloak();
|
||||
|
||||
if(keycloak) {
|
||||
serverConfiguration.setAuthorizationEndpointUri(issuer + "/protocol/openid-connect/auth");
|
||||
serverConfiguration.setTokenEndpointUri(issuer + "/protocol/openid-connect/token");
|
||||
serverConfiguration.setUserInfoUri(issuer + "/protocol/openid-connect/userinfo");
|
||||
serverConfiguration.setJwksUri(issuer + "/protocol/openid-connect/certs");
|
||||
} else {
|
||||
serverConfiguration.setAuthorizationEndpointUri(issuer + "authorize");
|
||||
serverConfiguration.setTokenEndpointUri(issuer + "token");
|
||||
serverConfiguration.setUserInfoUri(issuer + "userinfo");
|
||||
serverConfiguration.setJwksUri(issuer + "jwk");
|
||||
}
|
||||
|
||||
serverConfiguration.setAuthorizationEndpointUri(issuer + "authorize");
|
||||
serverConfiguration.setTokenEndpointUri(issuer + "token");
|
||||
serverConfiguration.setUserInfoUri(issuer + "userinfo");
|
||||
serverConfiguration.setJwksUri(issuer + "jwk");
|
||||
serverConfiguration.setRevocationEndpointUri(issuer + "revoke");
|
||||
return serverConfiguration;
|
||||
}
|
||||
|
|
|
@ -1,24 +1,12 @@
|
|||
authentication.domain=di.uoa.gr
|
||||
|
||||
#keycloak
|
||||
#authentication.keycloak=true
|
||||
#authentication.oidc.issuer=https://aai-dev.egi.eu/auth/realms/egi
|
||||
#authentication.oidc.logout=https://aai-dev.egi.eu/auth/realms/egi/protocol/openid-connect/logout
|
||||
|
||||
#openid connect
|
||||
authentication.keycloak=false
|
||||
authentication.oidc.issuer=https://aai.openaire.eu/oidc/
|
||||
authentication.oidc.logout=https://aai-dev.egi.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=
|
||||
|
||||
authentication.oidc.home=http://rudie.di.uoa.gr:8580/openid_connect_login
|
||||
authentication.oidc.scope=openid,profile,email,eduperson_entitlement,eduperson_scoped_affiliation,eduperson_unique_id,offline_access
|
||||
authentication.oidc.id=a8ec6e5c-7bee-46aa-9a6f-18baca923582
|
||||
authentication.oidc.secret=2A91F53A1551AC33
|
||||
|
||||
authentication.session=EGISession
|
||||
authentication.accessToken=EGIAccessToken
|
||||
|
||||
authentication.redirect=http://scoobydoo.di.uoa.gr:4000/reload
|
||||
authentication.oidc.logout=https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=
|
||||
authentication.oidc.home=http://mpagasas.di.uoa.gr:8090/openid_connect_login
|
||||
authentication.oidc.scope=openid,profile,email,eduperson_entitlement
|
||||
authentication.oidc.id=id
|
||||
authentication.oidc.secret=secret
|
||||
authentication.session=openAIRESession
|
||||
authentication.accessToken=AccessToken
|
||||
authentication.redirect=http://mpagasas.di.uoa.gr:4600/reload
|
||||
# Currently, this is the only available mapper, set to null or anything else will ignore this.
|
||||
authentication.authorities-mapper=null
|
||||
server.port=8580
|
||||
authentication.authorities-mapper=openAIREMapper
|
Loading…
Reference in New Issue