Merge pull request 'Fix build failure' (#15) from navodzoysa/device-mgt-core:fix-build-fail into master

Reviewed-on: #15
pull/16/head
Pahansith Gunathilake 2 years ago
commit 7e00ad24da

@ -46,5 +46,7 @@ public interface KeyManagerService {
@FormParam("scope") String scope, @FormParam("scope") String scope,
@FormParam("grant_type") String grantType, @FormParam("grant_type") String grantType,
@FormParam("assertion") String assertion, @FormParam("assertion") String assertion,
@FormParam("admin_access_token") String admin_access_token); @FormParam("admin_access_token") String admin_access_token,
@FormParam("username") String username,
@FormParam("password") String password);
} }

@ -69,7 +69,9 @@ public class KeyManagerServiceImpl implements KeyManagerService {
@FormParam("scope") String scope, @FormParam("scope") String scope,
@FormParam("grant_type") String grantType, @FormParam("grant_type") String grantType,
@FormParam("assertion") String assertion, @FormParam("assertion") String assertion,
@FormParam("admin_access_token") String admin_access_token) { @FormParam("admin_access_token") String admin_access_token,
@FormParam("username") String username,
@FormParam("password") String password) {
try { try {
if (basicAuthHeader == null) { if (basicAuthHeader == null) {
String msg = "Invalid credentials. Make sure your API call is invoked with a Basic Authorization header."; String msg = "Invalid credentials. Make sure your API call is invoked with a Basic Authorization header.";
@ -80,7 +82,7 @@ public class KeyManagerServiceImpl implements KeyManagerService {
TokenResponse resp = keyMgtService.generateAccessToken( TokenResponse resp = keyMgtService.generateAccessToken(
new TokenRequest(encodedClientCredentials.split(":")[0], new TokenRequest(encodedClientCredentials.split(":")[0],
encodedClientCredentials.split(":")[1], refreshToken, scope, encodedClientCredentials.split(":")[1], refreshToken, scope,
grantType, assertion,admin_access_token)); grantType, assertion, admin_access_token, username, password));
return Response.status(Response.Status.OK).entity(gson.toJson(resp)).build(); return Response.status(Response.Status.OK).entity(gson.toJson(resp)).build();
} catch (KeyMgtException e) { } catch (KeyMgtException e) {
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build(); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();

Loading…
Cancel
Save