diff options
5 files changed, 24 insertions, 5 deletions
@@ -23,6 +23,7 @@ <properties> <sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> + <portal.sdk.version>2.6.0</portal.sdk.version> <sonar.jacoco.reportPath /> <sonar.jacoco.itReportPath /> @@ -39,6 +40,16 @@ </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.onap.portal.sdk</groupId> + <artifactId>epsdk-fw</artifactId> + <version>${portal.sdk.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <!-- we don't need to deploy the top level pom project --> <build> <pluginManagement> diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml index bdb37a7..55da4f2 100644 --- a/sparkybe-onap-application/pom.xml +++ b/sparkybe-onap-application/pom.xml @@ -292,7 +292,6 @@ <dependency> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-fw</artifactId> - <version>2.5.0</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml index 47cba7c..842af2d 100644 --- a/sparkybe-onap-service/pom.xml +++ b/sparkybe-onap-service/pom.xml @@ -293,7 +293,6 @@ some of the depedencies should probably have a scope of provided so they don't a <dependency> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-fw</artifactId> - <version>2.5.0</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPICentralServiceImpl.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPICentralServiceImpl.java index 922597d..90c5fe9 100644 --- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPICentralServiceImpl.java +++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPICentralServiceImpl.java @@ -233,13 +233,18 @@ public class PortalRestAPICentralServiceImpl } - @Override + @Deprecated public boolean isAppAuthenticated(HttpServletRequest request) throws PortalAPIException { + return isAppAuthenticated(request,null); + } + + @Override + public boolean isAppAuthenticated(HttpServletRequest request,Map<String, String> paramMap) throws PortalAPIException { LOG.debug("Authentication request"); String nameSpace = PortalApiProperties.getProperty(PortalApiConstants.AUTH_NAMESPACE); boolean accessAllowed = false; try { - accessAllowed = AuthUtil.isAccessAllowed(request, nameSpace); + accessAllowed = AuthUtil.isAccessAllowed(request, nameSpace,getCredentials()); } catch (Exception e) { String response = "PortalRestAPICentralServiceImpl.isAppAuthenticated failed"; LOG.error(response, e); diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java index 0835b7b..7a71fbc 100644 --- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java +++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java @@ -187,8 +187,13 @@ public class PortalRestAPIServiceImpl implements IPortalRestAPIService { * (non-Javadoc) * */ - @Override + @Deprecated public boolean isAppAuthenticated(HttpServletRequest request) throws PortalAPIException { + return isAppAuthenticated(request,null); + } + + @Override + public boolean isAppAuthenticated(HttpServletRequest request,Map<String, String> paramMap) throws PortalAPIException { LOG.debug("Authentication request"); PortalAuthenticationConfig config = PortalAuthenticationConfig.getInstance(); String restUsername = request.getHeader(PortalAuthenticationConfig.PROP_USERNAME); |