Skip to content
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

Add log output during impport #1216

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Add log output during impport #1216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
06d4eac
Adds support for default first broker login flow on realm level
maximilian-krauss Oct 18, 2024
311fc39
Adds support for default first broker login flow on realm level
maximilian-krauss Oct 22, 2024
da260c3
Add log output during impport
Motouom Nov 26, 2024
ad7ca22
Merge branch 'fork/maximilian-krauss/feat/add-support-for-default-fir…
Motouom Nov 26, 2024
2f5eea6
Edit the changelog
Motouom Nov 27, 2024
fcba796
Revert "Merge branch 'fork/maximilian-krauss/feat/add-support-for-def…
Motouom Nov 27, 2024
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## Fixed
- otpPolicyAlgorithm ignored during import [#847](https://github.com/adorsys/keycloak-config-cli/issues/847)

## Added
- Enhance Standard output logging [#1215](https://github.com/adorsys/keycloak-config-cli/issues/1215)

### Added
- Added Navigation in the readme [#1099](https://github.com/adorsys/keycloak-config-cli/issues/1099)
### Added
Expand Down
30 changes: 27 additions & 3 deletions src/main/java/de/adorsys/keycloak/config/service/RealmImportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,37 +173,61 @@ private void setEventsEnabledWorkaround(RealmImport realmImport) {
}

private void createRealm(RealmImport realmImport) {
logger.debug("Creating realm '{}' ...", realmImport.getRealm());
logger.info("Starting creation of realm '{}'", realmImport.getRealm());

RealmRepresentation realm = CloneUtil.deepClone(realmImport, RealmRepresentation.class, ignoredPropertiesForRealmImport);
logger.debug("RealmRepresentation created: {}", realm);
logger.info("Creating realm in repository");
realmRepository.create(realm);
logger.info("Realm '{}' created successfully", realm.getRealm());

// refresh the access token to update the scopes. See: https://github.com/adorsys/keycloak-config-cli/issues/339
logger.debug("Refreshing access token to update scopes");
keycloakProvider.refreshToken();
logger.debug("Access token refreshed");

logger.debug("Loading state for realm '{}'", realmImport.getRealm());
stateService.loadState(realmImport);
logger.debug("State loaded for realm '{}'", realmImport.getRealm());
logger.info("Configuring realm '{}'", realmImport.getRealm());
configureRealm(realmImport, realm);
logger.info("Configuration completed for realm '{}'", realmImport.getRealm());
logger.info("Creation of realm '{}' completed", realmImport.getRealm());
}

private void updateRealm(RealmImport realmImport) {
logger.debug("Updating realm '{}'...", realmImport.getRealm());
logger.info("Starting update of realm '{}'", realmImport.getRealm());

logger.debug("Cloning realm import to RealmRepresentation");
RealmRepresentation realm = CloneUtil.deepClone(realmImport, RealmRepresentation.class, ignoredPropertiesForRealmImport);
logger.debug("RealmRepresentation created for update: {}", realm);

logger.info("Fetching existing realm '{}'", realmImport.getRealm());
RealmRepresentation existingRealm = realmRepository.get(realmImport.getRealm());
logger.debug("Existing realm retrieved: {}", existingRealm);

if (existingRealm.getEventsExpiration() != null) {
logger.debug("Preserving events expiration: {}", existingRealm.getEventsExpiration());
realm.setEventsExpiration(existingRealm.getEventsExpiration());
}

logger.info("Updating OTP policy for realm '{}'", realmImport.getRealm());
otpPolicyImportService.updateOtpPolicy(realmImport.getRealm(), realm);
logger.debug("OTP policy updated for realm '{}'", realmImport.getRealm());
logger.debug("Loading state for updated realm '{}'", realmImport.getRealm());
stateService.loadState(realm);
logger.debug("State loaded for updated realm '{}'", realmImport.getRealm());

logger.info("Updating realm in repository");
realmRepository.update(realm);
logger.info("Realm '{}' updated successfully", realm.getRealm());

logger.info("Configuring updated realm '{}'", realmImport.getRealm());
configureRealm(realmImport, realm);
logger.info("Configuration completed for updated realm '{}'", realmImport.getRealm());
logger.info("Update of realm '{}' completed", realmImport.getRealm());
}


private void importOtpPolicy(RealmImport realmImport) {
RealmRepresentation realmConfig = realmRepository.get(realmImport.getRealm());
if (realmConfig.getOtpPolicyAlgorithm() != null) {
Expand Down
Loading