libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Merge pull request #701 from stianst/master

Browse source 
KEYCLOAK-696 Display Keycloak version in admin console
This commit is contained in:
Stian Thorgersen 2014-09-18 13:24:38 +02:00
commit 6f3132eafd
4 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
forms/common-themes/src/main/resources/theme/admin/base/resources/index.html
View file

@ -71,6 +71,7 @@
<span>Loading...</span>
</div>
</div>
<div id="serverInfo">Keycloak {{serverInfo.version}}</div>
</div>
</body>

3
forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/realm.js
View file

@ -1,10 +1,11 @@
module.controller('GlobalCtrl', function($scope, $http, Auth, WhoAmI, Current, $location, Notifications) {
module.controller('GlobalCtrl', function($scope, $http, Auth, WhoAmI, Current, $location, Notifications, ServerInfo) {
$scope.addMessage = function() {
Notifications.success("test");
};
$scope.authUrl = authUrl;
$scope.auth = Auth;
$scope.serverInfo = ServerInfo.get();
WhoAmI.get(function (data) {
Auth.user = data;

7
forms/common-themes/src/main/resources/theme/admin/keycloak/resources/css/admin-console.css
View file

@ -836,4 +836,11 @@ legend .kc-icon-collapse {
table table {
margin-bottom: 0 !important;
}
#serverInfo {
color: #666;
position: absolute;
bottom: 10px;
right: 10px;
}

14
services/src/main/java/org/keycloak/services/resources/admin/ServerInfoAdminResource.java
View file

@ -1,6 +1,6 @@
package org.keycloak.services.resources.admin;
import org.jboss.resteasy.annotations.cache.NoCache;
import org.keycloak.Version;
import org.keycloak.events.EventListenerProvider;
import org.keycloak.freemarker.Theme;
import org.keycloak.freemarker.ThemeProvider;
@ -31,9 +31,9 @@ public class ServerInfoAdminResource {
* @return
*/
@GET
@NoCache
public ServerInfoRepresentation getInfo() {
ServerInfoRepresentation info = new ServerInfoRepresentation();
info.setVersion(Version.VERSION);
setSocialProviders(info);
setThemes(info);
setEventListeners(info);
@ -71,6 +71,8 @@ public class ServerInfoAdminResource {
public static class ServerInfoRepresentation {
private String version;
private Map<String, List<String>> themes;
private List<String> socialProviders;
@ -81,6 +83,14 @@ public class ServerInfoAdminResource {
public ServerInfoRepresentation() {
}
public String getVersion() {
return version;
}
public void setVersion(String version) {
this.version = version;
}
public Map<String, List<String>> getThemes() {
return themes;
}