Added lasso_user_get_authentication_method()

Done in Python too.

4 files changed, 36 insertions, 13 deletions

diff --git a/python/environs/py_user.c b/python/environs/py_user.c
index 2ff52172..9fdd71db 100644
--- a/python/environs/py_user.c
+++ b/python/environs/py_user.c
@@ -116,33 +116,50 @@ PyObject *user_get_assertion(PyObject *self, PyObject *args) {
   gchar     *remote_providerID;
 
   if (CheckArgs(args, "OS:user_get_assertion")) {
-    if(!PyArg_ParseTuple(args, (char *) "Os:user_get_assertion", &user_obj, &remote_providerID))
+    if(!PyArg_ParseTuple(args, (char *) "Os:user_get_assertion", &user_obj,
+			 &remote_providerID))
       return NULL;
   }
   else return NULL;
 
-  assertion_node = lasso_user_get_assertion(LassoUser_get(user_obj), remote_providerID);
+  assertion_node = lasso_user_get_assertion(LassoUser_get(user_obj),
+					    remote_providerID);
 
   return (LassoNode_wrap(assertion_node));
 }
 
+PyObject *user_get_authentication_method(PyObject *self, PyObject *args) {
+  PyObject *user_obj;
+  gchar    *remote_providerID;
+  gchar    *authentication_method;
+
+  if (CheckArgs(args, "Os:user_get_authentication_method")) {
+    if(!PyArg_ParseTuple(args, (char *) "Oz:user_get_authentication_method",
+			 &user_obj, &remote_providerID))
+      return NULL;
+  }
+  else return NULL;
+
+  authentication_method = lasso_user_get_authentication_method(LassoUser_get(user_obj),
+							       remote_providerID);
+
+  return (charPtrConst_wrap(authentication_method));
+}
+
 PyObject *user_get_next_assertion_remote_providerID(PyObject *self, PyObject *args) {
   PyObject  *user_obj;
   gchar     *remote_providerID;
 
   if (CheckArgs(args, "O:user_get_next_assertion_remote_providerID")) {
-    if(!PyArg_ParseTuple(args, (char *) "O:user_get_next_assertion_remote_providerID", &user_obj))
+    if(!PyArg_ParseTuple(args, (char *) "O:user_get_next_assertion_remote_providerID",
+			 &user_obj))
       return NULL;
   }
   else return NULL;
 
   remote_providerID = lasso_user_get_next_assertion_remote_providerID(LassoUser_get(user_obj));
-  if(remote_providerID==NULL){
-    Py_INCREF(Py_None);
-    return (Py_None);
-  }
 
-  return (charPtr_wrap(remote_providerID));
+  return (charPtrConst_wrap(remote_providerID));
 }
 
 PyObject *user_remove_assertion(PyObject *self, PyObject *args) {
@@ -151,7 +168,8 @@ PyObject *user_remove_assertion(PyObject *self, PyObject *args) {
   int       code;
 
   if (CheckArgs(args, "OS:user_remove_assertion")) {
-    if(!PyArg_ParseTuple(args, (char *) "Os:user_remove_assertion", &user_obj, &remote_providerID))
+    if(!PyArg_ParseTuple(args, (char *) "Os:user_remove_assertion", &user_obj,
+			 &remote_providerID))
       return NULL;
   }
   else return NULL;
diff --git a/python/environs/py_user.h b/python/environs/py_user.h
index 51e7ccc3..43f61b47 100644
--- a/python/environs/py_user.h
+++ b/python/environs/py_user.h
@@ -43,6 +43,7 @@ PyObject *user_add_assertion(PyObject *self, PyObject *args);
 PyObject *user_destroy(PyObject *self, PyObject *args);
 PyObject *user_dump(PyObject *self, PyObject *args);
 PyObject *user_get_assertion(PyObject *self, PyObject *args);
+PyObject *user_get_authentication_method(PyObject *self, PyObject *args);
 PyObject *user_get_next_assertion_remote_providerID(PyObject *self, PyObject *args);
 PyObject *user_remove_assertion(PyObject *self, PyObject *args);
 
diff --git a/python/lasso.py b/python/lasso.py
index 855ba163..135e3a0a 100644
--- a/python/lasso.py
+++ b/python/lasso.py
@@ -871,14 +871,17 @@ class User:
     def destroy(self):
 	lassomod.user_destroy(self)
 
-    def get_assertion(self, providerID):
-	return Node(lassomod.user_get_assertion(self, providerID))
+    def get_assertion(self, remote_providerID):
+	return Node(lassomod.user_get_assertion(self, remote_providerID))
+
+    def get_authentication_method(self, remote_providerID):
+	return lassomod.user_get_authentication_method(self, remote_providerID)
 
     def get_next_assertion_remote_providerID(self):
 	return lassomod.user_get_next_assertion_remote_providerID(self)
 
-    def remove_assertion(self, providerID):
-	lassomod.user_remove_assertion(self, providerID)
+    def remove_assertion(self, remote_providerID):
+	lassomod.user_remove_assertion(self, remote_providerID)
 
 loginProtocolProfileBrwsArt  = 1
 loginProtocolProfileBrwsPost = 2
diff --git a/python/lassomod.c b/python/lassomod.c
index 171abf92..75478717 100644
--- a/python/lassomod.c
+++ b/python/lassomod.c
@@ -268,6 +268,7 @@ static PyMethodDef lasso_methods[] = {
   {"user_destroy",                              user_destroy,                              METH_VARARGS},
   {"user_dump",                                 user_dump,                                 METH_VARARGS},
   {"user_get_assertion",                        user_get_assertion,                        METH_VARARGS},
+  {"user_get_authentication_method",            user_get_authentication_method,            METH_VARARGS},
   {"user_get_next_assertion_remote_providerID", user_get_next_assertion_remote_providerID, METH_VARARGS},
   {"user_remove_assertion",                     user_remove_assertion,                     METH_VARARGS},