Skip to content

Commit d7da438

Browse files
committed
Allow for more fine-grained control over self changes
1 parent 4aee47b commit d7da438

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

‎core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultUserWorkflowAdapter.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,12 @@ public DefaultUserWorkflowAdapter(
8080
this.notificationManager = notificationManager;
8181
}
8282

83-
protected void throwApprovalRequired(final String key, final boolean condition, final String executor) {
83+
protected void throwApprovalRequired(
84+
final String key,
85+
final boolean condition,
86+
final String executor,
87+
final String context) {
88+
8489
if (securityProperties.getAdminUser().equals(executor)) {
8590
return;
8691
}
@@ -104,7 +109,7 @@ protected UserWorkflowResult<Pair<String, Boolean>> doCreate(
104109
final String creator,
105110
final String context) {
106111

107-
throwApprovalRequired(null, userCR.requiresApproval(), creator);
112+
throwApprovalRequired(null, userCR.requiresApproval(), creator, context);
108113

109114
User user = entityFactory.newEntity(User.class);
110115
dataBinder.create(user, userCR);
@@ -166,7 +171,7 @@ protected UserWorkflowResult<String> doActivate(
166171
protected UserWorkflowResult<Pair<UserUR, Boolean>> doUpdate(
167172
final User user, final UserUR userUR, final String updater, final String context) {
168173

169-
throwApprovalRequired(userUR.getKey(), userUR.requiresApproval(), updater);
174+
throwApprovalRequired(userUR.getKey(), userUR.requiresApproval(), updater, context);
170175

171176
UserWorkflowResult.PropagationInfo propInfo = dataBinder.update(user, userUR);
172177

‎ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCUserManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public class OIDCUserManager {
6262

6363
protected static final Logger LOG = LoggerFactory.getLogger(OIDCUserManager.class);
6464

65-
protected static final String OIDC_CLIENT_CONTEXT = "OIDC Client";
65+
public static final String OIDC_CLIENT_CONTEXT = "OIDC Client";
6666

6767
protected final InboundMatcher inboundMatcher;
6868

‎ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2SP4UIUserManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161

6262
public class SAML2SP4UIUserManager {
6363

64-
private static final Logger LOG = LoggerFactory.getLogger(SAML2SP4UIUserManager.class);
64+
protected static final Logger LOG = LoggerFactory.getLogger(SAML2SP4UIUserManager.class);
6565

66-
private static final String SAML2SP_CONTEXT = "SAML 2.0 SP";
66+
public static final String SAML2SP_CONTEXT = "SAML 2.0 SP";
6767

6868
protected final SAML2SP4UIIdPDAO idpDAO;
6969

0 commit comments

Comments
 (0)