Merge branch 'development'

Author: lmajano

box.json

@@ -1,6 +1,6 @@
 {
     "name":"ColdBox Security",
-    "version":"2.2.1",
+    "version":"2.3.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbsecurity/@build.version@/[email protected]@.zip",
     "author":"Ortus Solutions.com <[email protected]",
     "slug":"cbsecurity",

changelog.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 2.3.0
+
+* `Feature` Introduction of the cbSecurity model: https://coldbox-security.ortusbooks.com/intro/release-history/whats-new-with-2.3.0
+* `Task` : Cfformatting everywhere
+
 ## 2.2.1
 
 * `bug` : `verify` should pass `verify=true` into the jwt library for proper verification

helpers/mixins.cfm

@@ -1,5 +1,16 @@
 <cfscript>
+	/**
+	 * Retrieve the JwtService
+	 */
 	function jwtAuth() {
         return wirebox.getInstance( "JwtService@cbSecurity" );
-    }
+	}
+
+	/**
+	 * Retrieve the CBSecurity Service Object
+	 */
+	function cbSecure() {
+        return wirebox.getInstance( "CBSecurity@cbSecurity" );
+	}
+
 </cfscript>

interceptors/Security.cfc

@@ -11,6 +11,7 @@ component accessors="true" extends="coldbox.system.Interceptor" {
 	// DI
 	property name="rulesLoader"    inject="rulesLoader@cbSecurity";
 	property name="handlerService" inject="coldbox:handlerService";
+	property name="cbSecurity"		inject="@cbSecurity";
 
 	/**
 	 * The reference to the security validator for this interceptor
@@ -185,6 +186,9 @@ component accessors="true" extends="coldbox.system.Interceptor" {
 		prc,
 		buffer
 	){
+		// Add SecureView() into the requestcontext
+		arguments.event.secureView = variables.cbSecurity.secureViewProxy;
+
 		// Execute Rule processing
 		if ( getProperty( "rules" ).len() ) {
 			processRules(