Removed obsolete logout method load_from_dump.

Upgraded some residual calls to login_new & logout_new.

Updated Java binding.

Java unit test works (and C too, but Python still doesn't).

6 files changed, 6 insertions, 30 deletions

diff --git a/python/environs/py_logout.c b/python/environs/py_logout.c
index 8d313e05..92381d8d 100644
--- a/python/environs/py_logout.c
+++ b/python/environs/py_logout.c
@@ -194,24 +194,6 @@ PyObject *logout_load_request_msg(PyObject *self, PyObject *args){
   return(int_wrap(codeError));
 }
 
-PyObject *logout_load_user_dump(PyObject *self, PyObject *args){
-  PyObject *logout_obj;
-  gchar    *user_dump;
-  gint      codeError;
-
-  if (CheckArgs(args, "OS:logout_load_request_msg")) {
-    if(!PyArg_ParseTuple(args, (char *) "Os:logout_load_request_msg",
-			 &logout_obj, &user_dump))
-      return NULL;
-  }
-  else return NULL;
-
-  codeError = lasso_logout_load_user_dump(LassoLogout_get(logout_obj), user_dump);
-
-  return(int_wrap(codeError));
-}
-
-
 PyObject *logout_process_request(PyObject *self, PyObject *args) {
   PyObject *logout_obj;
   gint      codeError;
diff --git a/python/environs/py_logout.h b/python/environs/py_logout.h
index 8e1f271a..44f8a4af 100644
--- a/python/environs/py_logout.h
+++ b/python/environs/py_logout.h
@@ -47,7 +47,6 @@ PyObject *logout_destroy(PyObject *self, PyObject *args);
 PyObject *logout_get_next_providerID(PyObject *self, PyObject *args);
 PyObject *logout_init_request(PyObject *self, PyObject *args);
 PyObject *logout_load_request_msg(PyObject *self, PyObject *args);
-PyObject *logout_load_user_dump(PyObject *self, PyObject *args);
 PyObject *logout_new(PyObject *self, PyObject *args);
 PyObject *logout_process_request(PyObject *self, PyObject *args);
 PyObject *logout_process_response_msg(PyObject *self, PyObject *args);
diff --git a/python/examples/logout.py b/python/examples/logout.py
index 774ef79b..131e0e62 100644
--- a/python/examples/logout.py
+++ b/python/examples/logout.py
@@ -39,7 +39,7 @@ sp1user = lasso.User.new_from_dump(sp1user_dump)
 
 sp1logout = lasso.Logout.new(sp1server, lasso.providerTypeSp)
 
-sp1logout.load_user_dump(sp1user_dump)
+sp1logout.set_user_from_dump(sp1user_dump)
 
 sp1logout.init_request()
 
@@ -66,7 +66,7 @@ response_msg_body = "<Envelope><LogoutResponse><ProviderID>https://service-provi
 idplogout.load_request_msg(msg_body, lasso.httpMethodSoap)
 nameIdentifier = idplogout.nameIdentifier
 print "get the user dump from NameIdentifier : ", nameIdentifier
-idplogout.load_user_dump(idpuser_dump)
+idplogout.set_user_from_dump(idpuser_dump)
 idplogout.process_request()
 
 print "RelayState :", idplogout.msg_relayState
diff --git a/python/lasso.py b/python/lasso.py
index 8d5bec62..41f68faa 100644
--- a/python/lasso.py
+++ b/python/lasso.py
@@ -1058,9 +1058,6 @@ class Logout(ProfileContext):
     def load_request_msg(self, request_msg, request_method):
         return lassomod.logout_load_request_msg(self, request_msg, request_method);
 
-    def load_user_dump(self, user_dump):
-        return lassomod.logout_load_user_dump(self, user_dump);
-
     def process_request(self):
         return lassomod.logout_process_request(self);
 
diff --git a/python/lassomod.c b/python/lassomod.c
index 0fe4906d..e90f96d5 100644
--- a/python/lassomod.c
+++ b/python/lassomod.c
@@ -252,7 +252,6 @@ static PyMethodDef lasso_methods[] = {
   {"logout_get_next_providerID",  logout_get_next_providerID,  METH_VARARGS},
   {"logout_init_request",         logout_init_request,         METH_VARARGS},
   {"logout_load_request_msg",     logout_load_request_msg,     METH_VARARGS},
-  {"logout_load_user_dump",       logout_load_user_dump,       METH_VARARGS},
   {"logout_process_request",      logout_process_request,  METH_VARARGS},
   {"logout_process_response_msg", logout_process_response_msg, METH_VARARGS},
 
diff --git a/python/tests/login_tests.py b/python/tests/login_tests.py
index 137ef2ad..28a0b300 100644
--- a/python/tests/login_tests.py
+++ b/python/tests/login_tests.py
@@ -157,10 +157,9 @@ class LoginTestCase(unittest.TestCase):
         self.failUnless(spContextDump)
         spContext = lasso.Server.new_from_dump(spContextDump)
         self.failUnless(spContext)
+        spLogoutContext = lasso.Logout.new(spContext, lasso.providerTypeSp)
         self.failUnless(spUserContextDump)
-        spUserContext = lasso.User.new_from_dump(spUserContextDump)
-        self.failUnless(spUserContext)
-        spLogoutContext = lasso.Logout.new(lasso.providerTypeSp, spContext, spUserContext)
+        spLogoutContext.set_user_from_dump(spUserContextDump)
         self.failUnlessEqual(spLogoutContext.init_request(), 0)
         self.failUnlessEqual(spLogoutContext.build_request_msg(), 0)
         soapEndpoint = spLogoutContext.msg_url
@@ -173,12 +172,12 @@ class LoginTestCase(unittest.TestCase):
         self.failUnless(idpContextDump)
         idpContext = lasso.Server.new_from_dump(idpContextDump)
         self.failUnless(idpContext)
-        idpLogoutContext = lasso.Logout.new(lasso.providerTypeIdp, idpContext)
+        idpLogoutContext = lasso.Logout.new(idpContext, lasso.providerTypeIdp)
         self.failUnlessEqual(
             idpLogoutContext.load_request_msg(soapRequestMsg, lasso.httpMethodSoap), 0)
         self.failUnlessEqual(idpLogoutContext.nameIdentifier, nameIdentifier)
         self.failUnless(idpUserContextDump)
-        self.failUnlessEqual(idpLogoutContext.load_user_dump(idpUserContextDump), 0)
+        self.failUnlessEqual(idpLogoutContext.set_user_from_dump(idpUserContextDump), 0)
         self.failUnlessEqual(idpLogoutContext.process_request(), 0)
         idpUserContext = idpLogoutContext.user
         self.failUnless(idpUserContext)