Skip to content

Commit 86f2021

Browse files
committed
Change order of initialization and fix main builds
1 parent 557b1f8 commit 86f2021

3 files changed

Lines changed: 3 additions & 7 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
box package set version=@build.version@+@build.number@
4949
# master or snapshot
5050
echo "Github Ref is $GITHUB_REF"
51-
echo "BRANCH=master" >> $GITHUB_ENV
51+
echo "BRANCH=main" >> $GITHUB_ENV
5252
if [ $GITHUB_REF == 'refs/heads/development' ]
5353
then
5454
echo "BRANCH=development" >> $GITHUB_ENV

box.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cbsso",
3-
"version": "1.0.3",
3+
"version": "1.0.4",
44
"location": "https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbsso/@build.version@/cbsso-@build.version@.zip",
55
"author": "Ortus Solutions <info@ortussolutions.com>",
66
"homepage": "https://github.com/coldbox-modules/cbsso",

models/providers/MicrosoftSAMLProvider.cfc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ component accessors="true" implements="cbsso.models.ISSOIntegrationProvider" {
1414

1515
variables.name = "Microsoft Entra";
1616

17-
public function onDIComplete(){
18-
variables.AuthNRequestGenerator.initOpenSAML();
19-
}
20-
2117
public string function getName(){
2218
return variables.name;
2319
}
@@ -156,7 +152,7 @@ component accessors="true" implements="cbsso.models.ISSOIntegrationProvider" {
156152
variables.AuthNRequestGenerator = wirebox.getInstance( "javaloader:cbsso.opensaml.AuthNRequestGenerator" );
157153
variables.responseValidator = wirebox.getInstance( "javaloader:cbsso.opensaml.AuthResponseValidator" );
158154
variables.AuthNRequestGenerator.initOpenSAML();
159-
155+
160156
responseValidator.cacheCerts( variables.federationMetadataURL );
161157
}
162158

0 commit comments

Comments
 (0)