Skip to content

Commit f69064f

Browse files
authored
Simplify the check for permission based bypass. (#165)
Fix the order of declaration and make the method easier to understand.
1 parent 0382dc2 commit f69064f

File tree

3 files changed

+25
-24
lines changed

3 files changed

+25
-24
lines changed

.prettierrc

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
2-
"trailingComma": "none",
3-
"useTabs": true,
4-
"overrides": [
5-
{
6-
"files": "**/lwc/**/*.html",
7-
"options": { "parser": "lwc" }
8-
},
9-
{
10-
"files": "*.{cmp,page,component}",
11-
"options": { "parser": "html" }
12-
}
13-
]
2+
"plugins": ["prettier-plugin-apex"],
3+
"trailingComma": "none",
4+
"useTabs": true,
5+
"overrides": [
6+
{
7+
"files": "**/lwc/**/*.html",
8+
"options": { "parser": "lwc" }
9+
},
10+
{
11+
"files": "*.{cmp,page,component}",
12+
"options": { "parser": "html" }
13+
}
14+
]
1415
}

sfdx-project.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"Trigger Actions [email protected]": "04tKY000000Pb8ZYAS",
3838
"Trigger Actions [email protected]": "04tKY000000Pd90YAC",
3939
"Trigger Actions [email protected]": "04tKY000000Pd95YAC",
40-
"Trigger Actions [email protected]": "04tKY000000Pd9AYAS"
40+
"Trigger Actions [email protected]": "04tKY000000Pd9AYAS",
41+
"Trigger Actions [email protected]": "04tKY000000PdYBYA0"
4142
}
4243
}

trigger-actions-framework/main/default/classes/MetadataTriggerHandler.cls

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -325,27 +325,26 @@ public inherited sharing class MetadataTriggerHandler extends TriggerBase implem
325325
populatePermissionMap(permissionName);
326326
}
327327

328-
return isNotBypassed(
328+
return !isBypassed(
329329
actionMetadata.Bypass_Permission__c,
330330
actionMetadata.Required_Permission__c
331331
) &&
332-
isNotBypassed(sObjectBypassPermissionName, sObjectRequiredPermissionName);
332+
!isBypassed(sObjectBypassPermissionName, sObjectRequiredPermissionName);
333333
}
334334

335335
/**
336-
* @description Check if the Trigger Action is not bypassed.
336+
* @description Check if the Trigger Action or SObject is bypassed.
337337
*
338-
* @param requiredPermission The required permission for the Trigger Action.
339338
* @param bypassPermission The bypass permission for the Trigger Action.
340-
* @return True if the Trigger Action is not bypassed, false otherwise.
339+
* @param requiredPermission The required permission for the Trigger Action.
340+
* @return True if bypassed, false otherwise.
341341
*/
342-
private static boolean isNotBypassed(
343-
String requiredPermission,
344-
String bypassPermission
342+
private static boolean isBypassed(
343+
String bypassPermission,
344+
String requiredPermission
345345
) {
346-
return !((requiredPermission != null &&
347-
permissionMap.get(requiredPermission)) ||
348-
(bypassPermission != null && !permissionMap.get(bypassPermission)));
346+
return (bypassPermission != null && permissionMap.get(bypassPermission)) ||
347+
(requiredPermission != null && !permissionMap.get(requiredPermission));
349348
}
350349

351350
/**

0 commit comments

Comments
 (0)