Merge branch 'development'

Author: lmajano

.cfformat.json

@@ -17,19 +17,19 @@
 	"function_call.multiline.leading_comma.padding": true,
 	"function_call.casing.builtin": "cfdocs",
 	"function_call.casing.userdefined": "camel",
-	"function_call.multiline.element_count": 3,
+	"function_call.multiline.element_count": 2,
 	"function_call.multiline.leading_comma": false,
 	"function_call.multiline.min_length": 40,
 	"function_declaration.padding": true,
 	"function_declaration.empty_padding": false,
 	"function_declaration.multiline.leading_comma": false,
 	"function_declaration.multiline.leading_comma.padding": true,
-	"function_declaration.multiline.element_count": 3,
+	"function_declaration.multiline.element_count": 2,
 	"function_declaration.multiline.min_length": 40,
 	"function_declaration.group_to_block_spacing": "compact",
 	"function_anonymous.empty_padding": false,
 	"function_anonymous.group_to_block_spacing": "compact",
-	"function_anonymous.multiline.element_count": 3,
+	"function_anonymous.multiline.element_count": 2,
 	"function_anonymous.multiline.leading_comma": false,
 	"function_anonymous.multiline.leading_comma.padding": true,
 	"function_anonymous.multiline.min_length": 40,
@@ -44,6 +44,8 @@
 	"max_columns": 120,
 	"metadata.multiline.element_count": 3,
 	"metadata.multiline.min_length": 40,
+	"method_call.chain.multiline" : 3,
+	"newline":"\n",
 	"property.multiline.element_count": 3,
 	"property.multiline.min_length": 40,
 	"parentheses.padding": true,

.travis.yml

@@ -58,8 +58,9 @@ install:
   - box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
 
 script:
-  # Set Current Version
+  # Set Current Version and Travis Tag
   - TARGET_VERSION=`cat $TRAVIS_BUILD_DIR/box.json | jq '.version' -r`
+  - TRAVIS_TAG=${TARGET_VERSION}
   - echo "Starting build for ${MODULE_ID} v${TARGET_VERSION}"
   # Replace version so builder can issue it
   - box package set version=@build.version@+@build.number@
@@ -78,7 +79,7 @@ script:
   # Build Project
   - box task run taskfile=build/Build target=run :version=${TARGET_VERSION} :projectName=${MODULE_ID} :buildID=${TRAVIS_BUILD_NUMBER} :branch=${TRAVIS_BRANCH}
   # Cat results for debugging
-  - cat build/results.json
+  #- cat build/results.json
 
 after_failure:
   - cd $TRAVIS_BUILD_DIR/test-harness
@@ -121,9 +122,26 @@ deploy:
     upload-dir: coldbox-modules/$MODULE_ID/$TARGET_VERSION
     acl: public_read
 
+  # Github Release only on Master
+  - provider: releases
+    api_key: ${GITHUB_TOKEN}
+    on:
+      branch:
+        - master
+      condition: "$ENGINE = lucee@5"
+    skip_cleanup: true
+    edge: true
+    file_glob: true
+    file: $TRAVIS_BUILD_DIR/.artifacts/$MODULE_ID/**/*
+    release_notes_file: changelog-latest.md
+    name: v${TRAVIS_TAG}
+    tag_name: v${TRAVIS_TAG}
+    overwrite: true
+
+# Once API Docs and Binaries are deployed to S3 Publish to ForgeBox
 after_deploy:
   # Move to build out artifact
   - cd ${TRAVIS_BUILD_DIR}/.tmp/${MODULE_ID}
   - cat box.json
-  # Only publish once
+  # Only publish once using the lucee matrix
   - if [ ${ENGINE} = 'lucee@5' ]; then box forgebox publish; fi

box.json

@@ -1,6 +1,6 @@
 {
     "name":"ColdBox Security",
-    "version":"2.5.0",
+    "version":"2.6.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbsecurity/@build.version@/cbsecurity-@build.version@.zip",
     "author":"Ortus Solutions.com <info@ortussolutions.com>",
     "slug":"cbsecurity",
@@ -33,9 +33,9 @@
         "cbcsrf":"^2.0.0"
     },
     "scripts":{
-        "toMaster":"recipe build/toMaster.boxr",
+        "release":"recipe build/release.boxr",
         "format":"cfformat run handlers/,interceptors/,models/,test-harness/tests/specs",
-        "format:watch":"cfformat watch handlers/,interceptors/,models/,test-harness/tests/specs",
+        "format:watch":"cfformat watch handlers/,interceptors/,models/,test-harness/tests/specs ./.cfformat.json",
         "format:check":"cfformat check handlers/,interceptors/,models/,test-harness/tests/specs"
     }
 }

build/Build.cfc

@@ -70,15 +70,18 @@ component{
         docs( argumentCollection=arguments );
 
         // checksums
-        buildChecksums();
+		buildChecksums();
+
+		// Build latest changelog
+		latestChangelog();
 
         // Finalize Message
         print.line()
             .boldMagentaLine( "Build Process is done! Enjoy your build!" )
             .toConsole();
     }
 
-     /**
+    /**
      * Run the test suites
      */
     function runTests(){
@@ -177,11 +180,10 @@ component{
 
         command( 'docbox generate' )
             .params(
-				"mappings:interceptors"	= "interceptors",
-				"mappings:interfaces"	= "interfaces",
-				"mappings:models"       = "models",
+                "source"               =  "models",
+                "mapping"              =  "models",
                 "strategy-projectTitle" = "#arguments.projectName# v#arguments.version#",
-                "strategy-outputDir"   	= arguments.outputDir
+                "strategy-outputDir"   = arguments.outputDir
             )
             .run();
 
@@ -196,7 +198,28 @@ component{
             overwrite=true,
             recurse=true
         );
-    }
+	}
+
+	/**
+	 * Build the latest changelog file: changelog-latest.md
+	 */
+	function latestChangelog(){
+		print.blueLine( "Building latest changelog..." ).toConsole();
+
+		if( !fileExists( variables.cwd & "changelog.md" ) ){
+			return error( "Cannot continue building, changelog.md file doesn't exist!" );
+		}
+
+		fileWrite(
+			variables.cwd & "changelog-latest.md",
+			fileRead( variables.cwd & 'changelog.md' ).split( '----' )[2].trim() & chr( 13 ) & chr( 10 )
+		);
+
+		print
+			.greenLine( "Latest changelog file created at `changelog-latest.md`" )
+			.line()
+			.line( fileRead( variables.cwd & "changelog-latest.md" ) );
+	}
 
     /********************************************* PRIVATE HELPERS *********************************************/
 

build/toMaster.boxr build/release.boxrbuild/toMaster.boxr renamed to build/release.boxr

@@ -1,20 +1,25 @@
 # This recipe signifies a new release of the module by doing merges and bumps accordingly
 
-# Check out master
+# Check out master and update it locally
 !git checkout -f master
-!git pull
-# Merge development into it
+!git pull origin master
+
+# Merge development into it for release
 !git merge --no-ff development
-# Tag the master repo with the version in box.json
+
+# Tag the master repo with the version from box.json
 !git tag v`box package show version`
-# Push all branches
+
+# Push all branches back out to github
 !git push origin --all
+
 # Push all tags
 !git push origin --tags
+
 # Check development again
 !git checkout -f development
+
 # Bump to prepare for a new release, do minor, change if needed and don't tag
 bump --minor --!tagVersion
-# Send it out
 !git commit -a -m "version bump"
 !git push origin development

changelog.md

@@ -1,23 +1,54 @@
-# CHANGELOG
+# Changelog
 
-## 2.5.0
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+----
+
+## [2.6.0] => 2020-JUL-22
+
+### Added
+
+* New build layout based on new module layout
+* Auto github publishing release notes
+* More formatting goodness and watcher
+
+### Fixed
+
+* JWT Validator now passing `permissions` instead of `roles`
+* Token Storage checking was being done even if disabled
+
+
+----
+
+## [2.5.0] => 2020-APR-03
 
 * `Feature` : Upgraded to `cbAuth` @ 5.x
 
-## 2.4.0
+----
+
+## [2.4.0] => 2020-APR-02
 
 * `Feature` : We now include the `cbcsrf` module to allow for protections of cross site request forgery vectors. Please see all the features included in this module here: https://github.com/coldbox-modules/cbcsrf
 
-## 2.3.0
+----
+
+## [2.3.0] => 2020-MAR-30
 
 * `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
+----
+
+## [2.2.1] => 2020-FEB-26
 
 * `bug` : `verify` should pass `verify=true` into the jwt library for proper verification
 
-## 2.2.0
+----
+
+## [2.2.0] => 2020-FEB-12
 
 * `Feature` : Migrated from the jwt to the `jwtcfml` (https://forgebox.io/view/jwt-cfml) library to expand encoding/decoding capabilities to support `RS` and `ES` algorithms:
   * HS256
@@ -37,11 +68,15 @@
 * `Improve` : More cfformating goodness!
 * `Bug` : Invalidation of tokens was not happening due to not using the actual key for the storage
 
-## 2.1.0
+----
+
+## [2.1.0] => 2019-OCT-02
 
 * `Feature` : cbauth upgraded to version 4
 
-## 2.0.0
+----
+
+## [2.0.0] => 2019-SEP-25
 
 ### New Features
 
@@ -118,33 +153,33 @@ settings = {
   * If the `filepath` has `json` or `xml` in it, we will use that as the source style
 * `rulesFile` removed you can now use the `rules` setting.
 
-## 1.3.0
+## [1.3.0]
 
 * Travis integration
 * DocBox updates
 * Build process updates
 
-## 1.2.0
+## [1.2.0]
 
 * Updated documentation
 * Updated doc references
 * New docs build process
 * Update root builder dependencies
 
-## 1.1.0
+## [1.1.0]
 
 * Updated documentation
 * Ability for interceptor to auto-register via new `cbsecurity` settings in master config.
 
-## 1.0.2
+## [1.0.2]
 
 * Removed `getPlugin()` deprecated calls to new approach.
 * https://ortussolutions.atlassian.net/browse/CCM-26 cbsecurity ocm rules not ColdBox 4 compat 
 
-## 1.0.1
+## [1.0.1]
 
 * Fixed missing `$throw()` method to native `throw()` method.
 
-## 1.0.0
+## [1.0.0]
 
 * Created first module version