keycloak-aplcache
Changes
distribution/downloads/pom.xml 11(+11 -0)
Details
diff --git a/adapters/oidc/js/src/main/resources/keycloak.js b/adapters/oidc/js/src/main/resources/keycloak.js
index 577452e..c6adb9b 100755
--- a/adapters/oidc/js/src/main/resources/keycloak.js
+++ b/adapters/oidc/js/src/main/resources/keycloak.js
@@ -160,15 +160,25 @@
if (loginIframe.enable) {
setupCheckLoginIframe().success(function() {
checkLoginIframe().success(function () {
+ kc.onAuthSuccess && kc.onAuthSuccess();
initPromise.setSuccess();
}).error(function () {
+ kc.onAuthError && kc.onAuthError();
if (initOptions.onLoad) {
onLoad();
}
});
});
} else {
- initPromise.setSuccess();
+ kc.updateToken(-1).success(function() {
+ kc.onAuthSuccess && kc.onAuthSuccess();
+ initPromise.setSuccess();
+ }).error(function() {
+ kc.onAuthError && kc.onAuthError();
+ if (initOptions.onLoad) {
+ onLoad();
+ }
+ });
}
} else if (initOptions.onLoad) {
onLoad();
@@ -368,7 +378,7 @@
minValidity = minValidity || 5;
var exec = function() {
- if (!kc.isTokenExpired(minValidity)) {
+ if (minValidity >= 0 && !kc.isTokenExpired(minValidity)) {
promise.setSuccess(false);
} else {
var params = 'grant_type=refresh_token&' + 'refresh_token=' + kc.refreshToken;
@@ -1056,7 +1066,7 @@
if (!(this instanceof CookieStorage)) {
return new CookieStorage();
}
-
+
var cs = this;
cs.get = function(state) {
distribution/downloads/pom.xml 11(+11 -0)
diff --git a/distribution/downloads/pom.xml b/distribution/downloads/pom.xml
index e1356d6..71b27d9 100755
--- a/distribution/downloads/pom.xml
+++ b/distribution/downloads/pom.xml
@@ -262,6 +262,17 @@
<artifactId>keycloak-wildfly-adapter-dist</artifactId>
<type>tar.gz</type>
</artifactItem>
+
+ <artifactItem>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-fuse-adapter-dist</artifactId>
+ <type>zip</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-fuse-adapter-dist</artifactId>
+ <type>tar.gz</type>
+ </artifactItem>
</artifactItems>
<outputDirectory>target/${project.version}/adapters/keycloak-oidc</outputDirectory>
</configuration>
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/menu.html b/themes/src/main/resources/theme/base/admin/resources/partials/menu.html
index 85a9a1c..8523142 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/menu.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/menu.html
@@ -1,13 +1,14 @@
<div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-1">
- <span class="sr-only">{{:: 'toggle-navigation' | translate}}</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="#/"></a>
+ <button type="button" class="navbar-toggle" ng-init="navCollapsed = true" ng-click="navCollapsed = !navCollapsed">
+ <span class="sr-only">{{:: 'toggle-navigation' | translate}}</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="#"></a>
</div>
-<div class="collapse navbar-collapse navbar-collapse-1">
+
+<div class="collapse navbar-collapse" collapse="navCollapsed">
<ul class="nav navbar-nav navbar-utility">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">