Revision 60299
Added by Katerina Iatropoulou about 3 years ago
RegisterServiceServlet.java | ||
---|---|---|
54 | 54 |
String idParam = request.getParameter("id"); |
55 | 55 |
|
56 | 56 |
if (idParam != null && !idParam.isEmpty()) { // EDIT CASE |
57 |
System.out.println("In edit"); |
|
57 |
//System.out.println("In edit");
|
|
58 | 58 |
try { |
59 | 59 |
int id = Integer.parseInt(idParam); |
60 | 60 |
RegisteredService registeredService = registeredServicesUtils.getRegisteredServiceDao().fetchRegisteredServiceById(id); |
... | ... | |
66 | 66 |
|
67 | 67 |
} else { |
68 | 68 |
if (registeredService == null) { |
69 |
System.out.println("No service found!"); |
|
69 |
//System.out.println("No service found!");
|
|
70 | 70 |
request.getSession().setAttribute("message", "Not valid registered service with given id " + id + "."); |
71 | 71 |
response.sendRedirect("./registeredServices"); |
72 | 72 |
logger.warn("Not valid registered service with " + id + "id."); |
73 | 73 |
|
74 | 74 |
} else { |
75 |
System.out.println("Not authorized"); |
|
75 |
//System.out.println("Not authorized");
|
|
76 | 76 |
request.getSession().setAttribute("message", "Not authorized to edit the registered service with id " + id + "."); |
77 | 77 |
response.sendRedirect("./registeredServices"); |
78 | 78 |
logger.warn("Not authorized to edit the service with " + id + "id."); |
... | ... | |
80 | 80 |
} |
81 | 81 |
|
82 | 82 |
} catch (NumberFormatException nfe) { |
83 |
System.out.println("WRONG FORMAT"); |
|
83 |
//System.out.println("WRONG FORMAT");
|
|
84 | 84 |
request.getSession().setAttribute("message", "Invalid service id."); |
85 | 85 |
response.sendRedirect("./registeredServices"); |
86 | 86 |
logger.error("Invalid service id.", nfe); |
87 | 87 |
|
88 | 88 |
} catch (SQLException sqle) { |
89 |
System.out.println("SQL PROBLEM"); |
|
89 |
//System.out.println("SQL PROBLEM");
|
|
90 | 90 |
request.getSession().setAttribute("message", "Could not fetch registered service."); |
91 | 91 |
response.sendRedirect("./registeredServices"); |
92 | 92 |
logger.error("Could not fetch registered service.", sqle); |
... | ... | |
106 | 106 |
} |
107 | 107 |
|
108 | 108 |
private void updateFormFields(HttpServletRequest request, String serviceName, String keyType, ServiceResponse serviceResponse) { |
109 |
System.out.println("UPDATING FORM"); |
|
109 |
//System.out.println("UPDATING FORM");
|
|
110 | 110 |
request.getSession().setAttribute("first_name", serviceName); |
111 |
System.out.println("Service response URI " + serviceResponse.getJwksUri()); |
|
111 |
//System.out.println("Service response URI " + serviceResponse.getJwksUri());
|
|
112 | 112 |
request.getSession().setAttribute("key_type", keyType); |
113 | 113 |
if (keyType != null) { |
114 | 114 |
if (keyType.equals("uri")) { |
... | ... | |
120 | 120 |
} else { |
121 | 121 |
key = new Key(); |
122 | 122 |
} |
123 |
System.out.println("Service response keys " + serviceResponse.getJwksUri()); |
|
123 |
//System.out.println("Service response keys " + serviceResponse.getJwksUri());
|
|
124 | 124 |
Gson gson = new GsonBuilder().setPrettyPrinting().create(); |
125 | 125 |
request.getSession().setAttribute("value", gson.toJson(key)); |
126 | 126 |
} |
... | ... | |
137 | 137 |
boolean canProceed = true; |
138 | 138 |
|
139 | 139 |
String mode = request.getParameter("mode").trim(); |
140 |
System.out.println("Mode was " + mode); |
|
140 |
//System.out.println("Mode was " + mode);
|
|
141 | 141 |
checkmode(mode); |
142 |
System.out.println("Mode is " + mode); |
|
142 |
//System.out.println("Mode is " + mode);
|
|
143 | 143 |
|
144 | 144 |
String serviceId = request.getParameter("id"); |
145 | 145 |
|
... | ... | |
173 | 173 |
request.getSession().setAttribute("value", jwksString); |
174 | 174 |
|
175 | 175 |
if (jwks.getKeys() == null || jwks.getKeys().length == 0) { |
176 |
System.out.println("Something wrong with the keys."); |
|
176 |
//System.out.println("Something wrong with the keys.");
|
|
177 | 177 |
request.getSession().setAttribute("value_error", true); |
178 | 178 |
canProceed = false; |
179 | 179 |
} |
... | ... | |
207 | 207 |
serverRequestJSON = createServiceJson(null, name, email, jwks); |
208 | 208 |
} |
209 | 209 |
if(serverRequestJSON != null) { |
210 |
System.out.println("SERVER JSON " + serverRequestJSON); |
|
210 |
//System.out.println("SERVER JSON " + serverRequestJSON);
|
|
211 | 211 |
serverMessage = tokenUtils.registerService(serverRequestJSON); |
212 | 212 |
logger.debug(serverMessage); |
213 | 213 |
if (serverMessage == null) { |
... | ... | |
252 | 252 |
response.sendRedirect("./registeredServices"); |
253 | 253 |
|
254 | 254 |
} else { |
255 |
System.out.println("In edit..."); |
|
255 |
//System.out.println("In edit...");
|
|
256 | 256 |
try { |
257 | 257 |
serviceIdInt = Integer.parseInt(serviceId); |
258 | 258 |
if (!registeredServicesUtils.isAuthorized(authentication.getSub(), serviceIdInt)) { |
... | ... | |
272 | 272 |
serverRequestJSON = createServiceJson(registeredService.getClientId(), name, email, jwks); |
273 | 273 |
} |
274 | 274 |
if (serverRequestJSON != null) { |
275 |
System.out.println("SERVER JSON " + serverRequestJSON); |
|
275 |
//System.out.println("SERVER JSON " + serverRequestJSON);
|
|
276 | 276 |
HttpResponse resp = tokenUtils.updateService(registeredService.getClientId(), serverRequestJSON, registeredService.getRegistrationAccessToken()); |
277 | 277 |
if (resp.getStatusLine().getStatusCode() == 200) { |
278 |
System.out.println("NAME >>>>" + name); |
|
278 |
//System.out.println("NAME >>>>" + name);
|
|
279 | 279 |
registeredService.setName(name); |
280 | 280 |
|
281 |
System.out.println("Client Id " + registeredService.getClientId()); |
|
281 |
//System.out.println("Client Id " + registeredService.getClientId());
|
|
282 | 282 |
try { |
283 | 283 |
registeredServicesUtils.getRegisteredServiceDao().update(registeredService); |
284 | 284 |
} catch (SQLException sqle) { |
... | ... | |
392 | 392 |
GsonBuilder builder = new GsonBuilder(); |
393 | 393 |
builder.serializeNulls(); |
394 | 394 |
Gson gson = builder.create(); |
395 |
System.out.println("Created json " + serviceJSON); |
|
395 |
//System.out.println("Created json " + serviceJSON);
|
|
396 | 396 |
return gson.toJson(serviceJSON); |
397 | 397 |
} |
398 | 398 |
|
... | ... | |
406 | 406 |
GsonBuilder builder = new GsonBuilder(); |
407 | 407 |
builder.serializeNulls(); |
408 | 408 |
Gson gson = builder.create(); |
409 |
System.out.println("Created json " + serviceJSON); |
|
409 |
//System.out.println("Created json " + serviceJSON);
|
|
410 | 410 |
return gson.toJson(serviceJSON); |
411 | 411 |
} |
412 | 412 |
|
... | ... | |
420 | 420 |
GsonBuilder builder = new GsonBuilder(); |
421 | 421 |
builder.serializeNulls(); |
422 | 422 |
Gson gson = builder.create(); |
423 |
System.out.println("Created json " + serviceJSON); |
|
423 |
//System.out.println("Created json " + serviceJSON);
|
|
424 | 424 |
return gson.toJson(serviceJSON); |
425 | 425 |
} |
426 | 426 |
|
Also available in: Unified diff
Up to date with the latest in trunk.