Removed the 'identity' arg in lasso_login_new_from_dump() method

5 files changed, 35 insertions, 42 deletions

diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index c6ff7a8e..87a66b5c 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -390,11 +390,11 @@ lasso_login_accept_sso(LassoLogin *login)
 }
 
 gint
-lasso_login_build_artifact_msg(LassoLogin       *login,
-			       gint              authentication_result,
-			       const gchar      *authenticationMethod,
-			       const gchar      *reauthenticateOnOrAfter,
-			       lassoHttpMethods  method)
+lasso_login_build_artifact_msg(LassoLogin      *login,
+			       gint             authentication_result,
+			       const gchar     *authenticationMethod,
+			       const gchar     *reauthenticateOnOrAfter,
+			       lassoHttpMethod  method)
 {
   LassoFederation *federation = NULL;
   LassoProvider *remote_provider;
@@ -685,9 +685,9 @@ lasso_login_init_authn_request(LassoLogin  *login,
 }
 
 gint
-lasso_login_init_from_authn_request_msg(LassoLogin       *login,
-					gchar            *authn_request_msg,
-					lassoHttpMethods  authn_request_method)
+lasso_login_init_from_authn_request_msg(LassoLogin      *login,
+					gchar           *authn_request_msg,
+					lassoHttpMethod  authn_request_method)
 {
   LassoServer *server;
   LassoProvider *remote_provider;
@@ -805,9 +805,9 @@ lasso_login_init_from_authn_request_msg(LassoLogin       *login,
 }
 
 gint
-lasso_login_init_request(LassoLogin       *login,
-			 gchar            *response_msg,
-			 lassoHttpMethods  response_method)
+lasso_login_init_request(LassoLogin      *login,
+			 gchar           *response_msg,
+			 lassoHttpMethod  response_method)
 {
   LassoNode *response = NULL;
   xmlChar *artifact, *identityProviderSuccinctID;
@@ -1021,9 +1021,8 @@ lasso_login_new(LassoServer *server)
 }
 
 LassoLogin*
-lasso_login_new_from_dump(LassoServer   *server,
-			  LassoIdentity *identity,
-			  gchar         *dump)
+lasso_login_new_from_dump(LassoServer *server,
+			  gchar       *dump)
 {
   LassoLogin *login;
   LassoNode *node_dump, *request_node, *response_node;
@@ -1031,7 +1030,6 @@ lasso_login_new_from_dump(LassoServer   *server,
 
   login = LASSO_LOGIN(g_object_new(LASSO_TYPE_LOGIN,
 				   "server", lasso_server_copy(server),
-				   "identity", lasso_identity_copy(identity),
 				   NULL));
   
   node_dump = lasso_node_new_from_dump(dump);
diff --git a/lasso/id-ff/login.h b/lasso/id-ff/login.h
index 518db617..3061ced3 100644
--- a/lasso/id-ff/login.h
+++ b/lasso/id-ff/login.h
@@ -73,17 +73,16 @@ LASSO_EXPORT GType                lasso_login_get_type                    (void)
 
 LASSO_EXPORT LassoLogin*          lasso_login_new                         (LassoServer *server);
 
-LASSO_EXPORT LassoLogin*          lasso_login_new_from_dump               (LassoServer   *server,
-									   LassoIdentity *identity,
-									   gchar         *dump);
+LASSO_EXPORT LassoLogin*          lasso_login_new_from_dump               (LassoServer *server,
+									   gchar       *dump);
 
 LASSO_EXPORT gint                 lasso_login_accept_sso                  (LassoLogin *login);
 
-LASSO_EXPORT gint                 lasso_login_build_artifact_msg          (LassoLogin       *login,
-									   gint              authentication_result,
-									   const gchar      *authenticationMethod,
-									   const gchar      *reauthenticateOnOrAfter,
-									   lassoHttpMethods  method);
+LASSO_EXPORT gint                 lasso_login_build_artifact_msg          (LassoLogin      *login,
+									   gint             authentication_result,
+									   const gchar     *authenticationMethod,
+									   const gchar     *reauthenticateOnOrAfter,
+									   lassoHttpMethod  method);
 
 LASSO_EXPORT gint                 lasso_login_build_authn_request_msg     (LassoLogin *login);
 
@@ -101,13 +100,13 @@ LASSO_EXPORT gchar*               lasso_login_dump                        (Lasso
 LASSO_EXPORT gint                 lasso_login_init_authn_request          (LassoLogin  *login,
 									   const gchar *remote_providerID);
 
-LASSO_EXPORT gint                 lasso_login_init_from_authn_request_msg (LassoLogin       *login,
-									   gchar            *authn_request_msg,
-									   lassoHttpMethods  authn_request_method);
+LASSO_EXPORT gint                 lasso_login_init_from_authn_request_msg (LassoLogin      *login,
+									   gchar           *authn_request_msg,
+									   lassoHttpMethod  authn_request_method);
 
-LASSO_EXPORT gint                 lasso_login_init_request                (LassoLogin       *login,
-									   gchar            *response_msg,
-									   lassoHttpMethods  response_method);
+LASSO_EXPORT gint                 lasso_login_init_request                (LassoLogin      *login,
+									   gchar           *response_msg,
+									   lassoHttpMethod  response_method);
 
 LASSO_EXPORT gboolean             lasso_login_must_authenticate           (LassoLogin *login);
 
diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c
index b150c9f1..0bb039b8 100644
--- a/lasso/id-ff/session.c
+++ b/lasso/id-ff/session.c
@@ -101,7 +101,7 @@ lasso_session_add_assertion(LassoSession *session,
     }
   }
   if(found == TRUE) {
-    message(G_LOG_LEVEL_CRITICAL, "An assertion existed already for this providerID, it was replaced by the new one.\n");
+    debug("An assertion existed already for this providerID, it was replaced by the new one.\n");
   }
   else {
     g_ptr_array_add(session->providerIDs, g_strdup(remote_providerID));
diff --git a/python/environs/py_login.c b/python/environs/py_login.c
index 862e7113..3fde9dad 100644
--- a/python/environs/py_login.c
+++ b/python/environs/py_login.c
@@ -108,24 +108,20 @@ PyObject *login_new(PyObject *self, PyObject *args) {
 }
 
 PyObject *login_new_from_dump(PyObject *self, PyObject *args) {
-  PyObject *server_obj, *identity_obj;
+  PyObject *server_obj;
   LassoLogin *login;
   LassoServer *server;
-  LassoIdentity *identity = NULL;
   gchar       *dump;
 
   if (CheckArgs(args, "OoS:login_new_from_dump")) {
     if(!PyArg_ParseTuple(args, (char *) "OOs:login_new_from_dump", &server_obj,
-			 &identity_obj, &dump))
+			 &dump))
       return NULL;
   }
   else return NULL;
 
   server = LassoServer_get(server_obj);
-  if (identity_obj != Py_None) {
-    identity = LassoIdentity_get(identity_obj);
-  }
-  login = lasso_login_new_from_dump(server, identity, dump);
+  login = lasso_login_new_from_dump(server, dump);
 
   return (LassoLogin_wrap(login));
 }
@@ -135,7 +131,7 @@ PyObject *login_build_artifact_msg(PyObject *self, PyObject *args) {
   gint              authentication_result;
   const gchar      *authenticationMethod;
   const gchar      *reauthenticateOnOrAfter;
-  lassoHttpMethods  method;
+  lassoHttpMethod   method;
   gint ret;
 
   if (CheckArgs(args, "OISSI:login_build_artifact_msg")) {
@@ -264,7 +260,7 @@ PyObject *login_init_authn_request(PyObject *self, PyObject *args) {
 PyObject *login_init_from_authn_request_msg(PyObject *self, PyObject *args) {
   PyObject *login_obj;
   gchar            *authn_request_msg;
-  lassoHttpMethods  authn_request_method;
+  lassoHttpMethod   authn_request_method;
   gint ret;
 
   if (CheckArgs(args, "OSI:login_init_from_authn_request_msg")) {
@@ -284,7 +280,7 @@ PyObject *login_init_from_authn_request_msg(PyObject *self, PyObject *args) {
 PyObject *login_init_request(PyObject *self, PyObject *args) {
   PyObject *login_obj;
   gchar            *response_msg;
-  lassoHttpMethods  response_method;
+  lassoHttpMethod   response_method;
   gint ret;
 
   if (CheckArgs(args, "OSI:login_init_request")) {
diff --git a/python/lasso.py b/python/lasso.py
index f2fd794c..e1b7a8dd 100644
--- a/python/lasso.py
+++ b/python/lasso.py
@@ -1006,8 +1006,8 @@ class Login(Profile):
         return Login(obj)
     new = classmethod(new)
 
-    def new_from_dump(cls, server, identity, dump):
-        obj = lassomod.login_new_from_dump(server, identity, dump)
+    def new_from_dump(cls, server, dump):
+        obj = lassomod.login_new_from_dump(server, dump)
         return Login(obj)
     new_from_dump = classmethod(new_from_dump)