import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.HttpClientErrorException;
* HttpServletResponse
* @return List<EcompApp>
*/
- @RequestMapping(value = { "/portalApi/userApps" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = { "/portalApi/userApps" }, produces = "application/json")
public List<EcompApp> getUserApps(HttpServletRequest request, HttpServletResponse response) {
EPUser user = EPUserUtils.getUserSession(request);
List<EcompApp> ecompApps = null;
* @throws IOException
* if sendError fails
*/
- @RequestMapping(value = { "/portalApi/persUserApps" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = { "/portalApi/persUserApps" }, produces = "application/json")
public List<EcompApp> getPersUserApps(HttpServletRequest request, HttpServletResponse response) throws IOException {
EPUser user = EPUserUtils.getUserSession(request);
List<EcompApp> ecompApps = null;
* HttpServletResponse
* @return List<AppIdAndNameTransportModel>
*/
- @RequestMapping(value = { "/portalApi/adminApps" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = { "/portalApi/adminApps" }, produces = "application/json")
public List<AppIdAndNameTransportModel> getAdminApps(HttpServletRequest request, HttpServletResponse response) {
EPUser user = EPUserUtils.getUserSession(request);
List<AppIdAndNameTransportModel> adminApps = null;
* HttpServletResponse
* @return List<AppIdAndNameTransportModel>
*/
- @RequestMapping(value = {
- "/portalApi/appsForSuperAdminAndAccountAdmin" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = {
+ "/portalApi/appsForSuperAdminAndAccountAdmin" }, produces = "application/json")
public List<AppIdAndNameTransportModel> getAppsForSuperAdminAndAccountAdmin(HttpServletRequest request,
HttpServletResponse response) {
EPUser user = EPUserUtils.getUserSession(request);
* @return JSON with left menu
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
- @RequestMapping(value = { "/portalApi/leftmenuItems" }, method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+ @GetMapping(value = { "/portalApi/leftmenuItems" }, produces = "application/json;charset=UTF-8")
public String getLeftMenuItems(HttpServletRequest request, HttpServletResponse response) {
String menuList = null;
Set menuSet = (Set) AppUtils.getSession(request)
return menuList;
}
- @RequestMapping(value = {
- PORTAL_API_USER_APPS_ORDER_BY_SORT_PREF }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = {
+ PORTAL_API_USER_APPS_ORDER_BY_SORT_PREF }, produces = "application/json")
public List<EcompApp> getUserAppsOrderBySortPref(HttpServletRequest request, HttpServletResponse response) {
EPUser user = EPUserUtils.getUserSession(request);
List<EcompApp> ecompApps = null;
* sort pref
* @return FieldsValidator
*/
- @RequestMapping(value = {
- "/portalApi/saveUserAppsSortingManual" }, method = RequestMethod.PUT, produces = "application/json")
+ @PutMapping(value = {
+ "/portalApi/saveUserAppsSortingManual" }, produces = "application/json")
public FieldsValidator putUserAppsSortingManual(HttpServletRequest request,
@RequestBody List<EPAppsManualPreference> epAppsManualPref, HttpServletResponse response) {
FieldsValidator fieldsValidator = null;
return fieldsValidator;
}
- @RequestMapping(value = {
- "/portalApi/saveUserWidgetsSortManual" }, method = RequestMethod.PUT, produces = "application/json")
+ @PutMapping(value = {
+ "/portalApi/saveUserWidgetsSortManual" }, produces = "application/json")
public FieldsValidator putUserWidgetsSortManual(HttpServletRequest request,
@RequestBody List<EPWidgetsSortPreference> saveManualWidgetSData, HttpServletResponse response) {
FieldsValidator fieldsValidator = null;
return fieldsValidator;
}
- @RequestMapping(value = {
- "/portalApi/updateWidgetsSortPref" }, method = RequestMethod.PUT, produces = "application/json")
+ @PutMapping(value = {
+ "/portalApi/updateWidgetsSortPref" }, produces = "application/json")
public FieldsValidator putUserWidgetsSortPref(HttpServletRequest request,
@RequestBody List<EPWidgetsSortPreference> delManualWidgetData, HttpServletResponse response) {
FieldsValidator fieldsValidator = null;
* data to delete
* @return FieldsValidator
*/
- @RequestMapping(value = {
- "/portalApi/UpdateUserAppsSortManual" }, method = RequestMethod.PUT, produces = "application/json")
+ @PutMapping(value = {
+ "/portalApi/UpdateUserAppsSortManual" }, produces = "application/json")
public FieldsValidator deleteUserAppSortManual(HttpServletRequest request,
@RequestBody EPDeleteAppsManualSortPref delManualAppData, HttpServletResponse response) {
FieldsValidator fieldsValidator = null;
return fieldsValidator;
}
- @RequestMapping(value = {
- "/portalApi/saveUserAppsSortingPreference" }, method = RequestMethod.PUT, produces = "application/json")
+ @PutMapping(value = {
+ "/portalApi/saveUserAppsSortingPreference" }, produces = "application/json")
public FieldsValidator putUserAppsSortingPreference(HttpServletRequest request,
@RequestBody EPAppsSortPreference userAppsValue, HttpServletResponse response) {
FieldsValidator fieldsValidator = null;
return fieldsValidator;
}
- @RequestMapping(value = {
- "/portalApi/userAppsSortTypePreference" }, method = RequestMethod.GET, produces = "application/String")
+ @GetMapping(value = {
+ "/portalApi/userAppsSortTypePreference" }, produces = "application/String")
public String getUserAppsSortTypePreference(HttpServletRequest request, HttpServletResponse response) {
EPUser user = EPUserUtils.getUserSession(request);
String userSortPreference = null;
* HTTP servlet response
* @return List<AdminUserApplications>
*/
- @RequestMapping(value = { "/portalApi/accountAdmins" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = { "/portalApi/accountAdmins" }, produces = "application/json")
public List<AdminUserApplications> getAppsAdministrators(HttpServletRequest request, HttpServletResponse response) {
EPUser user = EPUserUtils.getUserSession(request);
List<AdminUserApplications> admins = null;
return admins;
}
- @RequestMapping(value = { "/portalApi/availableApps" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = { "/portalApi/availableApps" }, produces = "application/json")
public List<AppsResponse> getApps(HttpServletRequest request, HttpServletResponse response) {
EPUser user = EPUserUtils.getUserSession(request);
List<AppsResponse> apps = null;
* HTTP servlet response
* @return List of applications
*/
- @RequestMapping(value = {
- "/portalApi/allAvailableApps" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = {
+ "/portalApi/allAvailableApps" }, produces = "application/json")
public List<AppsResponse> getAllApps(HttpServletRequest request, HttpServletResponse response) {
EPUser user = EPUserUtils.getUserSession(request);
List<AppsResponse> apps = null;
* HTTP servlet response
* @return List of applications
*/
- @RequestMapping(value = { "/portalApi/appsFullList" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = { "/portalApi/appsFullList" }, produces = "application/json")
public List<EcompApp> getAppsFullList(HttpServletRequest request, HttpServletResponse response) {
EPUser user = EPUserUtils.getUserSession(request);
List<EcompApp> ecompApps = null;
* HTTP servlet response
* @return UserRoles
*/
- @RequestMapping(value = { "/portalApi/userProfile" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = { "/portalApi/userProfile" }, produces = "application/json")
public UserRoles getUserProfile(HttpServletRequest request, HttpServletResponse response) {
EPUser user = EPUserUtils.getUserSession(request);
UserRoles userAndRoles = null;
* application ID
* @return List<LocalRole>
*/
- @RequestMapping(value = { "/portalApi/appRoles/{appId}" }, method = {
- RequestMethod.GET }, produces = "application/json")
+ @GetMapping(value = { "/portalApi/appRoles/{appId}" }, produces = "application/json")
public List<LocalRole> getAppRoles(HttpServletRequest request, @PathVariable("appId") Long appId,
HttpServletResponse response) {
List<LocalRole> roleList = null;
* @param response
* @return EPApp object
*/
- @RequestMapping(value = { "/portalApi/singleAppInfo" }, method = {
- RequestMethod.GET }, produces = "application/json")
+ @GetMapping(value = { "/portalApi/singleAppInfo" }, produces = "application/json")
public EPApp getSingleAppInfo(HttpServletRequest request, HttpServletResponse response) {
EPApp app = null;
EPUser user = EPUserUtils.getUserSession(request);
* @param response
* @return EPApp object
*/
- @RequestMapping(value = { "/portalApi/singleAppInfoById" }, method = {
- RequestMethod.GET }, produces = "application/json")
+ @GetMapping(value = { "/portalApi/singleAppInfoById" }, produces = "application/json")
public EPApp getSingleAppInfoById(HttpServletRequest request, HttpServletResponse response) {
EPApp app = null;
EPUser user = EPUserUtils.getUserSession(request);
String appId = request.getParameter("appParam");
app = appService.getApp(Long.valueOf(appId));
if(!EcompPortalUtils.checkIfRemoteCentralAccessAllowed()) {
- app.setCentralAuth(false);
+ app.setRolesInAAF(false);
}
if (user != null && (adminRolesService.isAccountAdminOfApplication(user, app)
|| (adminRolesService.isSuperAdmin(user) && app.getId().equals(PortalConstants.PORTAL_APP_ID))))
* HTTP servlet response
* @return List<OnboardingApp>
*/
- @RequestMapping(value = { PORTAL_API_ONBOARDING_APPS }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = { PORTAL_API_ONBOARDING_APPS }, produces = "application/json")
public List<OnboardingApp> getOnboardingApps(HttpServletRequest request, HttpServletResponse response) {
EPUser user = EPUserUtils.getUserSession(request);
List<OnboardingApp> onboardingApps = null;
/**
*
* @param request
- * HTTP servlet request
+ * HTTP servlet request‰
* @param response
* HTTP servlet response
* @param modifiedOnboardingApp
* @return FieldsValidator
* @throws Exception
*/
- @RequestMapping(value = { PORTAL_API_ONBOARDING_APPS }, method = RequestMethod.PUT, produces = "application/json")
+ @PutMapping(value = { PORTAL_API_ONBOARDING_APPS }, produces = "application/json")
public FieldsValidator putOnboardingApp(HttpServletRequest request,
@RequestBody OnboardingApp modifiedOnboardingApp, HttpServletResponse response) {
FieldsValidator fieldsValidator = null;
EPUser user = null;
- EPApp oldEPApp = appService.getApp(modifiedOnboardingApp.id);
+ EPApp oldEPApp = appService.getApp(modifiedOnboardingApp.getId());
try {
user = EPUserUtils.getUserSession(request);
if (!adminRolesService.isSuperAdmin(user) && !adminRolesService.isAccountAdminOfAnyActiveorInactiveApplication(user, oldEPApp) ) {
EcompPortalUtils.setBadPermissions(user, response, "putOnboardingApp");
+ } else if(!dataValidator.isValid(modifiedOnboardingApp)){
+ logger.error(EELFLoggerDelegate.errorLogger, "putOnboardingApp is not valid");
+ EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/onboardingApps", "POST result =",
+ response.getStatus());
+ return fieldsValidator;
} else {
- if((oldEPApp.getCentralAuth() && modifiedOnboardingApp.isCentralAuth && !oldEPApp.getNameSpace().equalsIgnoreCase(modifiedOnboardingApp.nameSpace) && modifiedOnboardingApp.nameSpace!= null ) || (!oldEPApp.getCentralAuth() && modifiedOnboardingApp.isCentralAuth && modifiedOnboardingApp.nameSpace!= null))
+ if((oldEPApp.getRolesInAAF() && modifiedOnboardingApp.getRolesInAAF() && !oldEPApp.getNameSpace().equalsIgnoreCase(modifiedOnboardingApp.getNameSpace()) && modifiedOnboardingApp.getNameSpace()!= null ) || (!oldEPApp.getRolesInAAF() && modifiedOnboardingApp.getRolesInAAF() && modifiedOnboardingApp.getNameSpace() != null))
{
checkIfNameSpaceIsValid(modifiedOnboardingApp, fieldsValidator, response);
}
* app to add
* @return FieldsValidator
*/
- @RequestMapping(value = { PORTAL_API_ONBOARDING_APPS }, method = RequestMethod.POST, produces = "application/json")
+ @PostMapping(value = { PORTAL_API_ONBOARDING_APPS }, produces = "application/json")
public FieldsValidator postOnboardingApp(HttpServletRequest request, @RequestBody OnboardingApp newOnboardingApp,
HttpServletResponse response) {
FieldsValidator fieldsValidator = null;
EcompPortalUtils.setBadPermissions(user, response, "postOnboardingApps");
} else {
newOnboardingApp.normalize();
- checkIfNameSpaceIsValid(newOnboardingApp, fieldsValidator, response);
+ if(newOnboardingApp.getRolesInAAF() != null && newOnboardingApp.getRolesInAAF())
+ checkIfNameSpaceIsValid(newOnboardingApp, fieldsValidator, response);
fieldsValidator = appService.addOnboardingApp(newOnboardingApp, user);
response.setStatus(fieldsValidator.httpStatusCode.intValue());
}
* ID of app to delete
* @return FieldsValidator
*/
- @RequestMapping(value = { "/portalApi/onboardingApps/{appId}" }, method = {
- RequestMethod.DELETE }, produces = "application/json")
+ @DeleteMapping(value = { "/portalApi/onboardingApps/{appId}" }, produces = "application/json")
public FieldsValidator deleteOnboardingApp(HttpServletRequest request, @PathVariable("appId") Long appId,
HttpServletResponse response) {
FieldsValidator fieldsValidator = null;
private void checkIfNameSpaceIsValid(OnboardingApp modifiedOnboardingApp, FieldsValidator fieldsValidator, HttpServletResponse response)
throws InvalidApplicationException {
try {
- ResponseEntity<String> res = appService.checkIfNameSpaceIsValid(modifiedOnboardingApp.nameSpace);
+ ResponseEntity<String> res = appService.checkIfNameSpaceIsValid(modifiedOnboardingApp.getNameSpace());
} catch (HttpClientErrorException e) {
logger.error(EELFLoggerDelegate.errorLogger, "checkIfNameSpaceExists failed", e);
EPLogUtil.logExternalAuthAccessAlarm(logger, e.getStatusCode());
throw e;
}
} catch (Exception e) {
- e.printStackTrace();
+ logger.error(EELFLoggerDelegate.errorLogger, "Exception in checkIfNameSpaceIsValid", e);
}
}