Skip to content

Commit 91091ca

Browse files
committed
- Allow for sub-modules to load AFTER cbsecurity loads.
1 parent b3dad8b commit 91091ca

4 files changed

Lines changed: 14 additions & 6 deletions

File tree

ModuleConfig.cfc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ component {
1818
this.entryPoint = "cbsecurity";
1919
// Helpers
2020
this.applicationHelper = [ "helpers/mixins.cfm" ];
21-
// Dependencies
22-
this.dependencies = [ "cbauth", "jwtcfml", "cbcsrf" ];
21+
// Dependencies that must be loaded first.
22+
this.dependencies = [];
2323

2424
/**
2525
* Module Config
2626
*/
2727
function configure(){
28-
settings = {
28+
variables.settings = {
2929
/**
3030
* --------------------------------------------------------------------------
3131
* Authentication Services
@@ -114,7 +114,7 @@ component {
114114
};
115115

116116
// Security Interceptions
117-
interceptorSettings = {
117+
variables.interceptorSettings = {
118118
customInterceptionPoints : [
119119
// Validator Events
120120
"cbSecurity_onInvalidAuthentication",

changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
## [Unreleased]
1111

12+
### Fixed
13+
14+
- Allow for sub-modules to load AFTER cbsecurity loads.
15+
1216
## [3.6.0] - 2025-12-08
1317

1418
### Security

models/CBSecurity.cfc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ component threadsafe singleton accessors="true" {
164164
}
165165

166166
// cbcsrf settings incorporation
167-
variables.moduleSettings.cbcsrf.settings.append( variables.settings.csrf, false );
167+
variables.moduleSettings.cbcsrf.settings.append( variables.settings.csrf, true );
168168
// DBLogger Configuration
169169
variables.dbLogger.configure();
170170
// Log it
@@ -443,7 +443,7 @@ component threadsafe singleton accessors="true" {
443443
* @message The error message to throw in the exception
444444
*
445445
* @throws NoUserLoggedIn
446-
* @throws NotAuthorized
446+
* @throws NotAuthorized
447447
*/
448448
CBSecurity function secureSameUser( required user, message = variables.DEFAULT_ERROR_MESSAGE ){
449449
if ( !sameUser( arguments.user ) ) {

test-harness/box.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,9 @@
1313
"route-visualizer":"*"
1414
},
1515
"installPaths":{
16+
"coldbox":"coldbox/",
17+
"BCrypt":"modules/BCrypt/",
18+
"testbox":"testbox/",
19+
"route-visualizer":"modules/route-visualizer/"
1620
}
1721
}

0 commit comments

Comments
 (0)