Skip to content

fix: changing the bootstrapping suggestion to the command #35616

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
vmuzikar merged 1 commit into from
Dec 5, 2024
Merged

fix: changing the bootstrapping suggestion to the command #35616

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
2 changes: 1 addition & 1 deletion services/src/main/java/org/keycloak/services/resources/WelcomeResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ private Theme getTheme() {
}

protected String getAdminCreationMessage() {
Copy link
Contributor

@jonkoops jonkoops Dec 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Does this actually get used anywhere? Perhaps we can get rid of this code. Or let's at least log an issue to clean this up in v27.

Copy link
Contributor

@vmuzikar vmuzikar Dec 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

The adminUserCreationMessage property doesn't seem to be used, you're right. I don't think we need to wait to 27 before removing it. But we can do it as a follow-up.

Copy link
Contributor

@vmuzikar vmuzikar Dec 5, 2024

Choose a reason for hiding this comment

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

Actually, we can't remove as custom themes might be using it. So we need to wait to 27...

Copy link
Contributor Author

@shawkins shawkins Dec 5, 2024

Choose a reason for hiding this comment

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

Should I capture this as a follow up issue then?

Copy link
Contributor

@jonkoops jonkoops Dec 5, 2024

Choose a reason for hiding this comment

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

Ok, then let's log a task to remove it in the next major

return "or set the environment variables KC_BOOTSTRAP_ADMIN_USERNAME and KC_BOOTSTRAP_ADMIN_PASSWORD before starting the server";
return "or use a bootstrap-admin command";
}

private boolean shouldBootstrap() {
Expand Down
2 changes: 1 addition & 1 deletion themes/src/main/resources/theme/keycloak/welcome/index.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
</div>
</form>
<#else>
<p>To create the temporary administrative user open <a href="${localAdminUrl}">${localAdminUrl}</a>, or set the environment variables <code>KC_BOOTSTRAP_ADMIN_USERNAME</code> and <code>KC_BOOTSTRAP_ADMIN_PASSWORD</code> when starting the server.</p>
<p>To create the temporary administrative user open <a href="${localAdminUrl}">${localAdminUrl}</a>, or use a <code>bootstrap-admin</code> command.</p>
</#if>
</#if>
</div>
Expand Down
Loading