Update begining

8 files changed, 46 insertions, 48 deletions

diff --git a/python/environs/Makefile.am b/python/environs/Makefile.am
index 1d12ea3c..6fa9c00c 100644
--- a/python/environs/Makefile.am
+++ b/python/environs/Makefile.am
@@ -8,12 +8,12 @@ INCLUDES = \
 	$(NULL)
 
 
-ENVSOURCES = py_federation_termination.c py_lecp.c py_login.c py_logout.c py_profile_context.c py_register_name_identifier.c py_server.c py_user.c
+ENVSOURCES = py_federation_termination.c py_lecp.c py_login.c py_logout.c py_profile_context.c py_register_name_identifier.c py_server.c py_identity.c
 
 if WITH_PYTHON
 noinst_LIBRARIES = libenvirons.a
 libenvirons_a_SOURCES = $(ENVSOURCES)
 endif
 
-EXTRA_DIST = $(ENVSOURCES) py_federation_termination.h py_lecp.h py_login.h py_logout.h py_profile_context.h py_register_name_identifier.h py_server.h py_user.h
+EXTRA_DIST = $(ENVSOURCES) py_federation_termination.h py_lecp.h py_login.h py_logout.h py_profile_context.h py_register_name_identifier.h py_server.h py_identity.h
 
diff --git a/python/environs/py_federation_termination.c b/python/environs/py_federation_termination.c
index 4187be8f..83d27be9 100644
--- a/python/environs/py_federation_termination.c
+++ b/python/environs/py_federation_termination.c
@@ -56,20 +56,20 @@ PyObject *federation_termination_getattr(PyObject *self, PyObject *args) {
   federation_termination = LassoFederationTermination_get(federation_termination_obj);
 
   if (!strcmp(attr, "__members__"))
-    return Py_BuildValue("[sssss]", "user", "msg_url", "msg_body",
+    return Py_BuildValue("[sssss]", "identity", "msg_url", "msg_body",
 			 "msg_relayState",
 			 "nameIdentifier");
 
-  if (!strcmp(attr, "user"))
-    return (LassoUser_wrap(LASSO_PROFILE_CONTEXT(federation_termination)->user));
+  if (!strcmp(attr, "identity"))
+    return (LassoIdentity_wrap(LASSO_PROFILE(federation_termination)->identity));
   if (!strcmp(attr, "msg_url"))
-    return (charPtrConst_wrap(LASSO_PROFILE_CONTEXT(federation_termination)->msg_url));
+    return (charPtrConst_wrap(LASSO_PROFILE(federation_termination)->msg_url));
   if (!strcmp(attr, "msg_body"))
-    return (charPtrConst_wrap(LASSO_PROFILE_CONTEXT(federation_termination)->msg_body));
+    return (charPtrConst_wrap(LASSO_PROFILE(federation_termination)->msg_body));
   if (!strcmp(attr, "msg_relayState"))
-    return (charPtrConst_wrap(LASSO_PROFILE_CONTEXT(federation_termination)->msg_relayState));
+    return (charPtrConst_wrap(LASSO_PROFILE(federation_termination)->msg_relayState));
   if (!strcmp(attr, "nameIdentifier"))
-    return (charPtrConst_wrap(LASSO_PROFILE_CONTEXT(federation_termination)->nameIdentifier));
+    return (charPtrConst_wrap(LASSO_PROFILE(federation_termination)->nameIdentifier));
 
   Py_INCREF(Py_None);
   return (Py_None);
diff --git a/python/environs/py_federation_termination.h b/python/environs/py_federation_termination.h
index c59427d6..57f01a5a 100644
--- a/python/environs/py_federation_termination.h
+++ b/python/environs/py_federation_termination.h
@@ -29,7 +29,7 @@
 #include <lasso/environs/federation_termination.h>
 
 #include "py_server.h"
-#include "py_user.h"
+#include "py_identity.h"
 
 typedef struct {
     PyObject_HEAD
diff --git a/python/environs/py_lecp.c b/python/environs/py_lecp.c
index a67a1bbb..60aae49b 100644
--- a/python/environs/py_lecp.c
+++ b/python/environs/py_lecp.c
@@ -55,12 +55,12 @@ PyObject *lecp_getattr(PyObject *self, PyObject *args) {
   lecp = LassoLecp_get(lecp_obj);
 
   if (!strcmp(attr, "__members__"))
-    return Py_BuildValue("[ssss]", "user", "msg_url", "msg_body",
+    return Py_BuildValue("[ssss]", "identity", "msg_url", "msg_body",
 			 "msg_relayState");
   if (!strcmp(attr, "msg_url"))
-    return (charPtrConst_wrap(LASSO_PROFILE_CONTEXT(lecp)->msg_url));
+    return (charPtrConst_wrap(LASSO_PROFILE(lecp)->msg_url));
   if (!strcmp(attr, "msg_body"))
-    return (charPtrConst_wrap(LASSO_PROFILE_CONTEXT(lecp)->msg_body));
+    return (charPtrConst_wrap(LASSO_PROFILE(lecp)->msg_body));
 
   Py_INCREF(Py_None);
   return (Py_None);
diff --git a/python/environs/py_login.c b/python/environs/py_login.c
index e774e456..0be80a5e 100644
--- a/python/environs/py_login.c
+++ b/python/environs/py_login.c
@@ -56,31 +56,31 @@ PyObject *login_getattr(PyObject *self, PyObject *args) {
   login = LassoLogin_get(login_obj);
 
   if (!strcmp(attr, "__members__"))
-    return Py_BuildValue("[ssssssssssss]", "user", "request", "response",
+    return Py_BuildValue("[ssssssssssss]", "identity", "session", "request", "response",
 			 "request_type", "response_type", "nameIdentifier",
 			 "provider_type",
 			 "msg_url", "msg_body", "msg_relayState", "response_dump",
 			 "protocolProfile", "assertionArtifact");
-  if (!strcmp(attr, "user"))
-    return (LassoUser_wrap(LASSO_PROFILE_CONTEXT(login)->user));
+  if (!strcmp(attr, "identity"))
+    return (LassoIdentity_wrap(LASSO_PROFILE(login)->identity));
   if (!strcmp(attr, "request"))
-    return (LassoNode_wrap(LASSO_PROFILE_CONTEXT(login)->request));
+    return (LassoNode_wrap(LASSO_PROFILE(login)->request));
   if (!strcmp(attr, "response"))
-    return (LassoNode_wrap(LASSO_PROFILE_CONTEXT(login)->response));
+    return (LassoNode_wrap(LASSO_PROFILE(login)->response));
   if (!strcmp(attr, "request_type"))
-    return (int_wrap(LASSO_PROFILE_CONTEXT(login)->request_type));
+    return (int_wrap(LASSO_PROFILE(login)->request_type));
   if (!strcmp(attr, "response_type"))
-    return (int_wrap(LASSO_PROFILE_CONTEXT(login)->response_type));
+    return (int_wrap(LASSO_PROFILE(login)->response_type));
   if (!strcmp(attr, "nameIdentifier"))
-    return (charPtrConst_wrap(LASSO_PROFILE_CONTEXT(login)->nameIdentifier));
+    return (charPtrConst_wrap(LASSO_PROFILE(login)->nameIdentifier));
   if (!strcmp(attr, "provider_type"))
-    return (int_wrap(LASSO_PROFILE_CONTEXT(login)->provider_type));
+    return (int_wrap(LASSO_PROFILE(login)->provider_type));
   if (!strcmp(attr, "msg_url"))
-    return (charPtrConst_wrap(LASSO_PROFILE_CONTEXT(login)->msg_url));
+    return (charPtrConst_wrap(LASSO_PROFILE(login)->msg_url));
   if (!strcmp(attr, "msg_body"))
-    return (charPtrConst_wrap(LASSO_PROFILE_CONTEXT(login)->msg_body));
+    return (charPtrConst_wrap(LASSO_PROFILE(login)->msg_body));
   if (!strcmp(attr, "msg_relayState"))
-    return (charPtrConst_wrap(LASSO_PROFILE_CONTEXT(login)->msg_relayState));
+    return (charPtrConst_wrap(LASSO_PROFILE(login)->msg_relayState));
   if (!strcmp(attr, "response_dump"))
     return (charPtrConst_wrap(login->response_dump));
   if (!strcmp(attr, "protocolProfile"))
@@ -110,24 +110,24 @@ PyObject *login_new(PyObject *self, PyObject *args) {
 }
 
 PyObject *login_new_from_dump(PyObject *self, PyObject *args) {
-  PyObject *server_obj, *user_obj;
+  PyObject *server_obj, *identity_obj;
   LassoLogin *login;
   LassoServer *server;
-  LassoUser   *user = NULL;
+  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,
-			 &user_obj, &dump))
+			 &identity_obj, &dump))
       return NULL;
   }
   else return NULL;
 
   server = LassoServer_get(server_obj);
-  if (user_obj != Py_None) {
-    user = LassoUser_get(user_obj);
+  if (identity_obj != Py_None) {
+    identity = LassoIdentity_get(identity_obj);
   }
-  login = lasso_login_new_from_dump(server, user, dump);
+  login = lasso_login_new_from_dump(server, identity, dump);
 
   return (LassoLogin_wrap(login));
 }
@@ -213,20 +213,18 @@ PyObject *login_build_request_msg(PyObject *self, PyObject *args) {
   return (int_wrap(ret));
 }
 
-PyObject *login_create_user(PyObject *self, PyObject *args) {
+PyObject *login_accespt_sso(PyObject *self, PyObject *args) {
   PyObject *login_obj;
-  gchar *user_dump = NULL;
   gint ret;
 
-  if (CheckArgs(args, "Os:login_create_user")) {
-    if(!PyArg_ParseTuple(args, (char *) "Oz:login_create_user",
-			 &login_obj, &user_dump))
+  if (CheckArgs(args, "O:login_accespt_sso")) {
+    if(!PyArg_ParseTuple(args, (char *) "O:login_accespt_sso",
+			 &login_obj))
       return NULL;
   }
   else return NULL;
 
-  ret = lasso_login_create_user(LassoLogin_get(login_obj),
-				user_dump);
+  ret = lasso_login_accept_sso(LassoLogin_get(login_obj));
 
   return (int_wrap(ret));
 }
diff --git a/python/environs/py_login.h b/python/environs/py_login.h
index 133e6694..7f32d315 100644
--- a/python/environs/py_login.h
+++ b/python/environs/py_login.h
@@ -29,7 +29,7 @@
 #include <lasso/environs/login.h>
 
 #include "py_server.h"
-#include "py_user.h"
+#include "py_identity.h"
 
 typedef struct {
     PyObject_HEAD
diff --git a/python/environs/py_logout.c b/python/environs/py_logout.c
index 992d7e22..eee4546f 100644
--- a/python/environs/py_logout.c
+++ b/python/environs/py_logout.c
@@ -60,19 +60,19 @@ PyObject *logout_getattr(PyObject *self, PyObject *args) {
     return Py_BuildValue("[ssss]", "user", "msg_url", "msg_body",
 			 "nameIdentifier", "msg_relayState");
   if (!strcmp(attr, "msg_url"))
-    return (charPtrConst_wrap(LASSO_PROFILE_CONTEXT(logout)->msg_url));
+    return (charPtrConst_wrap(LASSO_PROFILE(logout)->msg_url));
   if (!strcmp(attr, "msg_body"))
-    return (charPtrConst_wrap(LASSO_PROFILE_CONTEXT(logout)->msg_body));
+    return (charPtrConst_wrap(LASSO_PROFILE(logout)->msg_body));
   if (!strcmp(attr, "msg_relayState"))
-    return (charPtrConst_wrap(LASSO_PROFILE_CONTEXT(logout)->msg_relayState));
+    return (charPtrConst_wrap(LASSO_PROFILE(logout)->msg_relayState));
   if (!strcmp(attr, "nameIdentifier"))
-    return (charPtrConst_wrap(LASSO_PROFILE_CONTEXT(logout)->nameIdentifier));
+    return (charPtrConst_wrap(LASSO_PROFILE(logout)->nameIdentifier));
   if (!strcmp(attr, "request"))
-    return (LassoNode_wrap(LASSO_PROFILE_CONTEXT(logout)->request));
+    return (LassoNode_wrap(LASSO_PROFILE(logout)->request));
   if (!strcmp(attr, "response"))
-    return (LassoNode_wrap(LASSO_PROFILE_CONTEXT(logout)->response));
-  if (!strcmp(attr, "user"))
-    return (LassoUser_wrap(LASSO_PROFILE_CONTEXT(logout)->user));
+    return (LassoNode_wrap(LASSO_PROFILE(logout)->response));
+  if (!strcmp(attr, "identity"))
+    return (LassoIdentity_wrap(LASSO_PROFILE(logout)->identity));
 
   Py_INCREF(Py_None);
   return (Py_None);
diff --git a/python/environs/py_logout.h b/python/environs/py_logout.h
index 44f8a4af..7242332f 100644
--- a/python/environs/py_logout.h
+++ b/python/environs/py_logout.h
@@ -29,7 +29,7 @@
 #include <lasso/environs/logout.h>
 
 #include "py_server.h"
-#include "py_user.h"
+#include "py_identity.h"
 
 typedef struct {
     PyObject_HEAD