Revision 59806
Added by Konstantinos Triantafyllou over 3 years ago
| RegisteredServicesServlet.java | ||
|---|---|---|
| 57 | 57 |
getRegisteredServiceDao().fetchAllRegisteredServicesByOwner(userId); |
| 58 | 58 |
System.out.println("LOAD REGISTERED SERVICES. " + registeredServices.size());
|
| 59 | 59 |
|
| 60 |
if (registeredServices== null || registeredServices.isEmpty()) {
|
|
| 60 |
if (registeredServices.isEmpty()) {
|
|
| 61 | 61 |
request.getSession().setAttribute("showEmptyList", true);
|
| 62 |
|
|
| 63 | 62 |
} else {
|
| 64 | 63 |
Map<String, ServiceResponse> serviceResponses = new HashMap<>(); |
| 65 | 64 |
Map<String, String> serviceKey = new HashMap<>(); |
| 66 | 65 |
|
| 67 | 66 |
for (RegisteredService registeredService:registeredServices) {
|
| 68 |
ServiceResponse serviceResponse = tokenUtils.getRegisteredService(registeredService.getAai_id(),authentication.getAccessTokenValue());
|
|
| 67 |
ServiceResponse serviceResponse = tokenUtils.getRegisteredService(registeredService.getClientId(),registeredService.getRegistrationAccessToken());
|
|
| 69 | 68 |
serviceResponses.put(registeredService.getId(), serviceResponse); |
| 70 | 69 |
serviceKey.put(registeredService.getId(), extractPublicKeySet(serviceResponse)); |
| 71 | 70 |
} |
| ... | ... | |
| 79 | 78 |
|
| 80 | 79 |
request.getSession().setAttribute("services", serviceResponses);
|
| 81 | 80 |
request.getSession().setAttribute("keys", serviceKey);
|
| 82 |
request.getSession().setAttribute("registeredServices", registeredServices);
|
|
| 83 | 81 |
} |
| 82 |
request.getSession().setAttribute("registeredServices", registeredServices);
|
|
| 84 | 83 |
|
| 85 | 84 |
} catch (SQLException sqle) {
|
| 86 | 85 |
logger.error("Error fetching registered services for user " + userId , sqle);
|
| ... | ... | |
| 126 | 125 |
return; |
| 127 | 126 |
} |
| 128 | 127 |
|
| 129 |
String aai_id = registeredService.getAai_id(); |
|
| 130 |
HttpResponse resp = tokenUtils.deleteService(aai_id, authentication.getAccessTokenValue()); |
|
| 128 |
HttpResponse resp = tokenUtils.deleteService(registeredService.getClientId(), registeredService.getRegistrationAccessToken()); |
|
| 131 | 129 |
|
| 132 | 130 |
int statusCode = resp.getStatusLine().getStatusCode(); |
| 133 | 131 |
System.out.println("STATUS CODE " + statusCode);
|
| 134 | 132 |
|
| 135 |
if (statusCode != 200) {
|
|
| 133 |
if (statusCode != 204) {
|
|
| 136 | 134 |
logger.error("Unable to delete the service. Status code was " + statusCode);
|
| 137 | 135 |
request.getSession().setAttribute("message", "Fail to delete the service. Status " + statusCode);
|
| 138 | 136 |
System.out.println("AAI blocked");
|
| ... | ... | |
| 157 | 155 |
} |
| 158 | 156 |
|
| 159 | 157 |
private boolean reachedMaximumNumberOfServices(List<RegisteredService> registeredServices) {
|
| 160 |
if (registeredServices.size() == 5) {
|
|
| 161 |
return true; |
|
| 162 |
} |
|
| 163 |
return false; |
|
| 158 |
return registeredServices.size() == 5; |
|
| 164 | 159 |
} |
| 165 | 160 |
} |
Also available in: Unified diff
[Users]: 1. Update Uikit. 2. Change regisered service api. 3. fix empty registered service list.