You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by an...@apache.org on 2017/06/30 08:20:21 UTC
syncope git commit: [SYNCOPE-1111] new any type is now visible
without re-logging in
Repository: syncope
Updated Branches:
refs/heads/master fedae9c76 -> 3ff021421
[SYNCOPE-1111] new any type is now visible without re-logging in
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3ff02142
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3ff02142
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3ff02142
Branch: refs/heads/master
Commit: 3ff021421d2d4a24d39cafc3f227063e941ac1a2
Parents: fedae9c
Author: Andrea Patricelli <an...@apache.org>
Authored: Fri Jun 30 10:19:12 2017 +0200
Committer: Andrea Patricelli <an...@apache.org>
Committed: Fri Jun 30 10:19:36 2017 +0200
----------------------------------------------------------------------
.../syncope/client/console/SyncopeConsoleSession.java | 10 +++++++---
.../org/apache/syncope/client/console/pages/Realms.java | 2 +-
.../syncope/client/console/panels/AnyTypesPanel.java | 1 +
.../org/apache/syncope/client/console/panels/Realm.java | 4 +---
.../org/apache/syncope/fit/console/AnyTypesITCase.java | 8 ++++++++
5 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/3ff02142/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
index 3d3daf8..af8295a 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
@@ -142,9 +142,7 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
}
private void afterAuthentication() {
- Pair<Map<String, Set<String>>, UserTO> self = client.self();
- auth = self.getLeft();
- selfTO = self.getRight();
+ refreshAuthorization();
}
@Override
@@ -276,6 +274,12 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
roles = null;
}
+ public void refreshAuthorization() {
+ Pair<Map<String, Set<String>>, UserTO> self = client.self();
+ auth = self.getLeft();
+ selfTO = self.getRight();
+ }
+
@SuppressWarnings("unchecked")
private <T> T getCachedService(final Class<T> serviceClass) {
T service;
http://git-wip-us.apache.org/repos/asf/syncope/blob/3ff02142/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java
index 0a8e9ad..f5a523d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java
@@ -155,7 +155,7 @@ public class Realms extends BasePage {
WizardModalPanel<?> modalPanel = newItemEvent.getModalPanel();
if (event.getPayload() instanceof AjaxWizard.NewItemActionEvent && modalPanel != null) {
- final IModel<Serializable> model = new CompoundPropertyModel<Serializable>(modalPanel.getItem());
+ final IModel<Serializable> model = new CompoundPropertyModel<>(modalPanel.getItem());
templateModal.setFormModel(model);
templateModal.header(newItemEvent.getResourceModel());
newItemEvent.getTarget().add(templateModal.setContent(modalPanel));
http://git-wip-us.apache.org/repos/asf/syncope/blob/3ff02142/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
index f08d13e..2460d7f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
@@ -81,6 +81,7 @@ public class AnyTypesPanel extends TypesDirectoryPanel<AnyTypeTO, AnyTypesPanel.
restClient.update(modelObject);
}
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
+ SyncopeConsoleSession.get().refreshAuthorization();
AnyTypesPanel.this.updateResultTable(target);
modal.close(target);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/3ff02142/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
index 17338c1..0d74c95 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
@@ -73,14 +73,12 @@ public abstract class Realm extends WizardMgtPanel<RealmTO> {
private final List<AnyTypeTO> anyTypeTOs;
- private final AnyTypeRestClient anyTypeRestClient = new AnyTypeRestClient();
-
protected final RealmWizardBuilder wizardBuilder;
public Realm(final String id, final RealmTO realmTO, final PageReference pageRef, final int selectedIndex) {
super(id, true);
this.realmTO = realmTO;
- this.anyTypeTOs = anyTypeRestClient.list();
+ this.anyTypeTOs = new AnyTypeRestClient().list();
setPageRef(pageRef);
http://git-wip-us.apache.org/repos/asf/syncope/blob/3ff02142/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypesITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypesITCase.java
index d56c76a..35f417d 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypesITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypesITCase.java
@@ -18,11 +18,13 @@
*/
package org.apache.syncope.fit.console;
+import static org.apache.syncope.fit.console.AbstractConsoleITCase.TESTER;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.Realms;
import org.apache.syncope.client.console.pages.Types;
import org.apache.syncope.client.console.panels.AjaxDataTablePanel;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
@@ -81,6 +83,12 @@ public class AnyTypesITCase extends AbstractTypesITCase {
TESTER.assertLabel(component.getPageRelativePath() + ":cells:1:cell", anyTypeTest);
TESTER.assertLabel(component.getPageRelativePath() + ":cells:3:cell", "[csv]");
+
+ // issue SYNCOPE-1111
+ TESTER.clickLink("body:realmsLI:realms");
+ TESTER.assertRenderedPage(Realms.class);
+ TESTER.assertLabel("body:content:body:container:content:tabbedPanel:tabs-container:tabs:4:link:title",
+ anyTypeTest);
}
@Test