*** empty log message ***

4 files changed, 18 insertions, 23 deletions

diff --git a/lasso/id-ff/logout.h b/lasso/id-ff/logout.h
index 8f300820..1d5a0e24 100644
--- a/lasso/id-ff/logout.h
+++ b/lasso/id-ff/logout.h
@@ -66,7 +66,7 @@ struct _LassoLogoutClass {
 LASSO_EXPORT GType        lasso_logout_get_type                (void);
 
 LASSO_EXPORT LassoLogout* lasso_logout_new                     (LassoServer        *server,
-																lassoProviderTypes  provider_type);
+								lassoProviderTypes  provider_type);
   
 LASSO_EXPORT gint         lasso_logout_build_request_msg       (LassoLogout *logout);
 
@@ -77,24 +77,20 @@ LASSO_EXPORT void         lasso_logout_destroy                 (LassoLogout *log
 LASSO_EXPORT gchar*       lasso_logout_get_next_providerID     (LassoLogout *logout);
 
 LASSO_EXPORT gint         lasso_logout_init_request            (LassoLogout *logout,
-																gchar       *remote_providerID);
+								gchar       *remote_providerID);
 
 LASSO_EXPORT gint         lasso_logout_load_user_dump          (LassoLogout *logout,
-																gchar       *user_dump);
+								gchar       *user_dump);
 
 LASSO_EXPORT gint         lasso_logout_load_request_msg        (LassoLogout     *logout,
-																gchar           *request_msg,
-																lassoHttpMethods request_method);
+								gchar           *request_msg,
+								lassoHttpMethods request_method);
 
 LASSO_EXPORT gint         lasso_logout_process_request         (LassoLogout *logout);
 
-LASSO_EXPORT gint         lasso_logout_process_request_msg     (LassoLogout      *logout,
-																gchar            *request_msg,
-																lassoHttpMethods  request_method);
-
 LASSO_EXPORT gint         lasso_logout_process_response_msg    (LassoLogout      *logout,
-																gchar            *response_msg,
-																lassoHttpMethods  response_method);
+								gchar            *response_msg,
+								lassoHttpMethods  response_method);
   
 #ifdef __cplusplus
 }
diff --git a/python/environs/py_logout.c b/python/environs/py_logout.c
index 0146c844..8d313e05 100644
--- a/python/environs/py_logout.c
+++ b/python/environs/py_logout.c
@@ -216,8 +216,8 @@ PyObject *logout_process_request(PyObject *self, PyObject *args) {
   PyObject *logout_obj;
   gint      codeError;
 
-  if (CheckArgs(args, "O:logout_process_request_msg")) {
-    if(!PyArg_ParseTuple(args, (char *) "O:logout_process_request_msg",
+  if (CheckArgs(args, "O:logout_process_request")) {
+    if(!PyArg_ParseTuple(args, (char *) "O:logout_process_request",
 			 &logout_obj))
       return NULL;
   }
diff --git a/python/lassomod.c b/python/lassomod.c
index 376aaf7f..0fe4906d 100644
--- a/python/lassomod.c
+++ b/python/lassomod.c
@@ -203,6 +203,8 @@ static PyMethodDef lasso_methods[] = {
 
   /* environs */
   {"profile_context_get_request_type_from_soap_msg",  profile_context_get_request_type_from_soap_msg,  METH_VARARGS},
+  {"profile_context_new",                profile_context_new,                METH_VARARGS},
+  {"profile_context_set_user_from_dump", profile_context_set_user_from_dump, METH_VARARGS},
 
   /* py_federation_termination.h */
   {"federation_termination_getattr",                  federation_termination_getattr,                  METH_VARARGS},
diff --git a/tests/login_tests.c b/tests/login_tests.c
index bb729d41..e969837c 100644
--- a/tests/login_tests.c
+++ b/tests/login_tests.c
@@ -101,7 +101,7 @@ START_TEST(test02_serviceProviderLogin)
 
 	serviceProviderContextDump = generateServiceProviderContextDump();
 	spContext = lasso_server_new_from_dump(serviceProviderContextDump);
-	spLoginContext = lasso_login_new(spContext, NULL);
+	spLoginContext = lasso_login_new(spContext);
 	fail_unless(spLoginContext != NULL,
 			"lasso_login_new() shouldn't have returned NULL");
 	rc = lasso_login_init_authn_request(spLoginContext,
@@ -128,7 +128,7 @@ START_TEST(test02_serviceProviderLogin)
         /* Identity provider singleSignOn, for a user having no federation. */
 	identityProviderContextDump = generateIdentityProviderContextDump();
 	idpContext = lasso_server_new_from_dump(identityProviderContextDump);
-	idpLoginContext = lasso_login_new(idpContext, NULL);
+	idpLoginContext = lasso_login_new(idpContext);
 	fail_unless(idpLoginContext != NULL,
 			"lasso_login_new() shouldn't have returned NULL");
 	rc = lasso_login_init_from_authn_request_msg(idpLoginContext,
@@ -160,7 +160,7 @@ START_TEST(test02_serviceProviderLogin)
 	lasso_login_destroy(spLoginContext);
 
 	spContext = lasso_server_new_from_dump(serviceProviderContextDump);
-	spLoginContext = lasso_login_new(spContext, NULL);
+	spLoginContext = lasso_login_new(spContext);
 	rc = lasso_login_init_request(spLoginContext,
 			responseQuery,
 			lassoHttpMethodRedirect);
@@ -192,10 +192,9 @@ START_TEST(test02_serviceProviderLogin)
 	lasso_login_destroy(spLoginContext);
 
 	spContext = lasso_server_new_from_dump(serviceProviderContextDump);
-	spUserContext = lasso_user_new_from_dump(spUserContextDump);
-	fail_unless(spUserContext != NULL, "spUserContext should not be NULL");
-	spLogoutContext = lasso_logout_new(lassoProviderTypeSp,
-			spContext, spUserContext);
+	spLogoutContext = lasso_logout_new(spContext, lassoProviderTypeSp);
+	lasso_profile_context_set_user_from_dump(LASSO_PROFILE_CONTEXT(spLogoutContext),
+						 spUserContextDump);
 	fail_unless(spLogoutContext != NULL, "spLogoutContext should not be NULL");
 	spUserContextDump = lasso_user_dump(LASSO_PROFILE_CONTEXT(spLogoutContext)->user);
 	fail_unless(spUserContextDump != NULL, "spUserContextDump should not be NULL");
@@ -208,8 +207,6 @@ START_TEST(test02_serviceProviderLogin)
 	/* Identity provider SOAP endpoint */
 	lasso_server_destroy(idpContext);
 
-	/* XXX  the problem lies here (how did lasso_server_destroy(idpContext) changed
-	 *      the spLogoutContext->user ?) */
 	spUserContextDumpTemp = lasso_user_dump(LASSO_PROFILE_CONTEXT(spLogoutContext)->user);
 	fail_unless(spUserContextDumpTemp != NULL,
 			"spUserContextDumpTemp should not be NULL");
@@ -220,7 +217,7 @@ START_TEST(test02_serviceProviderLogin)
 			LASSO_PROFILE_CONTEXT(spLogoutContext)->msg_body);
 
 	idpContext = lasso_server_new_from_dump(identityProviderContextDump);
-	idpLogoutContext = lasso_logout_new(lassoProviderTypeIdp, idpContext, NULL);
+	idpLogoutContext = lasso_logout_new(idpContext, lassoProviderTypeIdp);
 	fail_unless(idpLogoutContext != NULL, "lasso_logout_new failed");
 	rc = lasso_logout_load_request_msg(
 			idpLogoutContext,