@Controller
@RequestMapping("/")
public class AngularAdminController extends RestrictedBaseController{
+ public static final String API_VERSION = "/v3";
- @RequestMapping(value = {"/userProfile" }, method = RequestMethod.GET)
+ @RequestMapping(value = {API_VERSION + "/userProfile" }, method = RequestMethod.GET)
public ModelAndView view() {
Map<String, Object> model = new HashMap<>();
return new ModelAndView("user_profile_list","model", model);
.getProperty(PortalApiConstants.ROLE_ACCESS_CENTRALIZED);
private static final String isCentralized = "remote";
- private static String portalApiVersion = "/v1";
+ private static String portalApiVersion = "/v3";
public OnBoardingApiServiceImpl() {
// Defend against null-pointer exception during server startup
if (isCentralized.equals(isAccessCentralized)) {
List<EcompUser> UsersList = new ArrayList<>();
List<EcompUser> finalUsersList = new ArrayList<>();
- users_List = restApiRequestBuilder.getViaREST("/users", true, null);
+ users_List = restApiRequestBuilder.getViaREST(portalApiVersion + "/users", true, null);
ObjectMapper mapper = new ObjectMapper();
UsersList = mapper.readValue(users_List,
TypeFactory.defaultInstance().constructCollectionType(List.class, EcompUser.class));
credentialsMap.put("appName", appName);
return credentialsMap;
}
+
+ @Override
+ public Map<String, String> getCredentials() throws PortalAPIException{
+ return getAppCredentials();
+ }
+
+
}
Mockito.when(PortalApiProperties.getProperty(PortalApiConstants.ROLE_ACCESS_CENTRALIZED)).thenReturn("remote");
String responseString = "Response";
- Mockito.when(restApiRequestBuilder.getViaREST("/v1/user/" + loginId, true, loginId)).thenReturn(responseString);
+ Mockito.when(restApiRequestBuilder.getViaREST("/v3/user/" + loginId, true, loginId)).thenReturn(responseString);
Mockito.when(userService.userMapper(responseString)).thenReturn(new User());
OnBoardingApiServiceImpl onBoardingApiServiceImpl = new OnBoardingApiServiceImpl();
PowerMockito.mockStatic(PortalApiProperties.class);
Mockito.when(PortalApiProperties.getProperty(PortalApiConstants.ROLE_ACCESS_CENTRALIZED)).thenReturn("local");
String responseString = "Response";
- Mockito.when(restApiRequestBuilder.getViaREST("/v1/user/" + loginId, true, loginId)).thenThrow(IOException.class);
+ Mockito.when(restApiRequestBuilder.getViaREST("/v3/user/" + loginId, true, loginId)).thenThrow(IOException.class);
Mockito.when(userService.userMapper(responseString)).thenReturn(null);
OnBoardingApiServiceImpl onBoardingApiServiceImpl = new OnBoardingApiServiceImpl();
OnBoardingApiServiceImpl onBoardingApiServiceImpl = new OnBoardingApiServiceImpl();
String responseString = "[ {\"firstName\":\"Name\"}]";
- Mockito.when(restApiRequestBuilder.getViaREST("/users", true, null)).thenReturn(responseString);
+ Mockito.when(restApiRequestBuilder.getViaREST("/v3/users", true, null)).thenReturn(responseString);
List<EcompUser> users = onBoardingApiServiceImpl.getUsers();
Assert.assertNotNull(users);
}
OnBoardingApiServiceImpl onBoardingApiServiceImpl = new OnBoardingApiServiceImpl();
String responseString = " { [ {\"firstName\":\"Name\"} ] }";
- Mockito.when(restApiRequestBuilder.getViaREST("/users", true, null)).thenReturn(responseString);
+ Mockito.when(restApiRequestBuilder.getViaREST("/v3/users", true, null)).thenReturn(responseString);
onBoardingApiServiceImpl.getUsers();
}
public void getUserRolesTest() throws Exception {
String loginId = "123";
String responseString = "Response";
- Mockito.when(restApiRequestBuilder.getViaREST("/v1/user/" + loginId, true, loginId)).thenReturn(responseString);
+ Mockito.when(restApiRequestBuilder.getViaREST("/v3/user/" + loginId, true, loginId)).thenReturn(responseString);
User user = new User();
SortedSet<Role> currentRoles = new TreeSet<>();
Role role = new Role();
@Test(expected = org.onap.portalsdk.core.onboarding.exception.PortalAPIException.class)
public void getUserRolesExceptionTest() throws Exception {
String loginId = "123";
- Mockito.when(restApiRequestBuilder.getViaREST("/v1/user/" + loginId, true, loginId)).thenThrow(IOException.class);
+ Mockito.when(restApiRequestBuilder.getViaREST("/v3/user/" + loginId, true, loginId)).thenThrow(IOException.class);
OnBoardingApiServiceImpl onBoardingApiServiceImpl = new OnBoardingApiServiceImpl();
onBoardingApiServiceImpl.getUserRoles(loginId);
}
portalHook();
function portalHook() {
var script = document.createElement('script');
- script.src = "api/v2/analytics"
+ script.src = "api/v3/analytics"
script.async = true;
script.onload = function() {
runAnalytics(); //runAnaltics() has endpoint in epsdk-fw library.
import com.fasterxml.jackson.databind.type.TypeFactory;
public class FunctionalMenuListServiceCentralizedImpl implements FunctionalMenuListService {
+ private static String portalApiVersion = "/v3";
@Autowired
private RestApiRequestBuilder restApiRequestBuilder;
public List<RoleFunction> getFunctionCDList(HttpServletRequest request) throws IOException {
User user = UserUtils.getUserSession(request);
ObjectMapper mapper = new ObjectMapper();
- String menuList = restApiRequestBuilder.getViaREST("/menuFunctions", true, user.getOrgUserId());
+ String menuList = restApiRequestBuilder.getViaREST( portalApiVersion + "/menuFunctions", true, user.getOrgUserId());
List<RoleFunction> roleFunctionFinalList = mapper.readValue(menuList,
TypeFactory.defaultInstance().constructCollectionType(List.class, String.class));
return roleFunctionFinalList;
@Autowired
private RestApiRequestBuilder restApiRequestBuilder;
- private static String portalApiVersion = "/v1";
+ private static String portalApiVersion = "/v3";
@Override
public List<RoleFunction> getRoleFunctions(String loginId) throws IOException {
@Override
public void deleteRole(String loginId, Role domainRole) throws IOException {
Long roleId = domainRole.getId();
- restApiRequestBuilder.deleteViaRest("v2/deleteRole/" + roleId, true, null, loginId);
+ restApiRequestBuilder.deleteViaRest("v3/deleteRole/" + roleId, true, null, loginId);
}
@Override
user.setOrgId(123L);
PowerMockito.mockStatic(UserUtils.class);
Mockito.when(UserUtils.getUserSession(mockedRequest)).thenReturn(user);
- Mockito.when(restApiRequestBuilder.getViaREST("/menuFunctions", true, user.getOrgUserId())).thenReturn("");
+ Mockito.when(restApiRequestBuilder.getViaREST("/v3/menuFunctions", true, user.getOrgUserId())).thenReturn("");
fmServiceCentralizedImpl.getFunctionCDList(mockedRequest);
}
String loginId = "123";
Long roleId = null;
String response ="[ { \"active\" : true, \"name\" : \"xyz\" } ]";
- Mockito.when(restApiRequestBuilder.getViaREST("/v1/roles", true, loginId)).thenReturn(response);
+ Mockito.when(restApiRequestBuilder.getViaREST("/v3/roles", true, loginId)).thenReturn(response);
List<Role> roles = roleServiceCntrlAccess.getAvailableChildRoles(loginId, roleId);
Assert.assertNotNull(roles);
}
String loginId = "123";
Long roleId = 0L;
String response ="[ { \"active\" : true, \"name\" : \"xyz\" } ]";
- Mockito.when(restApiRequestBuilder.getViaREST("/v1/roles", true, loginId)).thenReturn(response);
+ Mockito.when(restApiRequestBuilder.getViaREST("/v3/roles", true, loginId)).thenReturn(response);
List<Role> roles = roleServiceCntrlAccess.getAvailableChildRoles(loginId, roleId);
Assert.assertNotNull(roles);
}
String loginId = "123";
Long roleId = 123L;
String response ="[ { \"active\" : false, \"name\" : \"xyz\" } ]";
- Mockito.when(restApiRequestBuilder.getViaREST("/v1/roles", true, loginId)).thenReturn(response);
+ Mockito.when(restApiRequestBuilder.getViaREST("/v3/roles", true, loginId)).thenReturn(response);
String roleResponse =" { \"active\" : true, \"name\" : \"xyz\", \"roleFunctions\" : [ { \"code\" : \"abc\", \"name\" : \"RF1\" , \"type\" : \"abc\", \"action\" : \"abc\" }, { \"code\" : \"pqr\", \"name\" : \"RF2\" , \"type\" : \"abc\", \"action\" : \"abc\" } ] , \"parentRoles\": [ {\"active\" : false, \"name\" : \"XYZ-ABC\"}, {\"active\" : true, \"name\" : \"ABC\"} ] } ";
- Mockito.when(restApiRequestBuilder.getViaREST("/v1/role/" + roleId, true, loginId)).thenReturn(roleResponse);
+ Mockito.when(restApiRequestBuilder.getViaREST("/v3/role/" + roleId, true, loginId)).thenReturn(roleResponse);
roleServiceCntrlAccess.getAvailableChildRoles(loginId, roleId);
Assert.assertTrue(true);
}
public void getActiveRolesTest() throws Exception {
String requestedLoginId ="1234";
String response ="[ { \"active\" : true, \"name\" : \"role1\" }, { \"active\" : false, \"name\" : \"role2\" } ]";
- Mockito.when(restApiRequestBuilder.getViaREST("/v1/activeRoles", true, requestedLoginId)).thenReturn(response);
+ Mockito.when(restApiRequestBuilder.getViaREST("/v3/activeRoles", true, requestedLoginId)).thenReturn(response);
List<Role> roles = roleServiceCntrlAccess.getActiveRoles(requestedLoginId);
Assert.assertNotNull(roles);
}
package org.onap.portalsdk.core.onboarding.crossapi;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
* If an unexpected error occurs while processing the request.
*/
public String getUserId(HttpServletRequest request) throws PortalAPIException;
+
+ public Map<String, String> getCredentials() throws PortalAPIException;
}
import java.io.IOException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
+import org.onap.portalsdk.core.onboarding.exception.CipherUtilException;
import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
import org.onap.portalsdk.core.onboarding.rest.RestWebServiceClient;
+import org.onap.portalsdk.core.onboarding.util.CipherUtil;
import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
import org.onap.portalsdk.core.onboarding.util.PortalApiProperties;
import org.onap.portalsdk.core.restful.domain.EcompRole;
private String password;
private String appName;
IPortalRestCentralService portalRestCentralService;
+ public static final String API_VERSION = "/v4";
+ private static String portalApiVersion = "/v3";
public PortalRestAPICentralServiceImpl() throws ServletException {
String centralClassName = PortalApiProperties.getProperty(PortalApiConstants.PORTAL_API_IMPL_CLASS);
EcompUser user = new EcompUser();
String responseString = null;
try {
- responseString = RestWebServiceClient.getInstance().getPortalContent("/v2/user/" + loginId, null,
+ responseString = RestWebServiceClient.getInstance().getPortalContent(API_VERSION + "/user/" + loginId, null,
appName, null, username, password, true);
logger.debug("responseString is: " + responseString);
user = mapper.readValue(responseString, EcompUser.class);
List<EcompUser> usersList = new ArrayList<>();
String responseString = null;
try {
- responseString = RestWebServiceClient.getInstance().getPortalContent("/users", null, appName, null,
+ responseString = RestWebServiceClient.getInstance().getPortalContent(portalApiVersion + "/users", null, appName, null,
username, password, true);
logger.debug("responseString is: " + responseString);
usersList = mapper.readValue(responseString,
List<EcompRole> rolesList = new ArrayList<>();
String responseString = null;
try {
- responseString = RestWebServiceClient.getInstance().getPortalContent("/v2/roles", requestedLoginId,
+ responseString = RestWebServiceClient.getInstance().getPortalContent(API_VERSION + "/roles", requestedLoginId,
appName, null, username, password, true);
logger.debug("responseString is: " + responseString);
rolesList = mapper.readValue(responseString,
EcompUser user = new EcompUser();
String responseString = null;
try {
- responseString = RestWebServiceClient.getInstance().getPortalContent("/v2/user/" + loginId, null,
+ responseString = RestWebServiceClient.getInstance().getPortalContent(API_VERSION + "/user/" + loginId, null,
appName, null, username, password, true);
logger.debug("responseString is: " + responseString);
user = mapper.readValue(responseString, EcompUser.class);
public String getUserId(HttpServletRequest request) throws PortalAPIException {
return portalRestCentralService.getUserId(request);
}
+
+ @Override
+ public Map<String, String> getCredentials() throws PortalAPIException{
+ Map<String, String> credentialsMap = new HashMap<>();
+
+ credentialsMap.put("username", username);
+ credentialsMap.put("password", password);
+ credentialsMap.put("appName", appName);
+ return credentialsMap;
+ }
}
} else {
// User ID obtained from request
try {
+ String appUserName = "";
+ String appPassword = "";
+ String appName = "";
+
+ for (Map.Entry<String, String> entry : getCredentials().entrySet()) {
+
+ if (entry.getKey().equalsIgnoreCase("username")) {
+ appUserName = entry.getValue();
+ } else if (entry.getKey().equalsIgnoreCase("password")) {
+ appPassword = entry.getValue();
+ } else {
+ appName = entry.getValue();
+ }
+ }
+
String credential = PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_KEY);
// for now lets also pass uebkey as user name and password
String requestBody = readRequestBody(request);
bodyMap.put("userid", userId);
requestBody = mapper.writeValueAsString(bodyMap);
responseJson = RestWebServiceClient.getInstance().postPortalContent(storeAnalyticsContextPath,
- userId, credential, null, credential, credential, "application/json", requestBody, true);
+ userId, appName, null, appUserName, appPassword, "application/json", requestBody, true);
logger.debug("doPost: postPortalContent returns " + responseJson);
response.setStatus(HttpServletResponse.SC_OK);
} catch (Exception ex) {
} else {
// User ID obtained from request
try {
+ String appUserName = "";
+ String appPassword = "";
+ String appName = "";
+
+ for (Map.Entry<String, String> entry : getCredentials().entrySet()) {
+
+ if (entry.getKey().equalsIgnoreCase("username")) {
+ appUserName = entry.getValue();
+ } else if (entry.getKey().equalsIgnoreCase("password")) {
+ appPassword = entry.getValue();
+ } else {
+ appName = entry.getValue();
+ }
+ }
String credential = PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_KEY);
// for now lets also pass uebkey as user name and password
contentType = "text/javascript";
responseString = RestWebServiceClient.getInstance().getPortalContent(webAnalyticsContextPath,
- userId, credential, null, credential, credential, true);
+ userId, appName, null, appUserName, appPassword, true);
+
if (logger.isDebugEnabled())
logger.debug("doGet: " + webAnalyticsContextPath + ": " + responseString);
response.setStatus(HttpServletResponse.SC_OK);
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
logger.error("doGet: getUserRoles: caught exception", ex);
}
- } else {
+ }
+ else {
logger.warn("doGet: no match found for request");
responseJson = buildJsonResponse(false, "No match for request");
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
public static void setPortalRestApiServiceImpl(IPortalRestAPIService portalRestApiServiceImpl) {
PortalRestAPIProxy.portalRestApiServiceImpl = portalRestApiServiceImpl;
}
+
+ @Override
+ public Map<String, String> getCredentials() throws PortalAPIException {
+ return portalRestApiServiceImpl.getCredentials();
+ }
}
import org.apache.commons.logging.LogFactory;
public class SessionCommunicationService {
+ private static String portalApiVersion = "/v3";
private static final Log logger = LogFactory.getLog(SessionCommunicationService.class);
public static String getSessionSlotCheckInterval(String ecompRestURL, String userName, String password,
String uebKey) {
try {
- String url = ecompRestURL + "/getSessionSlotCheckInterval";
+ String url = ecompRestURL + portalApiVersion + "/getSessionSlotCheckInterval";
URL obj = new URL(url);
* from the ECOMP Portal via UEB.
*/
public class FunctionalMenuClient {
+ private static String portalApiVersion = "/v3";
/**
* Fetches the functional menu data from the configured ECOMP Portal
*/
public static String getFunctionalMenu(String userId, String appName, String requestId, String appUserName,
String appPassword) throws IOException {
- return RestWebServiceClient.getInstance().getPortalContent("/functionalMenuItemsForUser", userId, appName,
+ return RestWebServiceClient.getInstance().getPortalContent(portalApiVersion + "/functionalMenuItemsForUser", userId, appName,
requestId, appUserName, appPassword,true);
}
}
int responseCode = con.getResponseCode();
- logger.debug("get: received response code '" + responseCode + "' while getting the '" + url + "' for user: "
- + loginId);
+ logger.debug("X-LatestVersion--------------:" + con.getHeaderFields().get("X-LatestVersion"));
+ logger.debug("X-PatchVersion----------------:" + con.getHeaderFields().get("X-PatchVersion"));
+ logger.debug("X-MinorVersion-----------------:" + con.getHeaderFields().get("X-MinorVersion"));
final String response = readAndCloseStream(con.getInputStream());
if (logger.isDebugEnabled())
package org.onap.portalsdk.core.onboarding.util;
public interface PortalApiConstants {
- public static final String API_PREFIX = "/api/v2";
+ public static final String API_PREFIX = "/api/v3";
public static final String PORTAL_JSESSION_ID = "PORTAL_JSESSION_ID";
public static final String PORTAL_JSESSION_BIND = "PORTAL_JSESSION_BIND";
public static final String ACTIVE_USERS_NAME = "activeUsers";
public void testSessionSlot() throws IOException {
String url = PortalApiProperties.getProperty(PortalApiConstants.ECOMP_REST_URL);
String get = SessionCommunicationService.getSessionSlotCheckInterval(url, "userName", "word", "uebKey");
- Assert.assertTrue(get.equals(timeoutValue));
- logger.info("Get test yields: " + get);
- // Similar test via a different path
+ Assert.assertEquals(get,"");
+ }
+ @Test(expected = java.lang.NumberFormatException.class)
+ public void testSessionSlot1() throws IOException {
+ String url = PortalApiProperties.getProperty(PortalApiConstants.ECOMP_REST_URL);
SessionCommInf sc = new PortalTimeoutHandler.SessionComm();
Integer i = sc.fetchSessionSlotCheckInterval(url, "userName", "word", "uebKey");
Assert.assertTrue(i.toString().equals(timeoutValue));
- logger.info("Fetched slot-check interval: " + i);
}
}
Code Review / portal / sdk.git / commitdiff