fixed inverted priority scope-token
git-svn-id: http://svn.research-infrastructures.eu/d4science/gcube/trunk/spatial-data/geonetwork@131319 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
f8d8196efd
commit
01c42056e7
|
@ -15,16 +15,35 @@ import lombok.extern.slf4j.Slf4j;
|
||||||
public class ScopeUtils {
|
public class ScopeUtils {
|
||||||
|
|
||||||
public static String getCurrentScope(){
|
public static String getCurrentScope(){
|
||||||
try{
|
// try{
|
||||||
String token=SecurityTokenProvider.instance.get();
|
// String token=SecurityTokenProvider.instance.get();
|
||||||
log.debug("Token is : "+token);
|
// log.debug("Token is : "+token);
|
||||||
if(token==null) throw new Exception("Security Token is null");
|
// if(token==null) throw new Exception("Security Token is null");
|
||||||
AuthorizationEntry entry = authorizationService().get(token);
|
// AuthorizationEntry entry = authorizationService().get(token);
|
||||||
return entry.getContext();
|
// return entry.getContext();
|
||||||
}catch(Exception e ){
|
// }catch(Exception e ){
|
||||||
log.debug("Unable to resolve token, checking scope provider..",e);
|
// log.debug("Unable to resolve token, checking scope provider..",e);
|
||||||
return ScopeProvider.instance.get();
|
// return ScopeProvider.instance.get();
|
||||||
|
// }
|
||||||
|
|
||||||
|
String scope=ScopeProvider.instance.get();
|
||||||
|
if(scope!=null) {
|
||||||
|
log.debug("Found scope provider {}, skipping token",scope);
|
||||||
|
return scope;
|
||||||
|
}else{
|
||||||
|
try{
|
||||||
|
log.debug("Scope provider not set, reverting to token");
|
||||||
|
String token=SecurityTokenProvider.instance.get();
|
||||||
|
log.debug("Token is : "+token);
|
||||||
|
if(token==null) throw new Exception("Security Token is null");
|
||||||
|
AuthorizationEntry entry = authorizationService().get(token);
|
||||||
|
return entry.getContext();
|
||||||
|
}catch(Exception e){
|
||||||
|
throw new RuntimeException("Unable to evaluate scope ",e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getCurrentScopeName(){
|
public static String getCurrentScopeName(){
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package org.gcube.spatial.data.geonetwork.test;
|
package org.gcube.spatial.data.geonetwork.test;
|
||||||
|
|
||||||
import org.gcube.common.scope.api.ScopeProvider;
|
|
||||||
import org.gcube.spatial.data.geonetwork.GeoNetwork;
|
import org.gcube.spatial.data.geonetwork.GeoNetwork;
|
||||||
import org.gcube.spatial.data.geonetwork.GeoNetworkAdministration;
|
import org.gcube.spatial.data.geonetwork.GeoNetworkAdministration;
|
||||||
import org.gcube.spatial.data.geonetwork.GeoNetworkReader;
|
import org.gcube.spatial.data.geonetwork.GeoNetworkReader;
|
||||||
|
|
Loading…
Reference in New Issue