Skip to content

Commit 6d8e189

Browse files
Fix for login form and logout request (#121)
1 parent e0d8247 commit 6d8e189

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/main/java/com/ericsson/ei/frontend/EIRequestsController.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,12 @@ public ResponseEntity<String> deleteRequests(Model model, HttpServletRequest req
157157
}
158158

159159
private ResponseEntity<String> getResponse(HttpRequestBase request) {
160-
String responseBody = "";
160+
String responseBody = "[]";
161161
int statusCode = HttpStatus.PROCESSING.value();
162162
try (CloseableHttpResponse eiResponse = client.execute(request)) {
163-
responseBody = StringUtils.defaultIfBlank(EntityUtils.toString(eiResponse.getEntity(), "utf-8"), "[]");
163+
if(eiResponse.getEntity() != null) {
164+
responseBody = StringUtils.defaultIfBlank(EntityUtils.toString(eiResponse.getEntity(), "utf-8"), "[]");
165+
}
164166
statusCode = eiResponse.getStatusLine().getStatusCode();
165167
LOG.debug("EI Http response status code: " + statusCode
166168
+ "\nEI Received response body:\n" + responseBody

src/main/resources/templates/login.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<input class="form-check-input" type="checkbox" data-bind="checked: $root.remember"/> Remember me</label>
3232
</div>
3333
</div>
34-
<button type="button" class="btn btn-primary btn-block"
34+
<button type="submit" class="btn btn-primary btn-block"
3535
data-bind="click: function(){$root.login($root.userState, $root.remember());}">Login
3636
</button>
3737
</form>

0 commit comments

Comments
 (0)