Change location of java lib

coldbox-modules · Sep 12, 2024 · d0f5e34 · d0f5e34
1 parent f2d54f1
commit d0f5e34
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 13 deletions.
diff --git a/ModuleConfig.cfc b/ModuleConfig.cfc
@@ -20,7 +20,7 @@ component {
 	this.entryPoint     = "/cbsso";
 
 	// Dependencies
-	this.dependencies = [ "hyper", "jwtcfml", "cbjavaloader" ];
+	this.dependencies = [ "hyper", "jwtcfml" ];
 
 	routes = [
 		{
@@ -75,8 +75,6 @@ component {
 					interceptorName       = "cbsso@global"
 				);
 		}
-
-		wireBox.getInstance( "loader@cbjavaloader" ).appendPaths( modulePath & "/lib" );
 	}
 
 	/**

diff --git a/box.json b/box.json
@@ -23,8 +23,7 @@
     "contributors": [ ],
     "dependencies": {
         "hyper": "^7.2.1",
-        "jwt-cfml": "^1.2.0",
-        "cbjavaloader": "^2.1.1+8"
+        "jwt-cfml": "^1.2.0"
     },
     "devDependencies": {
         "commandbox-cfformat": "*",

diff --git a/models/providers/MicrosoftSAMLProvider.cfc b/models/providers/MicrosoftSAMLProvider.cfc
@@ -146,10 +146,10 @@ component accessors="true" implements="cbsso.models.ISSOIntegrationProvider" {
 			return;
 		}
 
-		variables.AuthNRequestGenerator = wirebox.getInstance( "javaloader:cbsso.opensaml.AuthNRequestGenerator" );
-		variables.responseValidator = wirebox.getInstance( "javaloader:cbsso.opensaml.AuthResponseValidator" );
-		variables.AuthNRequestGenerator.initOpenSAML();
+		variables.AuthNRequestGenerator = createObject( "java", "cbsso.opensaml.AuthNRequestGenerator" );
+		variables.responseValidator = createObject( "java", "cbsso.opensaml.AuthResponseValidator" );	
 
+		variables.AuthNRequestGenerator.initOpenSAML();
 		responseValidator.cacheCerts( variables.federationMetadataURL );
 	}
 

diff --git a/server-adobe.json → server-adobe21.json b/server-adobe.json → server-adobe21.json
@@ -1,8 +1,9 @@
 {
-    "name":"oAuth2-adobe",
+    "name":"cbsso-adobe21",
     "app":{
         "serverHomeDirectory":".engine/adobe",
-        "cfengine":"adobe@2023"
+        "cfengine":"adobe@2021",
+        "libDirs":"lib"
     },
     "web":{
         "http":{

diff --git a/server-adobe23.json b/server-adobe23.json
@@ -0,0 +1,27 @@
+{
+    "name":"cbsso-adobe23",
+    "app":{
+        "serverHomeDirectory":".engine/adobe23",
+        "cfengine":"adobe@2023",
+        "libDirs":"lib"
+    },
+    "web":{
+        "http":{
+            "port":"2140"
+        },
+        "rewrites":{
+            "enable":"true"
+        },
+        "webroot":"test-harness",
+        "aliases":{
+            "/moduleroot/cbSSO":"../"
+        }
+    },
+    "openBrowser":"false",
+    "cfconfig":{
+        "file":".cfconfig.json"
+    },
+    "scripts":{
+        "onServerInitialInstall":"cfpm install zip"
+    }
+}
diff --git a/test-harness/models/UserService.cfc b/test-harness/models/UserService.cfc
@@ -37,9 +37,6 @@ component {
     public any function createFromSSO( required any ssoEvent, required any provider ){
         var a = new User();
 
-        writeDump( ssoEvent );
-        abort;
-
         a.setEmail( ssoEvent.getEmail() )
             .setId( ssoEvent.getUserId() );