8000 Remove unused feature flags. by ssilvert · Pull Request #21039 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

Remove unused feature flags. #21039

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

Merged
ssilvert merged 3 commits into from
Jun 20, 2023
Merged

Remove unused feature flags. #21039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b076a13
Remove unused feature flags.
ssilvert Jun 15, 2023
3f9b023
Update release notes.
ssilvert Jun 16, 2023
b8a247c
Update docs/documentation/release_notes/topics/22_0_0.adoc
ssilvert Jun 20, 2023
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
8 changes: 7 additions & 1 deletion docs/documentation/release_notes/topics/22_0_0.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,10 @@ In relation to the KeyStore Vault news, we also integrated Quarkus's recently re

= Account Console v3 promoted to preview

In version 21.1.0 of Keycloak the new Account Console (version 3) was introduced as an experimental feature. Starting this version it has been promoted to a preview feature.
In version 21.1.0 of Keycloak the new Account Console (version 3) was introduced as an experimental feature. Starting this version it has been promoted to a preview feature.

= Account Console template variables removed

Two of the variables exposed to the Account Console V2 and V3 templates (`isEventsEnabled` and `isTotpConfigured`) were left unused, and have been removed in this release.

It is possible that if a developer extended the Account Console theme, he or she could make use of these variables. So make sure that these variables are no longer used if you are extending the base theme.
2 changes: 0 additions & 2 deletions js/apps/account-ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@
"isEditUserNameAllowed": ${realm.editUsernameAllowed?c},
"isInternationalizationEnabled": ${realm.isInternationalizationEnabled()?c},
"isLinkedAccountsEnabled": ${realm.identityFederationEnabled?c},
"isEventsEnabled": ${isEventsEnabled?c},
"isMyResourcesEnabled": ${(realm.userManagedAccessAllowed && isAuthorizationEnabled)?c},
"isTotpConfigured": ${isTotpConfigured?c},
"deleteAccountAllowed": ${deleteAccountAllowed?c},
"updateEmailFeatureEnabled": ${updateEmailFeatureEnabled?c},
"updateEmailActionEnabled": ${updateEmailActionEnabled?c},
Expand Down
6 changes: 0 additions & 6 deletions services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,23 +125,17 @@ public Response getMainPage() throws IOException, FreeMarkerException {
}
});

EventStoreProvider eventStore = session.getProvider(EventStoreProvider.class);
map.put("isEventsEnabled", eventStore != null && realm.isEventsEnabled());
map.put("isAuthorizationEnabled", Profile.isFeatureEnabled(Profile.Feature.AUTHORIZATION));

boolean isTotpConfigured = false;
boolean deleteAccountAllowed = false;
boolean isViewGroupsEnabled= false;
if (user != null) {
isTotpConfigured = user.credentialManager().isConfiguredFor(realm.getOTPPolicy().getType());
RoleModel deleteAccountRole = realm.getClientByClientId(Constants.ACCOUNT_MANAGEMENT_CLIENT_ID).getRole(AccountRoles.DELETE_ACCOUNT);
deleteAccountAllowed = deleteAccountRole != null && user.hasRole(deleteAccountRole) && realm.getRequiredActionProviderByAlias(DeleteAccount.PROVIDER_ID).isEnabled();
RoleModel viewGrouRole = realm.getClientByClientId(Constants.ACCOUNT_MANAGEMENT_CLIENT_ID).getRole(AccountRoles.VIEW_GROUPS);
isViewGroupsEnabled = viewGrouRole != null && user.hasRole(viewGrouRole);
}

map.put("isTotpConfigured", isTotpConfigured);
@jonkoops jonkoops Jun 16, 2023
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might not be using these, but the community might. Perhaps we should add a release note?

@ssilvert ssilvert Jun 16, 2023 •
edited
Loading
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TOTP setup is now done via AIA for extra security. And we use a REST endpoint to determine which 2FA's are set. So the account console would never need this flag. If someone in the community is using it, they are doing it wrong.

That being said, something in the release notes doesn't hurt.


map.put("deleteAccountAllowed", deleteAccountAllowed);

map.put("isViewGroupsEnabled", isViewGroupsEnabled);
Expand Down
4 changes: 1 addition & 3 deletions themes/src/main/resources/theme/keycloak.v2/account/index.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@
isEditUserNameAllowed : ${realm.editUsernameAllowed?c},
isInternationalizationEnabled : ${realm.isInternationalizationEnabled()?c},
isLinkedAccountsEnabled : ${realm.identityFederationEnabled?c},
isEventsEnabled : ${isEventsEnabled?c},
isMyResourcesEnabled : ${(realm.userManagedAccessAllowed && isAuthorizationEnabled)?c},
isTotpConfigured : ${isTotpConfigured?c},
deleteAccountAllowed : ${deleteAccountAllowed?c},
updateEmailFeatureEnabled: ${updateEmailFeatureEnabled?c},
updateEmailActionEnabled: ${updateEmailActionEnabled?c},
Expand Down Expand Up @@ -108,7 +106,7 @@
<script>
var content = <#include "resources/content.json"/>
</script>

<link rel="stylesheet" type="text/css" href="${resourceCommonUrl}/web_modules/@patternfly/react-core/dist/styles/base.css"/>
<link rel="stylesheet" type="text/css" href="${resourceCommonUrl}/web_modules/@patternfly/react-core/dist/styles/app.css"/>
<link rel="stylesheet" type="text/css" href="${resourceCommonUrl}/web_modules/@patternfly/patternfly/patternfly-addons.css"/>
Expand Down
0