libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

KEYCLOAK-1017 Add server version to cached resources to prevent problems with browser cache

Browse source
This commit is contained in:
Stian Thorgersen 2015-02-25 15:03:01 +01:00
parent b6a512b494
commit 5a10bbc8ca
71 changed files with 255 additions and 288 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/org/keycloak/Version.java
View file

@ -12,6 +12,7 @@ import java.util.Properties;
*/
public class Version {
public static String VERSION;
public static String RESOURCES_VERSION;
public static String BUILD_TIME;
public static final String UNKNOWN = "UNKNOWN";
public static final Version SINGLETON;
@ -26,6 +27,7 @@ public class Version {
props.load(is);
VERSION = props.getProperty("version");
BUILD_TIME = props.getProperty("build-time");
RESOURCES_VERSION = VERSION.toLowerCase();
} catch (IOException e) {
VERSION=UNKNOWN;
BUILD_TIME=UNKNOWN;

78
forms/common-themes/src/main/resources/theme/admin/base/index.ftl Executable file
View file

@ -0,0 +1,78 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Keycloak Admin Console</title>
<link rel="icon" href="${resourceUrl}/img/favicon.ico">
<link rel="stylesheet" href="${resourceUrl}/css/styles.css">
<script type="text/javascript">
var authUrl = '${authUrl}';
var resourceUrl = '${resourceUrl}';
</script>
<script src="${resourceUrl}/lib/jquery/jquery-1.10.2.js" type="text/javascript"></script>
<script src="${resourceUrl}/lib/select2-3.4.1/select2.js" type="text/javascript"></script>
<script src="${resourceUrl}/lib/angular/angular.js"></script>
<script src="${resourceUrl}/lib/angular/angular-resource.js"></script>
<script src="${resourceUrl}/lib/angular/angular-route.js"></script>
<script src="${resourceUrl}/lib/angular/ui-bootstrap-tpls-0.11.0.js"></script>
<script src="${resourceUrl}/lib/angular/select2.js" type="text/javascript"></script>
<script src="${resourceUrl}/lib/fileupload/angular-file-upload.min.js"></script>
<script src="${resourceUrl}/lib/filesaver/FileSaver.js"></script>
<script src="/auth/js/keycloak.js" type="text/javascript"></script>
<script src="${resourceUrl}/js/app.js" type="text/javascript"></script>
<script src="${resourceUrl}/js/controllers/realm.js" type="text/javascript"></script>
<script src="${resourceUrl}/js/controllers/applications.js" type="text/javascript"></script>
<script src="${resourceUrl}/js/controllers/oauth-clients.js" type="text/javascript"></script>
<script src="${resourceUrl}/js/controllers/users.js" type="text/javascript"></script>
<script src="${resourceUrl}/js/loaders.js" type="text/javascript"></script>
<script src="${resourceUrl}/js/services.js" type="text/javascript"></script>
<style>
[ng\:cloak], [ng-cloak], .ng-cloak {
display: none !important;
}
</style>
</head>
<body class="admin-console" data-ng-controller="GlobalCtrl" data-ng-cloak data-ng-show="auth.user">
<div class="feedback-aligner" data-ng-show="notification" data-ng-click="notification = null">
<div class="alert alert-{{notification.type}}">
<span class="pficon pficon-ok" ng-show="notification.type == 'success'"></span>
<span class="pficon pficon-info" ng-show="notification.type == 'info'"></span>
<span class="pficon-layered" ng-show="notification.type == 'danger'">
<span class="pficon pficon-error-octagon"></span>
<span class="pficon pficon-error-exclamation"></span>
</span>
<span class="pficon-layered" ng-show="notification.type == 'warning'">
<span class="pficon pficon-warning-triangle"></span>
<span class="pficon pficon-warning-exclamation"></span>
</span>
<strong>{{notification.header}}</strong> {{notification.message}}
</div>
</div>
<header class="navbar navbar-default navbar-pf navbar-main header">
<div data-ng-include data-src="resourceUrl + '/partials/menu.html'"></div>
</header>
<div class="container" data-ng-show="auth.hasAnyAccess">
<div data-ng-view id="view"></div>
<div id="loading" class="loading-backdrop">
<div class="loading">
<span>Loading...</span>
</div>
</div>
</div>
</body>
</html>

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

@ -1,77 +0,0 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Keycloak Admin Console</title>
<link rel="icon" href="img/favicon.ico">
<link rel="stylesheet" href="css/styles.css">
<script src="lib/jquery/jquery-1.10.2.js" type="text/javascript"></script>
<script src="lib/select2-3.4.1/select2.js" type="text/javascript"></script>
<script src="lib/angular/angular.js"></script>
<script src="lib/angular/angular-resource.js"></script>
<script src="lib/angular/angular-route.js"></script>
<script src="lib/angular/ui-bootstrap-tpls-0.11.0.js"></script>
<script src="lib/angular/select2.js" type="text/javascript"></script>
<script src="lib/fileupload/angular-file-upload.min.js"></script>
<script src="lib/filesaver/FileSaver.js"></script>
<script src="js/keycloak.js" type="text/javascript"></script>
<script src="js/app.js" type="text/javascript"></script>
<script src="js/controllers/realm.js" type="text/javascript"></script>
<script src="js/controllers/applications.js" type="text/javascript"></script>
<script src="js/controllers/oauth-clients.js" type="text/javascript"></script>
<script src="js/controllers/users.js" type="text/javascript"></script>
<script src="js/loaders.js" type="text/javascript"></script>
<script src="js/services.js" type="text/javascript"></script>
<style>
[ng\:cloak], [ng-cloak], .ng-cloak {
display: none !important;
}
</style>
</head>
<body class="admin-console" data-ng-controller="GlobalCtrl" data-ng-cloak data-ng-show="auth.user">
<div id="idletimeout">
You will be logged off in <strong><span></span> seconds</strong> due to inactivity.
<a id="idletimeout-resume" href="#">Click here to continue using this web page</a>.
</div>
<div class="feedback-aligner" data-ng-show="notification" data-ng-click="notification = null">
<div class="alert alert-{{notification.type}}">
<span class="pficon pficon-ok" ng-show="notification.type == 'success'"></span>
<span class="pficon pficon-info" ng-show="notification.type == 'info'"></span>
<span class="pficon-layered" ng-show="notification.type == 'danger'">
<span class="pficon pficon-error-octagon"></span>
<span class="pficon pficon-error-exclamation"></span>
</span>
<span class="pficon-layered" ng-show="notification.type == 'warning'">
<span class="pficon pficon-warning-triangle"></span>
<span class="pficon pficon-warning-exclamation"></span>
</span>
<strong>{{notification.header}}</strong> {{notification.message}}
</div>
</div>
<header class="navbar navbar-default navbar-pf navbar-main header">
<div data-ng-include data-src="'partials/menu.html'"></div>
</header>
<div class="container" data-ng-show="auth.hasAnyAccess">
<div data-ng-view id="view"></div>
<div id="loading" class="loading-backdrop">
<div class="loading">
<span>Loading...</span>
</div>
</div>
</div>
</body>
</html>

163
forms/common-themes/src/main/resources/theme/admin/base/resources/js/app.js
View file

@ -6,13 +6,12 @@ consoleBaseUrl = consoleBaseUrl + "/console";
var configUrl = consoleBaseUrl + "/config";
var auth = {};
var authUrl = window.location.href.substring(0, window.location.href.indexOf('/admin/'));
var module = angular.module('keycloak', [ 'keycloak.services', 'keycloak.loaders', 'ui.bootstrap', 'ui.select2', 'angularFileUpload' ]);
var resourceRequests = 0;
var loadingTimer = -1;
angular.element(document).ready(function ($http) {
angular.element(document).ready(function () {
var keycloakAuth = new Keycloak(configUrl);
keycloakAuth.onAuthLogout = function() {
@ -58,27 +57,15 @@ module.factory('authInterceptor', function($q, Auth) {
module.config([ '$routeProvider', function($routeProvider) {
$routeProvider
/*
.when('/create/realm', {
templateUrl : 'partials/realm-detail.html',
resolve : {
realm : function(RealmLoader) {
return {};
}
},
controller : 'RealmDetailCtrl'
})
*/
.when('/create/realm', {
templateUrl : 'partials/realm-create.html',
templateUrl : resourceUrl + '/partials/realm-create.html',
resolve : {
},
controller : 'RealmCreateCtrl'
})
.when('/realms/:realm', {
templateUrl : 'partials/realm-detail.html',
templateUrl : resourceUrl + '/partials/realm-detail.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -90,7 +77,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmDetailCtrl'
})
.when('/realms/:realm/login-settings', {
templateUrl : 'partials/realm-login-settings.html',
templateUrl : resourceUrl + '/partials/realm-login-settings.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -102,7 +89,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmLoginSettingsCtrl'
})
.when('/realms/:realm/theme-settings', {
templateUrl : 'partials/realm-theme-settings.html',
templateUrl : resourceUrl + '/partials/realm-theme-settings.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -114,7 +101,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmThemeCtrl'
})
.when('/realms/:realm/cache-settings', {
templateUrl : 'partials/realm-cache-settings.html',
templateUrl : resourceUrl + '/partials/realm-cache-settings.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -126,11 +113,11 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmCacheCtrl'
})
.when('/realms', {
templateUrl : 'partials/realm-list.html',
templateUrl : resourceUrl + '/partials/realm-list.html',
controller : 'RealmListCtrl'
})
.when('/realms/:realm/token-settings', {
templateUrl : 'partials/realm-tokens.html',
templateUrl : resourceUrl + '/partials/realm-tokens.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -139,7 +126,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmTokenDetailCtrl'
})
.when('/realms/:realm/keys-settings', {
templateUrl : 'partials/realm-keys.html',
templateUrl : resourceUrl + '/partials/realm-keys.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -148,7 +135,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmKeysDetailCtrl'
})
.when('/realms/:realm/identity-provider-settings', {
templateUrl : 'partials/realm-identity-provider.html',
templateUrl : resourceUrl + '/partials/realm-identity-provider.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -166,7 +153,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmIdentityProviderCtrl'
})
.when('/create/identity-provider/:realm/:provider_id', {
templateUrl : function(params){ return 'partials/realm-identity-provider-' + params.provider_id + '.html'; },
templateUrl : function(params){ return resourceUrl + '/partials/realm-identity-provider-' + params.provider_id + '.html'; },
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -202,7 +189,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmIdentityProviderCtrl'
})
.when('/realms/:realm/default-roles', {
templateUrl : 'partials/realm-default-roles.html',
templateUrl : resourceUrl + '/partials/realm-default-roles.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -217,7 +204,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmDefaultRolesCtrl'
})
.when('/realms/:realm/required-credentials', {
templateUrl : 'partials/realm-credentials.html',
templateUrl : resourceUrl + '/partials/realm-credentials.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -226,7 +213,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmRequiredCredentialsCtrl'
})
.when('/realms/:realm/smtp-settings', {
templateUrl : 'partials/realm-smtp.html',
templateUrl : resourceUrl + '/partials/realm-smtp.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -235,7 +222,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmSMTPSettingsCtrl'
})
.when('/realms/:realm/events', {
templateUrl : 'partials/realm-events.html',
templateUrl : resourceUrl + '/partials/realm-events.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -244,7 +231,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmEventsCtrl'
})
.when('/realms/:realm/events-settings', {
templateUrl : 'partials/realm-events-config.html',
templateUrl : resourceUrl + '/partials/realm-events-config.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -259,7 +246,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmEventsConfigCtrl'
})
.when('/create/user/:realm', {
templateUrl : 'partials/user-detail.html',
templateUrl : resourceUrl + '/partials/user-detail.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -271,7 +258,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'UserDetailCtrl'
})
.when('/realms/:realm/users/:user', {
templateUrl : 'partials/user-detail.html',
templateUrl : resourceUrl + '/partials/user-detail.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -283,7 +270,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'UserDetailCtrl'
})
.when('/realms/:realm/users/:user/user-credentials', {
templateUrl : 'partials/user-credentials.html',
templateUrl : resourceUrl + '/partials/user-credentials.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -295,7 +282,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'UserCredentialsCtrl'
})
.when('/realms/:realm/users/:user/role-mappings', {
templateUrl : 'partials/role-mappings.html',
templateUrl : resourceUrl + '/partials/role-mappings.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -310,7 +297,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'UserRoleMappingCtrl'
})
.when('/realms/:realm/users/:user/sessions', {
templateUrl : 'partials/user-sessions.html',
templateUrl : resourceUrl + '/partials/user-sessions.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -325,7 +312,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'UserSessionsCtrl'
})
.when('/realms/:realm/users/:user/federated-identity', {
templateUrl : 'partials/user-federated-identity.html',
templateUrl : resourceUrl + '/partials/user-federated-identity.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -340,7 +327,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'UserFederatedIdentityCtrl'
})
.when('/realms/:realm/users', {
templateUrl : 'partials/user-list.html',
templateUrl : resourceUrl + '/partials/user-list.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -350,7 +337,7 @@ module.config([ '$routeProvider', function($routeProvider) {
})
.when('/create/role/:realm', {
templateUrl : 'partials/role-detail.html',
templateUrl : resourceUrl + '/partials/role-detail.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -368,7 +355,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RoleDetailCtrl'
})
.when('/realms/:realm/roles/:role', {
templateUrl : 'partials/role-detail.html',
templateUrl : resourceUrl + '/partials/role-detail.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -386,7 +373,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RoleDetailCtrl'
})
.when('/realms/:realm/roles', {
templateUrl : 'partials/role-list.html',
templateUrl : resourceUrl + '/partials/role-list.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -399,7 +386,7 @@ module.config([ '$routeProvider', function($routeProvider) {
})
.when('/create/role/:realm/applications/:application', {
templateUrl : 'partials/application-role-detail.html',
templateUrl : resourceUrl + '/partials/application-role-detail.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -420,7 +407,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationRoleDetailCtrl'
})
.when('/realms/:realm/applications/:application/roles/:role', {
templateUrl : 'partials/application-role-detail.html',
templateUrl : resourceUrl + '/partials/application-role-detail.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -441,7 +428,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationRoleDetailCtrl'
})
.when('/realms/:realm/applications/:application/claims', {
templateUrl : 'partials/application-claims.html',
templateUrl : resourceUrl + '/partials/application-claims.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -456,7 +443,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationClaimsCtrl'
})
.when('/realms/:realm/applications/:application/sessions', {
templateUrl : 'partials/application-sessions.html',
templateUrl : resourceUrl + '/partials/application-sessions.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -471,7 +458,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationSessionsCtrl'
})
.when('/realms/:realm/applications/:application/credentials', {
templateUrl : 'partials/application-credentials.html',
templateUrl : resourceUrl + '/partials/application-credentials.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -483,7 +470,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationCredentialsCtrl'
})
.when('/realms/:realm/applications/:application/identity-provider', {
templateUrl : 'partials/application-identity-provider.html',
templateUrl : resourceUrl + '/partials/application-identity-provider.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -495,7 +482,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationIdentityProviderCtrl'
})
.when('/realms/:realm/applications/:application/clustering', {
templateUrl : 'partials/application-clustering.html',
templateUrl : resourceUrl + '/partials/application-clustering.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -507,7 +494,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationClusteringCtrl'
})
.when('/register-node/realms/:realm/applications/:application/clustering', {
templateUrl : 'partials/application-clustering-node.html',
templateUrl : resourceUrl + '/partials/application-clustering-node.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -519,7 +506,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationClusteringNodeCtrl'
})
.when('/realms/:realm/applications/:application/clustering/:node', {
templateUrl : 'partials/application-clustering-node.html',
templateUrl : resourceUrl + '/partials/application-clustering-node.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -531,7 +518,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationClusteringNodeCtrl'
})
.when('/realms/:realm/applications/:application/saml/keys', {
templateUrl : 'partials/application-saml-keys.html',
templateUrl : resourceUrl + '/partials/application-saml-keys.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -543,7 +530,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationSamlKeyCtrl'
})
.when('/realms/:realm/applications/:application/saml/:keyType/import/:attribute', {
templateUrl : 'partials/application-saml-key-import.html',
templateUrl : resourceUrl + '/partials/application-saml-key-import.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -555,7 +542,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationCertificateImportCtrl'
})
.when('/realms/:realm/applications/:application/saml/:keyType/export/:attribute', {
templateUrl : 'partials/application-saml-key-export.html',
templateUrl : resourceUrl + '/partials/application-saml-key-export.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -567,7 +554,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationCertificateExportCtrl'
})
.when('/realms/:realm/applications/:application/roles', {
templateUrl : 'partials/application-role-list.html',
templateUrl : resourceUrl + '/partials/application-role-list.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -582,7 +569,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationRoleListCtrl'
})
.when('/realms/:realm/applications/:application/revocation', {
templateUrl : 'partials/application-revocation.html',
templateUrl : resourceUrl + '/partials/application-revocation.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -594,7 +581,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationRevocationCtrl'
})
.when('/realms/:realm/applications/:application/scope-mappings', {
templateUrl : 'partials/application-scope-mappings.html',
templateUrl : resourceUrl + '/partials/application-scope-mappings.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -609,7 +596,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationScopeMappingCtrl'
})
.when('/realms/:realm/applications/:application/installation', {
templateUrl : 'partials/application-installation.html',
templateUrl : resourceUrl + '/partials/application-installation.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -621,7 +608,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationInstallationCtrl'
})
.when('/create/application/:realm', {
templateUrl : 'partials/application-detail.html',
templateUrl : resourceUrl + '/partials/application-detail.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -639,7 +626,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationDetailCtrl'
})
.when('/realms/:realm/applications/:application', {
templateUrl : 'partials/application-detail.html',
templateUrl : resourceUrl + '/partials/application-detail.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -657,7 +644,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationDetailCtrl'
})
.when('/realms/:realm/applications', {
templateUrl : 'partials/application-list.html',
templateUrl : resourceUrl + '/partials/application-list.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -673,7 +660,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'ApplicationListCtrl'
})
.when('/import/application/:realm', {
templateUrl : 'partials/application-import.html',
templateUrl : resourceUrl + '/partials/application-import.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -688,7 +675,7 @@ module.config([ '$routeProvider', function($routeProvider) {
// OAUTH Client
.when('/realms/:realm/oauth-clients/:oauth/claims', {
templateUrl : 'partials/oauth-client-claims.html',
templateUrl : resourceUrl + '/partials/oauth-client-claims.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -703,7 +690,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'OAuthClientClaimsCtrl'
})
.when('/realms/:realm/oauth-clients/:oauth/revocation', {
templateUrl : 'partials/oauth-client-revocation.html',
templateUrl : resourceUrl + '/partials/oauth-client-revocation.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -715,7 +702,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'OAuthClientRevocationCtrl'
})
.when('/realms/:realm/oauth-clients/:oauth/credentials', {
templateUrl : 'partials/oauth-client-credentials.html',
templateUrl : resourceUrl + '/partials/oauth-client-credentials.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -727,7 +714,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'OAuthClientCredentialsCtrl'
})
.when('/realms/:realm/oauth-clients/:oauth/scope-mappings', {
templateUrl : 'partials/oauth-client-scope-mappings.html',
templateUrl : resourceUrl + '/partials/oauth-client-scope-mappings.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -742,7 +729,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'OAuthClientScopeMappingCtrl'
})
.when('/realms/:realm/oauth-clients/:oauth/installation', {
templateUrl : 'partials/oauth-client-installation.html',
templateUrl : resourceUrl + '/partials/oauth-client-installation.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -757,7 +744,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'OAuthClientInstallationCtrl'
})
.when('/create/oauth-client/:realm', {
templateUrl : 'partials/oauth-client-detail.html',
templateUrl : resourceUrl + '/partials/oauth-client-detail.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -769,7 +756,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'OAuthClientDetailCtrl'
})
.when('/realms/:realm/oauth-clients/:oauth', {
templateUrl : 'partials/oauth-client-detail.html',
templateUrl : resourceUrl + '/partials/oauth-client-detail.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -781,7 +768,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'OAuthClientDetailCtrl'
})
.when('/realms/:realm/oauth-clients/:oauth/identity-provider', {
templateUrl : 'partials/oauth-client-identity-provider.html',
templateUrl : resourceUrl + '/partials/oauth-client-identity-provider.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -793,7 +780,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'OAuthClientIdentityProviderCtrl'
})
.when('/realms/:realm/oauth-clients', {
templateUrl : 'partials/oauth-client-list.html',
templateUrl : resourceUrl + '/partials/oauth-client-list.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -806,11 +793,11 @@ module.config([ '$routeProvider', function($routeProvider) {
})
.when('/', {
templateUrl : 'partials/home.html',
templateUrl : resourceUrl + '/partials/home.html',
controller : 'HomeCtrl'
})
.when('/mocks/:realm', {
templateUrl : 'partials/realm-detail_mock.html',
templateUrl : resourceUrl + '/partials/realm-detail_mock.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -822,7 +809,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmDetailCtrl'
})
.when('/realms/:realm/sessions/revocation', {
templateUrl : 'partials/session-revocation.html',
templateUrl : resourceUrl + '/partials/session-revocation.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -831,7 +818,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmRevocationCtrl'
})
.when('/realms/:realm/sessions/realm', {
templateUrl : 'partials/session-realm.html',
templateUrl : resourceUrl + '/partials/session-realm.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -843,7 +830,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmSessionStatsCtrl'
})
.when('/realms/:realm/user-federation', {
templateUrl : 'partials/user-federation.html',
templateUrl : resourceUrl + '/partials/user-federation.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -852,7 +839,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'UserFederationCtrl'
})
.when('/realms/:realm/user-federation/providers/ldap/:instance', {
templateUrl : 'partials/federated-ldap.html',
templateUrl : resourceUrl + '/partials/federated-ldap.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -864,7 +851,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'LDAPCtrl'
})
.when('/create/user-federation/:realm/providers/ldap', {
templateUrl : 'partials/federated-ldap.html',
templateUrl : resourceUrl + '/partials/federated-ldap.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -876,7 +863,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'LDAPCtrl'
})
.when('/realms/:realm/user-federation/providers/kerberos/:instance', {
templateUrl : 'partials/federated-kerberos.html',
templateUrl : resourceUrl + '/partials/federated-kerberos.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -891,7 +878,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'GenericUserFederationCtrl'
})
.when('/create/user-federation/:realm/providers/kerberos', {
templateUrl : 'partials/federated-kerberos.html',
templateUrl : resourceUrl + '/partials/federated-kerberos.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -906,7 +893,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'GenericUserFederationCtrl'
})
.when('/create/user-federation/:realm/providers/:provider', {
templateUrl : 'partials/federated-generic.html',
templateUrl : resourceUrl + '/partials/federated-generic.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -923,7 +910,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'GenericUserFederationCtrl'
})
.when('/realms/:realm/user-federation/providers/:provider/:instance', {
templateUrl : 'partials/federated-generic.html',
templateUrl : resourceUrl + '/partials/federated-generic.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -938,7 +925,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'GenericUserFederationCtrl'
})
.when('/realms/:realm/defense/headers', {
templateUrl : 'partials/defense-headers.html',
templateUrl : resourceUrl + '/partials/defense-headers.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -951,7 +938,7 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'DefenseHeadersCtrl'
})
.when('/realms/:realm/defense/brute-force', {
templateUrl : 'partials/brute-force.html',
templateUrl : resourceUrl + '/partials/brute-force.html',
resolve : {
realm : function(RealmLoader) {
return RealmLoader();
@ -960,14 +947,14 @@ module.config([ '$routeProvider', function($routeProvider) {
controller : 'RealmBruteForceCtrl'
})
.when('/server-info', {
templateUrl : 'partials/server-info.html'
templateUrl : resourceUrl + '/partials/server-info.html'
})
.when('/logout', {
templateUrl : 'partials/home.html',
templateUrl : resourceUrl + '/partials/home.html',
controller : 'LogoutCtrl'
})
.otherwise({
templateUrl : 'partials/notfound.html'
templateUrl : resourceUrl + '/partials/notfound.html'
});
} ]);
@ -1291,7 +1278,7 @@ module.directive('kcDropdown', function ($compile, Notifications) {
},
restrict: 'EA',
replace: true,
templateUrl: 'templates/kc-select.html',
templateUrl: resourceUrl + '/templates/kc-select.html',
link: function(scope, element, attr) {
scope.updateModel = function(item) {
scope.kcModel = item;
@ -1345,7 +1332,7 @@ module.directive('kcNavigation', function ($compile, Notifications) {
scope: true,
restrict: 'E',
replace: true,
templateUrl: 'templates/kc-navigation.html',
templateUrl: resourceUrl + '/templates/kc-navigation.html',
compile: function(element, attrs){
if (!attrs.kcSocial) {
@ -1360,7 +1347,7 @@ module.directive('kcNavigationApplication', function () {
scope: true,
restrict: 'E',
replace: true,
templateUrl: 'templates/kc-navigation-application.html',
templateUrl: resourceUrl + '/templates/kc-navigation-application.html',
}
});
@ -1369,7 +1356,7 @@ module.directive('kcNavigationOauthClient', function () {
scope: true,
restrict: 'E',
replace: true,
templateUrl: 'templates/kc-navigation-oauth-client.html',
templateUrl: resourceUrl + '/templates/kc-navigation-oauth-client.html',
}
});

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

@ -4,6 +4,7 @@ module.controller('GlobalCtrl', function($scope, $http, Auth, WhoAmI, Current, $
};
$scope.authUrl = authUrl;
$scope.resourceUrl = resourceUrl;
$scope.auth = Auth;
$scope.serverInfo = ServerInfo.get();
$scope.serverInfoUpdate = function() {

2
forms/common-themes/src/main/resources/theme/admin/base/resources/js/services.js
View file

@ -20,7 +20,7 @@ module.service('Dialog', function($modal) {
};
return $modal.open({
templateUrl: 'templates/kc-modal.html',
templateUrl: resourceUrl + '/templates/kc-modal.html',
controller: controller,
resolve: {
title: function() {

4
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-claims.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-application></kc-navigation-application>
<div id="content">
@ -9,7 +9,7 @@
</ol>
<h2 data-ng-hide="create"><span>{{application.name}}</span> Allowed Claims <span tooltip-placement="right" tooltip="Allows you to restrict which claim information is stored in the access token generated for the application." class="fa fa-info-circle"></span></h2>
<form class="form-horizontal" name="claimForm">
<div data-ng-include data-src="'partials/claims.html'"></div>
<div data-ng-include data-src="resourceUrl + '/partials/claims.html'"></div>
<div class="pull-right form-actions" data-ng-show="access.manageApplications">
<button kc-reset data-ng-show="changed">Clear changes</button>
<button kc-save data-ng-show="changed">Save</button>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-clustering-node.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-application></kc-navigation-application>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-clustering.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-application></kc-navigation-application>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-credentials.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-application></kc-navigation-application>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-detail.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-application></kc-navigation-application>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-identity-provider.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-application></kc-navigation-application>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-import.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">
<li class="active"><a href="">Application Import</a></li>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-installation.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-application></kc-navigation-application>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-keys.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<kc-navigation-application></kc-navigation-application>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-list.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<h2></h2>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-revocation.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-application></kc-navigation-application>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-role-detail.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-application></kc-navigation-application>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-role-list.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-application></kc-navigation-application>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-saml-key-export.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<kc-navigation-application></kc-navigation-application>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-saml-key-import.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<kc-navigation-application></kc-navigation-application>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-saml-keys.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<kc-navigation-application></kc-navigation-application>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-scope-mappings.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-application></kc-navigation-application>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-sessions.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-application></kc-navigation-application>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/brute-force.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf" data-ng-show="!create">
<li><a href="#/realms/{{realm.realm}}/defense/headers">Headers</a></li>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/defense-headers.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">
<li class="active"><a href="#/realms/{{realm.realm}}/defense/headers">Headers</a></li>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/federated-generic.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">
<li><a href="#/realms/{{realm.realm}}/users">User List</a></li>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/federated-kerberos.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">
<li><a href="#/realms/{{realm.realm}}/users">User List</a></li>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/federated-ldap.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">
<li><a href="#/realms/{{realm.realm}}/users">User List</a></li>

4
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-claims.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-oauth-client></kc-navigation-oauth-client>
<div id="content">
@ -9,7 +9,7 @@
</ol>
<h2 data-ng-hide="create"><span>{{oauth.name}}</span> Allowed Claims <span tooltip-placement="right" tooltip="Allows you to restrict which claim information is stored in the access token generated for the application." class="fa fa-info-circle"></span></h2>
<form class="form-horizontal" name="claimForm">
<div data-ng-include data-src="'partials/claims.html'"></div>
<div data-ng-include data-src="resourceUrl + '/partials/claims.html'"></div>
<div class="pull-right form-actions" data-ng-show="access.manageClients">
<button kc-reset data-ng-show="changed">Clear changes</button>
<button kc-save data-ng-show="changed">Save</button>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-credentials.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<kc-navigation-oauth-client></kc-navigation-oauth-client>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-detail.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-oauth-client></kc-navigation-oauth-client>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-identity-provider.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-oauth-client></kc-navigation-oauth-client>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-installation.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-oauth-client></kc-navigation-oauth-client>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-list.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<h2></h2>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-revocation.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-oauth-client></kc-navigation-oauth-client>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/oauth-client-scope-mappings.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<kc-navigation-oauth-client></kc-navigation-oauth-client>
<div id="content">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-cache-settings.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<kc-navigation data-kc-current="general" data-kc-realm="realm.realm" data-kc-social="social"></kc-navigation>
<h2></h2>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-credentials.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<data-kc-navigation data-kc-current="credentials" data-kc-realm="realm.realm" data-kc-social="realm.social"></data-kc-navigation>
<h2></h2>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-default-roles.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">
<li><a href="#/realms/{{realm.realm}}/roles">Realm Roles</a></li>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-detail.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<kc-navigation data-kc-current="general" data-kc-realm="realm.realm" data-kc-social="social"></kc-navigation>
<h2></h2>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-events-config.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-events.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-facebook.html
View file

@ -1 +1 @@
<div data-ng-include data-src="'partials/realm-identity-provider-social.html'"></div>
<div data-ng-include data-src="resourceUrl + '/partials/realm-identity-provider-social.html'"></div>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-github.html
View file

@ -1 +1 @@
<div data-ng-include data-src="'partials/realm-identity-provider-social.html'"></div>
<div data-ng-include data-src="resourceUrl + '/partials/realm-identity-provider-social.html'"></div>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-google.html
View file

@ -1 +1 @@
<div data-ng-include data-src="'partials/realm-identity-provider-social.html'"></div>
<div data-ng-include data-src="resourceUrl + '/partials/realm-identity-provider-social.html'"></div>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-oidc.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<data-kc-navigation data-kc-current="social" data-kc-realm="realm.realm" data-kc-social="realm.social"></data-kc-navigation>
<h2></h2>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-saml.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main" data-ng-init="initSamlProvider()">
<data-kc-navigation data-kc-current="social" data-kc-realm="realm.realm" data-kc-social="realm.social"></data-kc-navigation>
<h2></h2>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-social.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<data-kc-navigation data-kc-current="social" data-kc-realm="realm.realm" data-kc-social="realm.social"></data-kc-navigation>
<h2></h2>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider-twitter.html
View file

@ -1 +1 @@
<div data-ng-include data-src="'partials/realm-identity-provider-social.html'"></div>
<div data-ng-include data-src="resourceUrl + '/partials/realm-identity-provider-social.html'"></div>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-identity-provider.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<data-kc-navigation data-kc-current="social" data-kc-realm="realm.realm" data-kc-social="realm.social"></data-kc-navigation>
<h2></h2>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-keys.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<data-kc-navigation data-kc-current="keys" data-kc-realm="realm.realm" data-kc-social="realm.social"></data-kc-navigation>
<h2></h2>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-login-settings.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<kc-navigation data-kc-current="general" data-kc-realm="realm.realm" data-kc-social="social"></kc-navigation>
<h2></h2>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-smtp.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<data-kc-navigation data-kc-current="email" data-kc-realm="realm.realm" data-kc-social="realm.social"></data-kc-navigation>
<h2></h2>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-theme-settings.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<kc-navigation data-kc-current="general" data-kc-realm="realm.realm" data-kc-social="social"></kc-navigation>
<h2></h2>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-tokens.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf" data-ng-show="!create">
<li><a href="#/realms/{{realm.realm}}/sessions/realm">Realm Sessions</a></li>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/role-detail.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/role-list.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">
<li class="active"><a href="#/realms/{{realm.realm}}/roles">Realm Roles</a></li>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/role-mappings.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf" data-ng-show="!create">
<li><a href="#/realms/{{realm.realm}}/users/{{user.username}}">Attributes</a></li>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-realm.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">
<li class="active"><a href="#/realms/{{realm.realm}}/sessions/realm">Realm Sessions</a></li>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-revocation.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf" data-ng-show="!create">
<li><a href="#/realms/{{realm.realm}}/sessions/realm">Realm Sessions</a></li>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-credentials.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf" data-ng-show="!create">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-detail.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf" data-ng-show="!create">

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-federated-identity.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">
<li><a href="#/realms/{{realm.realm}}/users/{{user.username}}">Attributes</a></li>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-federation.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-sm-3 " data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-sm-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">
<li><a href="#/realms/{{realm.realm}}/users">User List</a></li>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-list.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">
<li class="active"><a href="">User List</a></li>

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-sessions.html
View file

@ -1,4 +1,4 @@
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="'partials/realm-menu.html'"></div>
<div class="bs-sidebar col-md-3 clearfix" data-ng-include data-src="resourceUrl + '/partials/realm-menu.html'"></div>
<div id="content-area" class="col-md-9" role="main">
<ul class="nav nav-tabs nav-tabs-pf">
<li><a href="#/realms/{{realm.realm}}/users/{{user.username}}">Attributes</a></li>

4
services/src/main/java/org/keycloak/services/resources/ThemeResource.java
View file

@ -20,7 +20,7 @@ import java.io.InputStream;
*
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/
@Path("/theme")
@Path("/resources")
public class ThemeResource {
private static final Logger logger = Logger.getLogger(ThemeResource.class);
@ -37,7 +37,7 @@ public class ThemeResource {
* @return
*/
@GET
@Path("/{themeType}/{themeName}/{path:.*}")
@Path("/{version}/{themeType}/{themeName}/{path:.*}")
public Response getResource(@PathParam("themeType") String themType, @PathParam("themeName") String themeName, @PathParam("path") String path) {
try {
ThemeProvider themeProvider = session.getProvider(ThemeProvider.class, "extending");

86
services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
View file

@ -9,6 +9,8 @@ import org.jboss.resteasy.spi.NotFoundException;
import org.keycloak.ClientConnection;
import org.keycloak.Config;
import org.keycloak.freemarker.BrowserSecurityHeaderSetup;
import org.keycloak.freemarker.FreeMarkerException;
import org.keycloak.freemarker.FreeMarkerUtil;
import org.keycloak.freemarker.Theme;
import org.keycloak.freemarker.ThemeProvider;
import org.keycloak.models.AdminRoles;
@ -24,6 +26,7 @@ import org.keycloak.services.managers.ApplicationManager;
import org.keycloak.services.managers.AuthenticationManager;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.resources.KeycloakApplication;
import org.keycloak.services.resources.flows.Urls;
import org.keycloak.util.MimeTypeUtil;
import javax.ws.rs.GET;
@ -33,9 +36,11 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.CacheControl;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.Providers;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
@ -248,7 +253,7 @@ public class AdminConsole {
@GET
@NoCache
public Response logout() {
URI redirect = AdminRoot.adminConsoleUrl(uriInfo).path("index.html").build(realm.getName());
URI redirect = AdminRoot.adminConsoleUrl(uriInfo).build(realm.getName());
return Response.status(302).location(
OIDCLoginProtocolService.logoutUrl(uriInfo).queryParam("redirect_uri", redirect.toString()).build(realm.getName())
@ -266,72 +271,41 @@ public class AdminConsole {
* @throws URISyntaxException
*/
@GET
public Response getMainPage() throws URISyntaxException {
@NoCache
public Response getMainPage() throws URISyntaxException, IOException, FreeMarkerException {
if (!uriInfo.getRequestUri().getPath().endsWith("/")) {
return Response.status(302).location(uriInfo.getRequestUriBuilder().path("/").build()).build();
} else {
return getResource("index.html");
}
}
String adminTheme = realm.getAdminTheme();
if (adminTheme == null) {
adminTheme = "keycloak";
}
/**
* Javascript used by admin console
*
* @return
*/
@GET
@Path("js/keycloak.js")
@Produces("text/javascript")
public Response getKeycloakJs() {
InputStream inputStream = getClass().getClassLoader().getResourceAsStream("keycloak.js");
if (inputStream != null) {
CacheControl cacheControl = new CacheControl();
cacheControl.setNoTransform(false);
cacheControl.setMaxAge(Config.scope("theme").getInt("staticMaxAge", -1));
Map<String, String> map = new HashMap<String, String>();
return Response.ok(inputStream).type("text/javascript").cacheControl(cacheControl).build();
} else {
return Response.status(Response.Status.NOT_FOUND).build();
}
}
URI baseUri = uriInfo.getBaseUri();
/**
* Theme resources for this realm's admin console. (images, html files, etc..)
*
* @param path
* @return
*/
@GET
@Path("{path:.+}")
public Response getResource(@PathParam("path") String path) {
// todo
// I don't know why I need this. On IE 11, if I don't have this, getKeycloakJs() isn't invoked
// I just can't figure out what the difference is between IE11 and FF for console/js/keycloak.js calls
if (path.equals("js/keycloak.js")) {
return getKeycloakJs();
}
String authUrl = baseUri.toString();
authUrl = authUrl.substring(0, authUrl.length() - 1);
map.put("authUrl", authUrl);
map.put("resourceUrl", Urls.themeRoot(baseUri) + "/admin/" + adminTheme);
try {
ThemeProvider themeProvider = session.getProvider(ThemeProvider.class, "extending");
Theme theme = themeProvider.getTheme(realm.getAdminTheme(), Theme.Type.ADMIN);
InputStream resource = theme.getResourceAsStream(path);
if (resource != null) {
String contentType = MimeTypeUtil.getContentType(path);
CacheControl cacheControl = new CacheControl();
cacheControl.setNoTransform(false);
cacheControl.setMaxAge(Config.scope("theme").getInt("staticMaxAge", -1));
Response.ResponseBuilder builder = Response.ok(resource).type(contentType).cacheControl(cacheControl);
BrowserSecurityHeaderSetup.headers(builder, realm);
return builder.build();
} else {
return Response.status(Response.Status.NOT_FOUND).build();
}
} catch (Exception e) {
logger.warn("Failed to get theme resource", e);
return Response.serverError().build();
FreeMarkerUtil freeMarkerUtil = new FreeMarkerUtil();
String result = freeMarkerUtil.processTemplate(map, "index.ftl", theme);
Response.ResponseBuilder builder = Response.status(Response.Status.OK).type(MediaType.TEXT_HTML).entity(result);
BrowserSecurityHeaderSetup.headers(builder, realm);
return builder.build();
}
}
@GET
@Path("index.html")
public Response getIndexHtmlRedirect() {
return Response.status(302).location(uriInfo.getRequestUriBuilder().path("../").build()).build();
}
}

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

@ -1,5 +1,6 @@
package org.keycloak.services.resources.admin;
import org.jboss.resteasy.annotations.cache.Cache;
import org.keycloak.Version;
import org.keycloak.broker.provider.IdentityProvider;
import org.keycloak.broker.provider.IdentityProviderFactory;

3
services/src/main/java/org/keycloak/services/resources/flows/Urls.java
View file

@ -22,6 +22,7 @@
package org.keycloak.services.resources.flows;
import org.keycloak.OAuth2Constants;
import org.keycloak.Version;
import org.keycloak.protocol.oidc.OIDCLoginProtocol;
import org.keycloak.protocol.oidc.OIDCLoginProtocolService;
import org.keycloak.services.resources.AccountService;
@ -190,7 +191,7 @@ public class Urls {
}
public static URI themeRoot(URI baseUri) {
return themeBase(baseUri).build();
return themeBase(baseUri).path(Version.RESOURCES_VERSION).build();
}
private static UriBuilder requiredActionsBase(URI baseUri) {