Skip to content

changes for testing #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jaypratapsingh1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

changes for testing #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/main/java/com/tarento/upsmf/userManagement/config/KeycloakConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,31 @@
public class KeycloakConfig {

//To be appended with /auth if keycloak version is less than 17
@Value("${keycloak.auth-server-url}")
private String serverUrl;
//@Value("${keycloak.auth-server-url}")
private String serverUrl="http://localhost:8080/auth";

@Value("${keycloak.realm}")
private String realm;
//@Value("${keycloak.realm}")
private String realm="sunbird-rc";

@Value("${keycloak.client-id}")
private String clientId;
//@Value("${keycloak.client-id}")
private String clientId="admin-api";

@Value("${keycloak.credentials.secret}")
private String clientSecret;
//@Value("${keycloak.credentials.secret}")
private String clientSecret="78712b5a-db33-4de6-9409-c84c9da33f1a";

@Value("${keycloak.admin-username}")
private String userName;
//@Value("${keycloak.admin-username}")
private String userName="admin";

@Value("${keycloak.admin-password}")
private String password;
//@Value("${keycloak.admin-password}")
private String password="admin";

@Value("${keycloak.grant-type}")
private String grantType;
//@Value("${keycloak.grant-type}")
private String grantType="password";

Keycloak keycloak = null;

public Keycloak getKeycloakInstance() {
log.info("keycloak real {} and server url {} .", realm, serverUrl);
//log.info("keycloak real {} and server url {} .", realm, serverUrl);
if (null == keycloak) {
keycloak = KeycloakBuilder.builder()
.serverUrl(serverUrl)
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/tarento/upsmf/userManagement/services/KeyCloakUsers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ public class KeyCloakUsers {
public javax.ws.rs.core.Response createUser(final KeyCloakUserDTO keyCloakUserDTO){
Keycloak keycloakInstance = keycloakConfig.getKeycloakInstance();
UserRepresentation newUser = createUserRepresentation(keyCloakUserDTO);
UsersResource usersResource = keycloakInstance.realm(keycloakConfig.getRealm()).users();
UsersResource usersResource = keycloakInstance.realm("sunbird-rc").users();
return usersResource.create(newUser);
}

public void updateUser(final KeyCloakUserDTO keyCloakUserDTO) {
Keycloak keycloakInstance = keycloakConfig.getKeycloakInstance();
UserResource userResource = keycloakInstance.realm(keycloakConfig.getRealm()).users().get(keyCloakUserDTO.getUsername());
UserResource userResource = keycloakInstance.realm("sunbird-rc").users().get(keyCloakUserDTO.getUsername());
UserRepresentation user = userResource.toRepresentation();
/*
* update user information here
Expand All @@ -42,19 +42,19 @@ public void updateUser(final KeyCloakUserDTO keyCloakUserDTO) {

public List<UserRepresentation> listUser() {
Keycloak keycloakInstance = keycloakConfig.getKeycloakInstance();
return keycloakInstance.realm(keycloakConfig.getRealm()).users().list();
return keycloakInstance.realm("sunbird-rc").users().list();
}

public void activateUser(final String userName){
Keycloak keycloakInstance = keycloakConfig.getKeycloakInstance();
UserResource userResource = keycloakInstance.realm(keycloakConfig.getRealm()).users().get(userName);
UserResource userResource = keycloakInstance.realm("sunbird-rc").users().get(userName);
UserRepresentation user = userResource.toRepresentation();
user.setEnabled(true);
}

public void deactivateUser(final String userName) {
Keycloak keycloakInstance = keycloakConfig.getKeycloakInstance();
UserResource userResource = keycloakInstance.realm(keycloakConfig.getRealm()).users().get(userName);
UserResource userResource = keycloakInstance.realm("sunbird-rc").users().get(userName);
UserRepresentation user = userResource.toRepresentation();
user.setEnabled(false);
}
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/com/tarento/upsmf/userManagement/services/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ public class UserService {
private Environment env;



private final RestTemplate restTemplate = new RestTemplate();
final String BASE_URL = env.getProperty("BaseURL");
final String KEYCLOAK_BASE_URL = env.getProperty("keycloak_BaseURL");
final String BASE_URL = "https://uphrh.in/api";
final String KEYCLOAK_BASE_URL = "http://localhost:8080/auth";


private HttpHeaders getHeader(){
HttpHeaders headers = new HttpHeaders();
Expand Down Expand Up @@ -55,9 +55,6 @@ public ResponseEntity<JsonNode> createUser(final JsonNode body) throws URISyntax
HttpHeaders headers = getHeader();
HttpEntity<JsonNode> httpEntity = new HttpEntity(body, headers);
ResponseEntity<JsonNode> result = restTemplate.postForEntity(uri1,httpEntity,JsonNode.class);
URI uri2 = new URI(KEYCLOAK_BASE_URL + "/v1/keycloak/user/create");
HttpHeaders headerForKeycloak = getHeader();
ResponseEntity<JsonNode> result2 = restTemplate.postForEntity(uri2,httpEntity,JsonNode.class);
return result;
}

Expand Down