2.0.0

.bxlint.json

@@ -0,0 +1,3 @@
+{
+    "exclude": [ "ModuleConfig.cfc" ]
+}

.github/workflows/pr.yml

@@ -19,7 +19,7 @@ jobs:
 
   formatCheck:
     name: Checks Source Code Formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
   ##########################################################################################
   build:
     name: Build & Publish
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -128,7 +128,7 @@ jobs:
   prep_next_release:
     name: Prep Next Release
     if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: [ build ]
     steps:
       # Checkout development

.github/workflows/snapshot.yml

@@ -9,16 +9,16 @@ jobs:
   ##########################################################################################
   # Module Tests
   ##########################################################################################
-  # tests:
-  #   secrets: inherit
-  #   uses: ./.github/workflows/tests.yml
+  tests:
+    secrets: inherit
+    uses: ./.github/workflows/tests.yml
 
   ##########################################################################################
   # Format Source Code
   ##########################################################################################
   format:
     name: Code Auto-Formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
 

.github/workflows/tests.yml

@@ -2,6 +2,7 @@ name: Test Suites
 
 # We are a reusable Workflow only
 on:
+  workflow_dispatch:
   workflow_call:
     secrets:
       SLACK_WEBHOOK_URL:
@@ -10,16 +11,16 @@ on:
 jobs:
   tests:
     name: Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       DB_USER: root
       DB_PASSWORD: root
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
-        cfengine: [ "lucee@5" ]
-        coldboxVersion: [ "^6.0.0", "^7.0.0" ]
+        cfengine: [ "lucee@5", "boxlang@1" ]
+        coldboxVersion: [ "^7.0.0", "^8.0.0" ]
         experimental: [ false ]
         # Here we tests all engines against ColdBox@BE
         include:
@@ -45,41 +46,40 @@ jobs:
           distribution: "temurin"
           java-version: "11"
 
+      - name: Build Java Deps
+        run: |
+         cd java/cbsso-opensaml
+         chmod +x ./gradlew
+         ./gradlew :app:build
+
       - name: Setup CommandBox CLI
         uses: Ortus-Solutions/setup-commandbox@v2.0.1
 
       # Not Needed in this module
-      #- name: Setup Environment For Testing Process
-      #  run: |
-      #    # Setup .env
-      #    touch .env
-      #    # ENV
-      #    printf "DB_HOST=localhost\n" >> .env
-      #    printf "DB_DATABASE=mydatabase\n" >> .env
-      #    printf "DB_DRIVER=MySQL\n" >> .env
-      #    printf "DB_USER=${{ env.DB_USER }}\n" >> .env
-      #    printf "DB_PASSWORD=${{ env.DB_PASSWORD }}\n" >> .env
-      #    printf "DB_CLASS=com.mysql.cj.jdbc.Driver\n" >> .env
-      #    printf "DB_BUNDLEVERSION=8.0.19\n" >> .env
-      #    printf "DB_BUNDLENAME=com.mysql.cj\n" >> .env
-
-      - name: "Setup Environment Variables For Tests"
-        id: current_version
+      - name: Setup Environment For Testing Process
         run: |
-          # master or snapshot
-          echo "Github Ref is $GITHUB_REF"
-
           # Setup .env
-          touch ./test-harness/.env
-          printf "GOOGLE_CLIENT_ID=new_google_id\n" >> ./test-harness/.env
-          printf "GOOGLE_CLIENT_SECRET=google_secret\n" >> ./test-harness/.env
-          printf "GITHUB_CLIENT_ID=test-value\n" >> ./test-harness/.env
-          printf "GITHUB_CLIENT_SECRET=test-value\n" >> ./test-harness/.env
-          printf "FACEBOOK_CLIENT_ID=test-value\n" >> ./test-harness/.env
-          printf "FACEBOOK_CLIENT_SECRET=test-value\n" >> ./test-harness/.env
-          printf "MS_ENTRA_CLIENT_ID=test-value\n" >> ./test-harness/.env
-          printf "MS_ENTRA_CLIENT_SECRET=test-value\n" >> ./test-harness/.env
-          printf "MS_ENTRA_SIGN_ON_ENDPOINT=test-value\n" >> ./test-harness/.env
+          touch .env
+          # ENV
+          printf "DB_HOST=localhost\n" >> .env
+          printf "GOOGLE_CLIENT_ID=test\n" >> .env
+          printf "GOOGLE_CLIENT_SECRET=test\n" >> .env
+          printf "GOOGLE_REDIRECT_URI=test\n" >> .env
+          printf "GOOGLE_AUTH_ENDPOINT=test\n" >> .env
+          printf "GOOGLE_ACCESS_TOKEN=test\n" >> .env
+          printf "GITHUB_CLIENT_ID=test\n" >> .env
+          printf "GITHUB_CLIENT_SECRET=test\n" >> .env
+          printf "GITHUB_REDIRECT_URI=test\n" >> .env
+          printf "GITHUB_AUTH_ENDPOINT=test\n" >> .env
+          printf "GITHUB_ACCESS_TOKEN=test\n" >> .env
+          printf "FACEBOOK_CLIENT_ID=test\n" >> .env
+          printf "FACEBOOK_CLIENT_SECRET=test\n" >> .env
+          printf "MS_ENTRA_REDIRECT_URI=test\n" >> .env
+          printf "MS_ENTRA_CLIENT_ID=test\n" >> .env
+          printf "MS_ENTRA_CLIENT_SECRET=test\n" >> .env
+          printf "MS_ENTRA_SIGN_ON_ENDPOINT=test\n" >> .env
+          printf "MS_ENTRA_FEDERATION_METADATA_URL=https://login.microsoftonline.com/2b263285-61e2-49c4-a257-8234f38486a2/federationmetadata/2007-06/federationmetadata.xml\n" >> .env
+          printf "MS_ENTRA_ISSUER=test\n" >> .env
 
       - name: Install Test Harness with ColdBox ${{ matrix.coldboxVersion }}
         run: |
@@ -91,7 +91,7 @@ jobs:
       - name: Start ${{ matrix.cfengine }} Server
         run: |
           box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
-          curl http://127.0.0.1:60299
+          curl http://127.0.0.1:9181
 
       - name: Run Tests
         run: |
@@ -108,7 +108,7 @@ jobs:
 
       - name: Upload Test Results to Artifacts
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results-${{ matrix.cfengine }}-${{ matrix.coldboxVersion }}
           path: |
@@ -121,22 +121,22 @@ jobs:
 
       - name: Upload Debug Logs To Artifacts
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Failure Debugging Info - ${{ matrix.cfengine }} - ${{ matrix.coldboxVersion }}
           path: |
             .engine/**/logs/*
             .engine/**/WEB-INF/cfusion/logs/*
 
-      - name: Slack Notifications
-        # Only on failures and NOT in pull requests
-        if: ${{ failure() && !startsWith( 'pull_request', github.event_name ) }}
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_CHANNEL: coding
-          SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
-          SLACK_ICON_EMOJI: ":bell:"
-          SLACK_MESSAGE: '${{ github.repository }} tests failed :cry:'
-          SLACK_TITLE: ${{ github.repository }} Tests For ${{ matrix.cfengine }} with ColdBox ${{ matrix.coldboxVersion }} failed
-          SLACK_USERNAME: CI
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
+      # - name: Slack Notifications
+      #   # Only on failures and NOT in pull requests
+      #   if: ${{ failure() && !startsWith( 'pull_request', github.event_name ) }}
+      #   uses: rtCamp/action-slack-notify@v2
+      #   env:
+      #     SLACK_CHANNEL: coding
+      #     SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
+      #     SLACK_ICON_EMOJI: ":bell:"
+      #     SLACK_MESSAGE: '${{ github.repository }} tests failed :cry:'
+      #     SLACK_TITLE: ${{ github.repository }} Tests For ${{ matrix.cfengine }} with ColdBox ${{ matrix.coldboxVersion }} failed
+      #     SLACK_USERNAME: CI
+      #     SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}

.vscode/settings.json

@@ -10,5 +10,6 @@
 			"directoryPath": "./test-harness/testbox",
 			"isPhysicalDirectoryPath": false
 		}
-	]
+	],
+	"java.configuration.updateBuildConfiguration": "interactive"
 }

box.json

@@ -1,13 +1,13 @@
 {
-    "name": "cbsso",
-    "version": "1.0.7",
-    "location": "https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbsso/@build.version@/cbsso-@build.version@.zip",
-    "author": "Ortus Solutions <info@ortussolutions.com>",
-    "homepage": "https://github.com/coldbox-modules/cbsso",
-    "documentation": "https://github.com/coldbox-modules/cbsso",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/coldbox-modules/cbsso"
+    "name":"cbsso",
+    "version":"2.0.0",
+    "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbsso/@build.version@/cbsso-@build.version@.zip",
+    "author":"Ortus Solutions <info@ortussolutions.com>",
+    "homepage":"https://github.com/coldbox-modules/cbsso",
+    "documentation":"https://github.com/coldbox-modules/cbsso",
+    "repository":{
+        "type":"git",
+        "url":"https://github.com/coldbox-modules/cbsso"
     },
     "bugs": "https://github.com/coldbox-modules/cbsso",
     "shortDescription": "Description goes here",
@@ -20,16 +20,18 @@
             "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
         }
     ],
-    "contributors": [ ],
-    "dependencies": {
-        "hyper": "^7.2.1",
-        "jwt-cfml": "^1.2.0"
+    "contributors":[],
+    "dependencies":{
+        "hyper":"^7.2.1",
+        "jwt-cfml":"^1.2.0",
+        "cbjavaloader":"^2.1.1+8"        
     },
-    "devDependencies": {
-        "commandbox-cfformat": "*",
-        "commandbox-docbox": "*",
-        "commandbox-dotenv": "*",
-        "commandbox-cfconfig": "*"
+    "devDependencies":{
+        "commandbox-cfformat":"*",
+        "commandbox-docbox":"*",
+        "commandbox-dotenv":"*",
+        "commandbox-cfconfig":"*",
+        "bx-esapi":"^1.6.0+9"
     },
     "ignore": [
         "**/.*",
@@ -55,12 +57,13 @@
         "logs:2018": "server log serverConfigFile=server-adobe@2018.json --follow",
         "logs:2021": "server log serverConfigFile=server-adobe@2021.json --follow"
     },
-    "testbox": {
-        "runner": "http://localhost:60299/tests/runner.cfm"
+    "testbox":{
+        "runner":"http://localhost:9181/tests/runner.cfm"
     },
-    "installPaths": {
-        "hyper": "modules/hyper/",
-        "jwt-cfml": "modules/jwtcfml/",
-        "cbjavaloader": "modules/cbjavaloader/"
+    "installPaths":{
+        "hyper":"modules/hyper/",
+        "jwt-cfml":"modules/jwtcfml/",
+        "cbjavaloader":"modules/cbjavaloader/",
+        "bx-esapi":".engine/boxlang/WEB-INF/boxlang/modules/bx-esapi/"
     }
 }

build/Build.cfc

@@ -12,8 +12,8 @@ component {
 		variables.cwd          = getCWD().reReplace( "\.$", "" );
 		variables.artifactsDir = cwd & "/.artifacts";
 		variables.buildDir     = cwd & "/.tmp";
-		variables.apiDocsURL   = "http://localhost:60299/apidocs/";
-		variables.testRunner   = "http://localhost:60299/tests/runner.cfm";
+		variables.apiDocsURL   = "http://localhost:9181/apidocs/";
+		variables.testRunner   = "http://localhost:9181/tests/runner.cfm";
 
 		// Source Excludes Not Added to final binary
 		variables.excludes = [

interceptors/cbAuth.cfc

@@ -6,6 +6,10 @@ component {
         var authService = getInstance( "authenticationService@cbauth" );
         var userService = authService.getUserService();
 
+        if( !data.ssoAuthorizationEvent.wasSuccessful() ){
+            relocate( moduleSettings.errorRedirect );
+        }
+
         var user = userService.findBySSO( data.ssoAuthorizationEvent, data.provider );
 
         if( isNull( user ) ){

java/cbsso-opensaml/app/build.gradle

@@ -60,6 +60,9 @@ jar {
 shadowJar {
 	archiveBaseName = "cbsso-opensaml"
     mergeServiceFiles()
+    dependencies {
+        exclude(dependency('org.apache.commons:commons-lang3'))
+    }
 	minimize{
         exclude( dependency( "org.opensaml:opensaml-core:.*" ) )
         exclude( dependency( "org.slf4j:.*:.*" ) )