3 files changed, 52 insertions, 7 deletions
diff --git a/java/coldfusion/web/assertionConsumer.cfm b/java/coldfusion/web/assertionConsumer.cfm
index 37c2b878..d942318e 100644
--- a/java/coldfusion/web/assertionConsumer.cfm
+++ b/java/coldfusion/web/assertionConsumer.cfm
@@ -10,10 +10,11 @@
     <cfset properties=sys.getProperties()>
     <cfdump var="#properties#">
 -->
-    <cfobject action="create" type="Java" class="CFLasso" name="lasso">
+    <cfobject action="create" type="Java" class="CFLassoSingleSignOn" name="lasso">
     <cfset lasso.init()>
     <cfset lasso.configure("/opt/coldfusionmx/wwwroot/lasso/data/metadata.xml", "/opt/coldfusionmx/wwwroot/lasso/data/public-key-la.pem", "/opt/coldfusionmx/wwwroot/lasso/data/private-key-raw-la.pem", "https://idp2/metadata", "/opt/coldfusionmx/wwwroot/lasso/data/metadata-idp.xml", "/opt/coldfusionmx/wwwroot/lasso/data/idp2-la/public-key.pem")>
-    <cfset lasso.assertionConsumer(#QUERY_STRING#)>
+    <cfset lasso.initRequest(#QUERY_STRING#)>
+    <cfset lasso.buildRequestMsg()>
     <cfset soapUrl=lasso.getMsgUrl()>
     <cfset soapBody=lasso.getMsgBody()>
     <cfset relayState=lasso.getMsgRelayState()>
@@ -30,13 +31,15 @@
     <cfdump var="#cfhttp.fileContent#">
 -->
     <cfset lasso.processResponseMsg(#cfhttp.fileContent#)>
-    <!-- TODO: Retrieve identity dump and session dump in your users and sessions databases. --> 
+    <cfset nameIdentifier=lasso.getNameIdentifier()>
+    <!-- TODO: Retrieve identity dump and session dump in your users and sessions databases,
+         using nameIdentifier to retrieve user and session. --> 
     <!-- cfset lasso.setIdentityFromDump(#identityDump#) -->
     <!-- cfset lasso.setSessionFromDump(#sessionDump#) -->
     <cfset lasso.acceptSso()>
     <cfset identityDump=lasso.getIdentityDump()>
     <cfset sessionDump=lasso.getSessionDump()>
-    <!-- TODO: Store identity dump and session dump into your users and sessions databases.-->
+    <!-- TODO: Store identity dump and session dump into your users and sessions databases. -->
     <cfoutput>
       <p>User is now logged. RelayState = #relayState#</p>
     </cfoutput>
diff --git a/java/coldfusion/web/singleLogout.cfm b/java/coldfusion/web/singleLogout.cfm
new file mode 100644
index 00000000..f7928250
--- /dev/null
+++ b/java/coldfusion/web/singleLogout.cfm
@@ -0,0 +1,40 @@
+<html>
+  <head>
+    <title>Lasso Single Logout</title>
+  </head>
+  <body>
+    <h1>Lasso Single Logout</h1>
+    <cfobject action="create" type="Java" class="CFLassoSingleLogout" name="lasso">
+    <cfset lasso.init()>
+    <cfset lasso.configure("/opt/coldfusionmx/wwwroot/lasso/data/metadata.xml", "/opt/coldfusionmx/wwwroot/lasso/data/public-key-la.pem", "/opt/coldfusionmx/wwwroot/lasso/data/private-key-raw-la.pem", "https://idp2/metadata", "/opt/coldfusionmx/wwwroot/lasso/data/metadata-idp.xml", "/opt/coldfusionmx/wwwroot/lasso/data/idp2-la/public-key.pem")>
+    <!-- TODO: Retrieve identity dump and session dump in your users and sessions databases. --> 
+    <!-- cfset lasso.setIdentityFromDump(#identityDump#) -->
+    <!-- cfset lasso.setSessionFromDump(#sessionDump#) -->
+    <cfset lasso.initRequest()>
+    <cfset lasso.buildRequestMsg()>
+    <cfset soapUrl=lasso.getMsgUrl()>
+    <cfset soapBody=lasso.getMsgBody()>
+<!--
+    <cfdump var="#soapUrl#">
+    <cfdump var="#soapBody#">
+-->
+    <cfhttp method="POST" url="#soapUrl#">
+     <cfhttpparam type="XML" name="body" value="#soapBody#">
+    </cfhttp>
+<!--
+    <cfdump var="#cfhttp.statuscode#">
+    <cfdump var="#cfhttp.header#">
+    <cfdump var="#cfhttp.fileContent#">
+-->
+    <cfset lasso.processResponseMsg(#cfhttp.fileContent#)>
+    <cfset nameIdentifier=lasso.getNameIdentifier()>
+    <cfset identityDump=lasso.getIdentityDump()>
+    <cfset sessionDump=lasso.getSessionDump()>
+    <!-- TODO: Store identity dump in your users database and remove session dump from sessions
+         database. -->
+    <cfoutput>
+      <p>User is now unlogged.</p>
+    </cfoutput>
+  </body>
+</html>
+
diff --git a/java/coldfusion/web/singleSignOn.cfm b/java/coldfusion/web/singleSignOn.cfm
index dbd40644..12a3181f 100644
--- a/java/coldfusion/web/singleSignOn.cfm
+++ b/java/coldfusion/web/singleSignOn.cfm
@@ -9,11 +9,13 @@
     <cfset properties=sys.getProperties()>
     <cfdump var="#properties#">
 -->
-    <cfobject action="create" type="Java" class="CFLasso" name="lasso">
+    <cfobject action="create" type="Java" class="CFLassoSingleSignOn" name="lasso">
     <cfset lasso.init()>
     <cfset lasso.configure("/opt/coldfusionmx/wwwroot/lasso/data/metadata.xml", "/opt/coldfusionmx/wwwroot/lasso/data/public-key-la.pem", "/opt/coldfusionmx/wwwroot/lasso/data/private-key-raw-la.pem", "https://idp2/metadata", "/opt/coldfusionmx/wwwroot/lasso/data/metadata-idp.xml", "/opt/coldfusionmx/wwwroot/lasso/data/idp2-la/public-key.pem")>
-    <cfset ssoUrl=lasso.login("important")>
-    <cfoutput>Identity provider single sing-on URL to redirect to = #ssoUrl#</cfoutput>
+    <cfset lasso.initAuthnRequest("important-string")>
+    <cfset lasso.buildAuthnRequestMsg()>
+    <cfset ssoUrl=lasso.getMsgUrl()>
+    <cfoutput><p>Identity provider single sing-on URL to redirect to = #ssoUrl#</p></cfoutput>
     <cflocation url=#ssoUrl#>
   </body>
 </html>