From 924bc883f920d7562d68b0b10fce1402f5856b65 Mon Sep 17 00:00:00 2001
From: root <root@adelauth>
Date: Thu, 6 Nov 2008 10:13:30 +0100
Subject: [PATCH] bunch of uncommited changes

---
 data/themes/adeline/template.ezt |  2 +-
 extra/modules/liberty.py         | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/data/themes/adeline/template.ezt b/data/themes/adeline/template.ezt
index ed9fc19..9ef8eab 100644
--- a/data/themes/adeline/template.ezt
+++ b/data/themes/adeline/template.ezt
@@ -37,7 +37,7 @@
     <div class="cdc_coinhaut">
       <div class="cdc_bandeau">
         <h2>Bienvenue [user]</h2>
-	<div class="cdc_bouton"><a href="/singleLogout">ME D&Eacute;CONNECTER</a></div>
+	<div class="cdc_bouton"><a href="/logout">ME D&Eacute;CONNECTER</a></div>
 	<div class="cdc_mrpropre">&nbsp;</div>
       </div>
     </div>
diff --git a/extra/modules/liberty.py b/extra/modules/liberty.py
index 5d0d91e..53b04c1 100644
--- a/extra/modules/liberty.py
+++ b/extra/modules/liberty.py
@@ -261,7 +261,7 @@ class AlternateLibertyDirectory(authentic.liberty.root.RootDirectory):
                 adeline_service.initQuery('/ad:PersonalDocumentList', 'doclist')
                 adeline_service.buildRequestMsg()
                 try:
-                    soap_anwser = soap_call(adeline_service.msgUrl, adeline_service.msgBody)
+                    soap_anwser = soap_call(adeline_service.msgUrl, adeline_service.msgBody + '  ')
                     adeline_service.processQueryResponseMsg(soap_anwser)
                     doc_list = adeline_service.getAnswer('/ad:PersonalDocumentList')
                     if doc_list:
@@ -368,7 +368,7 @@ class AlternateLibertyDirectory(authentic.liberty.root.RootDirectory):
         wsc_proxy_service = self.msp_disco_query(latest_session)
         wsc_proxy_service.initDownloadFileRequest(lasso.SECURITY11_MECH_TLS_SAML)
         # FIXME: set appropriate teleserviceId
-        wsc_proxy_service.request.teleserviceId = '1260'
+        wsc_proxy_service.request.teleserviceId = '1001'
         # Add interaction service header
         headers = wsc_proxy_service.soapEnvelopeRequest.header.other 
         user_interaction = lasso.IsUserInteraction()
@@ -394,15 +394,16 @@ class AlternateLibertyDirectory(authentic.liberty.root.RootDirectory):
             '<is:UserInteraction', '<is:UserInteraction xmlns:is="urn:liberty:is:2003-08"')
         soap_answer = soap_call(wsc_proxy_service.msgUrl, body + '  ',
                 more_headers = more_headers)
-        # FIXME: MSP for dummies !
-        soap_answer = soap_answer.replace('faultcode','S:faultcode').replace('faultstring', 'S:faultstring').replace(
-           'faultactor', 'S:faultactor').replace('detail', 'S:Detail')
-
         try:
             wsc_proxy_service.processResponseMsg(soap_answer)
         except lasso.Error, error:
+            print 'erreur', error
+            print 'dump', wsc_proxy_service.response.dump()
+            if wsc_proxy_service.response and wsc_proxy_service.response.detail and wsc_proxy_service.response.detail.any[0]:
+                print wsc_proxy_service.response.detail.any[0].dump()
             if error[0] != lasso.SOAP_FAULT_REDIRECT_REQUEST or not wsc_proxy_service.msgUrl:
                 raise
+            print 'redirect'
             messageId = self.getMessageId(wsc_proxy_service.soapEnvelopeResponse)
             return None, wsc_proxy_service.msgUrl, messageId
         # Convert DownloadFileReponse to a document
@@ -658,7 +659,7 @@ class AlternateLibertyDirectory(authentic.liberty.root.RootDirectory):
         wsc_proxy_service = self.msp_disco_query(latest_session)
         wsc_proxy_service.initReadOidRequest(lasso.SECURITY11_MECH_TLS_SAML)
         # FIXME: set appropriate teleserviceId
-        wsc_proxy_service.request.teleserviceId = '1260'
+        wsc_proxy_service.request.teleserviceId = '1001'
 
         # Request complete description
         for oid in self.msp_oids:
@@ -737,7 +738,7 @@ class AlternateLibertyDirectory(authentic.liberty.root.RootDirectory):
         # Init UpdateOid request
         wsc_proxy_service = self.msp_disco_query(latest_session)
         wsc_proxy_service.initUpdateOidRequest(lasso.SECURITY11_MECH_TLS_SAML)
-        wsc_proxy_service.request.teleserviceId = '1260'
+        wsc_proxy_service.request.teleserviceId = '1001'
         if service_type == adeline_urn:
             modify_oids = []
             pp = ET.XML(resource_data)
@@ -820,7 +821,7 @@ class AlternateLibertyDirectory(authentic.liberty.root.RootDirectory):
         # Init UpdateOid request
         wsc_proxy_service = self.msp_disco_query(latest_session)
         wsc_proxy_service.initUploadToken(lasso.SECURITY11_MECH_TLS_SAML, 1, filename, datedepot)
-        wsc_proxy_service.request.teleserviceId = '1260'
+        wsc_proxy_service.request.teleserviceId = '1001'
         wsc_proxy_service.buildRequestMsg()
         more_headers = {}
         if get_cfg('adeline', {}).get('http_auth_tuple'):
@@ -968,7 +969,7 @@ def envoie_fichier(adeline_service, filename, filecontent, identity):
             <titreMessage>Message hors demarche avec PJ</titreMessage>
             <emailTransportResponse>admin@entrouvert.com</emailTransportResponse>
             <arDemande>true</arDemande>
-            <idTSEmetteur>1260</idTSEmetteur>
+            <idTSEmetteur>1001</idTSEmetteur>
             <refMessage>abcd</refMessage>
             <reponseAutorisee>true</reponseAutorisee>
             <isurgent>true</isurgent>
@@ -980,8 +981,8 @@ def envoie_fichier(adeline_service, filename, filecontent, identity):
             <intitule>%(filename)s</intitule>
             <lbNom>%(filename)s</lbNom>
             <typeDocument>1</typeDocument>
-            <infoEmeteur>1260</infoEmeteur>
-            <infoAuteur>1260</infoAuteur>
+            <infoEmeteur>1001</infoEmeteur>
+            <infoAuteur>1001</infoAuteur>
             <description>%(filename)s</description>
             <dateReference>%(date)s</dateReference>
             <dateFinValidite>2100-12-17T09:30:47.0Z</dateFinValidite>