Renamed load_notification_msg to process_notification msg, renamed process_request to validate_request, added some goto for code error, little update of the code style, updated examples

5 files changed, 27 insertions, 31 deletions

diff --git a/python/environs/py_federation_termination.c b/python/environs/py_federation_termination.c
index 83d27be9..b4b1ac33 100644
--- a/python/environs/py_federation_termination.c
+++ b/python/environs/py_federation_termination.c
@@ -143,37 +143,37 @@ PyObject *federation_termination_init_notification(PyObject *self, PyObject *arg
   return(int_wrap(codeError));
 }
 
-PyObject *federation_termination_load_notification_msg(PyObject *self, PyObject *args){
+PyObject *federation_termination_process_notification_msg(PyObject *self, PyObject *args){
   PyObject *notification_obj;
   gchar    *notification_msg;
   gint      notification_method;
   gint      codeError;
 
-  if (CheckArgs(args, "OSI:federation_termination_load_notification_msg")) {
-    if(!PyArg_ParseTuple(args, (char *) "Osi:federation_termination_load_notification_msg",
+  if (CheckArgs(args, "OSI:federation_termination_process_notification_msg")) {
+    if(!PyArg_ParseTuple(args, (char *) "Osi:federation_termination_process_notification_msg",
 			 &notification_obj, &notification_msg, &notification_method))
       return NULL;
   }
   else return NULL;
 
-  codeError = lasso_federation_termination_load_notification_msg(LassoFederationTermination_get(notification_obj),
-								 notification_msg, notification_method);
+  codeError = lasso_federation_termination_process_notification_msg(LassoFederationTermination_get(notification_obj),
+								    notification_msg, notification_method);
 
   return(int_wrap(codeError));
 }
 
-PyObject *federation_termination_process_notification(PyObject *self, PyObject *args) {
+PyObject *federation_termination_validate_notification(PyObject *self, PyObject *args) {
   PyObject *federation_termination_obj;
   gint      codeError;
 
-  if (CheckArgs(args, "O:federation_termination_process_notification")) {
-    if(!PyArg_ParseTuple(args, (char *) "O:federation_termination_process_notification",
+  if (CheckArgs(args, "O:federation_termination_validate_notification")) {
+    if(!PyArg_ParseTuple(args, (char *) "O:federation_termination_validate_notification",
 			 &federation_termination_obj))
       return NULL;
   }
   else return NULL;
 
-  codeError = lasso_federation_termination_process_notification(LassoFederationTermination_get(federation_termination_obj));
+  codeError = lasso_federation_termination_validate_notification(LassoFederationTermination_get(federation_termination_obj));
 
   return(int_wrap(codeError));
 }
diff --git a/python/environs/py_federation_termination.h b/python/environs/py_federation_termination.h
index 57f01a5a..97567859 100644
--- a/python/environs/py_federation_termination.h
+++ b/python/environs/py_federation_termination.h
@@ -46,7 +46,7 @@ PyObject *federation_termination_new(PyObject *self, PyObject *args);
 PyObject *federation_termination_build_notification_msg(PyObject *self, PyObject *args);
 PyObject *federation_termination_destroy(PyObject *self, PyObject *args);
 PyObject *federation_termination_init_notification(PyObject *self, PyObject *args);
-PyObject *federation_termination_load_notification_msg(PyObject *self, PyObject *args);
-PyObject *federation_termination_process_notification(PyObject *self, PyObject *args);
+PyObject *federation_termination_process_notification_msg(PyObject *self, PyObject *args);
+PyObject *federation_termination_validate_notification(PyObject *self, PyObject *args);
 
 #endif /* __PYLASSO_PY_FEDERATION_TERMINATION_H__ */
diff --git a/python/examples/defederation.py b/python/examples/defederation.py
index 34d060c1..e4b44de8 100644
--- a/python/examples/defederation.py
+++ b/python/examples/defederation.py
@@ -5,9 +5,9 @@ sys.path.insert(0, '../')
 import lasso
 
 
-spuser_dump = "<LassoUser><LassoIdentities><LassoIdentity RemoteProviderID=\"https://identity-provider:2003/liberty-alliance/metadata\"><LassoRemoteNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">1111111111111111111111111</NameIdentifier></LassoRemoteNameIdentifier></LassoIdentity></LassoIdentities></LassoUser>"
+spidentity_dump = "<LassoIdentity><LassoFederations><LassoFederation RemoteProviderID=\"https://identity-provider:2003/liberty-alliance/metadata\"><LassoRemoteNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">1111111111111111111111111</NameIdentifier></LassoRemoteNameIdentifier></LassoFederation></LassoFederations></LassoIdentity>"
 
-idpuser_dump = "<LassoUser><LassoIdentities><LassoIdentity RemoteProviderID=\"https://service-provider:2003/liberty-alliance/metadata\"><LassoLocalNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">1111111111111111111111111</NameIdentifier></LassoLocalNameIdentifier></LassoIdentity></LassoIdentities></LassoUser>"
+idpidentity_dump = "<LassoIdentity><LassoFederations><LassoFederation RemoteProviderID=\"https://service-provider:2003/liberty-alliance/metadata\"><LassoLocalNameIdentifier><NameIdentifier NameQualifier=\"qualifier.com\" Format=\"federated\">1111111111111111111111111</NameIdentifier></LassoLocalNameIdentifier></LassoFederation></LassoFederations></LassoIdentity>"
 
 
 # SP :
@@ -16,10 +16,8 @@ spserver = lasso.Server.new("../../examples/sp.xml",
                             lasso.signatureMethodRsaSha1)
 spserver.add_provider("../../examples/idp.xml", None, None)
 
-spuser = lasso.User.new_from_dump(spuser_dump)
-
 spdefederation = lasso.FederationTermination.new(spserver, lasso.providerTypeSp)
-spdefederation.set_user_from_dump(spuser_dump)
+spdefederation.set_identity_from_dump(spidentity_dump)
 spdefederation.init_notification()
 spdefederation.build_notification_msg()
 print 'url : ', spdefederation.msg_url
@@ -34,14 +32,12 @@ idpserver = lasso.Server.new("../../examples/idp.xml",
                             lasso.signatureMethodRsaSha1)
 idpserver.add_provider("../../examples/sp.xml", None, None)
 
-idpuser = lasso.User.new_from_dump(idpuser_dump)
-
 idpdefederation = lasso.FederationTermination.new(idpserver, lasso.providerTypeIdp)
-idpdefederation.load_notification_msg(notification_msg, lasso.httpMethodSoap)
+idpdefederation.process_notification_msg(notification_msg, lasso.httpMethodSoap)
 print 'NameIdentifier :', idpdefederation.nameIdentifier
 
-idpdefederation.set_user_from_dump(idpuser_dump);
-idpdefederation.process_notification()
+idpdefederation.set_identity_from_dump(idpidentity_dump);
+idpdefederation.validate_notification()
 
 print 'End of federation termination notification'
 
diff --git a/python/lasso.py b/python/lasso.py
index 937e4736..ad210795 100644
--- a/python/lasso.py
+++ b/python/lasso.py
@@ -1353,19 +1353,19 @@ class FederationTermination(Profile):
         if errorCode:
             raise newError(errorCode, 'lasso_federation_termination_init_notification')
 
-    def load_notification_msg(self, notification_msg, notification_method):
-        errorCode = lassomod.federation_termination_load_notification_msg(
+    def process_notification_msg(self, notification_msg, notification_method):
+        errorCode = lassomod.federation_termination_process_notification_msg(
             self, notification_msg, notification_method)
         if errorCode:
             raise newError(errorCode, 'lasso_federation_termination_load_notification_msg')
 
-    def process_notification(self):
-        errorCode = lassomod.federation_termination_process_notification(self)
+    def validate_notification(self):
+        errorCode = lassomod.federation_termination_validate_notification(self)
         if errorCode:
             raise newError(errorCode, 'lasso_federation_termination_process_notification')
 
 
-class RegisterNameIdentifier:
+class RegisterNameIdentifier(Profile):
     """\brief Short desc
 
     Long desc
@@ -1378,7 +1378,7 @@ class RegisterNameIdentifier:
         """
         The constructor
         """
-        self._o = _obj
+        Profile.__init__(self, _obj=_obj)
 
     def __getattr__(self, name):
         if self.__isprivate(name):
@@ -1424,7 +1424,7 @@ class RegisterNameIdentifier:
         if errorCode:
             raise newError(errorCode, 'lasso_register_name_identifier_process_response_msg')
 
-class Lecp:
+class Lecp(Login):
     """\brief Short desc
 
     Long desc
@@ -1437,7 +1437,7 @@ class Lecp:
         """
         The constructor
         """
-        self._o = _obj
+        Login.__init__(self, _obj = _obj)
 
     def __getattr__(self, name):
         if self.__isprivate(name):
diff --git a/python/lassomod.c b/python/lassomod.c
index 1d39fd2d..da59b62f 100644
--- a/python/lassomod.c
+++ b/python/lassomod.c
@@ -223,8 +223,8 @@ static PyMethodDef lasso_methods[] = {
   {"federation_termination_build_notification_msg",   federation_termination_build_notification_msg,   METH_VARARGS},
   {"federation_termination_destroy",                  federation_termination_destroy,                  METH_VARARGS},
   {"federation_termination_init_notification",        federation_termination_init_notification,        METH_VARARGS},
-  {"federation_termination_load_notification_msg",    federation_termination_load_notification_msg,    METH_VARARGS},
-  {"federation_termination_process_notification",     federation_termination_process_notification,     METH_VARARGS},
+  {"federation_termination_process_notification_msg", federation_termination_process_notification_msg, METH_VARARGS},
+  {"federation_termination_validate_notification",    federation_termination_validate_notification,    METH_VARARGS},
 
   /* py_lecp.h */
   {"lecp_new",                                 lecp_new,                                 METH_VARARGS},