- Removed odd private method : lasso_name_identifier_mapping_response_new_from_query is not useful,

Liberty Alliance does't implement Redirect method in name
identifier mapping profile.

- Added lasso_name_identifier_mapping_response_set_status_code_value() to define status code of the response.

2 files changed, 82 insertions, 101 deletions

diff --git a/lasso/Attic/protocols/name_identifier_mapping_response.c b/lasso/Attic/protocols/name_identifier_mapping_response.c
index 0bdc3e79..b3847f7e 100644
--- a/lasso/Attic/protocols/name_identifier_mapping_response.c
+++ b/lasso/Attic/protocols/name_identifier_mapping_response.c
@@ -29,6 +29,81 @@
 /* public methods                                                            */
 /*****************************************************************************/
 
+gint
+lasso_name_identifier_mapping_response_set_status_code_value(LassoNameIdentifierMappingResponse *response,
+							     xmlChar                            *statusCodeValue)
+{
+  LassoNode *status, *status_code;
+
+  g_return_val_if_fail(LASSO_IS_NAME_IDENTIFIER_MAPPING_RESPONSE(response), -1);
+
+  status = lasso_samlp_status_new();
+
+  status_code = lasso_samlp_status_code_new();
+  lasso_samlp_status_code_set_value(LASSO_SAMLP_STATUS_CODE(status_code),
+				    statusCodeValue);
+
+  lasso_samlp_status_set_statusCode(LASSO_SAMLP_STATUS(status),
+				    LASSO_SAMLP_STATUS_CODE(status_code));
+
+  lasso_lib_name_identifier_mapping_response_set_status(LASSO_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE(response),
+							LASSO_SAMLP_STATUS(status));
+  lasso_node_destroy(status_code);
+  lasso_node_destroy(status);
+
+  return 0;
+}
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+static LassoNode *
+lasso_name_identifier_mapping_response_new_from_soap(const gchar *buffer)
+{
+  LassoNode *response;
+  LassoNode *envelope, *lassoNode_response;
+  xmlNodePtr xmlNode_response;
+  LassoNodeClass *class;
+
+  response = LASSO_NODE(g_object_new(LASSO_TYPE_NAME_IDENTIFIER_MAPPING_RESPONSE, NULL));
+
+  envelope = lasso_node_new_from_dump(buffer);
+  lassoNode_response = lasso_node_get_child(envelope, "NameIdentifierMappingResponse",
+					    lassoLibHRef, NULL);
+     
+  class = LASSO_NODE_GET_CLASS(lassoNode_response);
+  xmlNode_response = xmlCopyNode(class->get_xmlNode(LASSO_NODE(lassoNode_response)), 1);
+  lasso_node_destroy(lassoNode_response);
+
+  class = LASSO_NODE_GET_CLASS(response);
+  class->set_xmlNode(LASSO_NODE(response), xmlNode_response);
+  lasso_node_destroy(envelope);
+  
+  return response;
+}
+
+
+static LassoNode *
+lasso_name_identifier_mapping_response_new_from_xml(gchar *buffer)
+{
+  LassoNode *response;
+  LassoNode *lassoNode_response;
+  xmlNodePtr xmlNode_response;
+  LassoNodeClass *class;
+
+  response = LASSO_NODE(g_object_new(LASSO_TYPE_NAME_IDENTIFIER_MAPPING_RESPONSE, NULL));
+
+  lassoNode_response = lasso_node_new_from_dump(buffer);
+  class = LASSO_NODE_GET_CLASS(lassoNode_response);
+  xmlNode_response = xmlCopyNode(class->get_xmlNode(LASSO_NODE(lassoNode_response)), 1);
+  class = LASSO_NODE_GET_CLASS(response);
+  class->set_xmlNode(LASSO_NODE(response), xmlNode_response);
+  lasso_node_destroy(lassoNode_response);
+  
+  return response;
+}
+
 /*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
@@ -70,20 +145,15 @@ LassoNode*
 lasso_name_identifier_mapping_response_new(const xmlChar       *providerID,
 					   const xmlChar       *statusCodeValue,
 					   LassoNode           *request,
-					   xmlChar             *content,
-					   xmlChar             *nameQualifier,
-					   xmlChar             *format,
 					   lassoSignatureType   sign_type,
 					   lassoSignatureMethod sign_method)
 {
-  /* FIXME : change request type */
   LassoNode *response, *ss, *ssc;
   xmlChar *inResponseTo, *request_providerID;
   xmlChar *id, *time;
 
   response = LASSO_NODE(g_object_new(LASSO_TYPE_NAME_IDENTIFIER_MAPPING_RESPONSE, NULL));
   
-  /* Set ONLY required elements/attributes */
   /* ResponseID */
   id = lasso_build_unique_id(32);
   lasso_samlp_response_abstract_set_responseID(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
@@ -100,20 +170,24 @@ lasso_name_identifier_mapping_response_new(const xmlChar       *providerID,
   lasso_samlp_response_abstract_set_issueInstant(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
 						 time);
   xmlFree(time);
+
   /* ProviderID */
   lasso_lib_name_identifier_mapping_response_set_providerID(LASSO_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE(response),
 							    providerID);
 
+  /* InResponseTo */
   inResponseTo = lasso_node_get_attr_value(request, "RequestID", NULL);
   lasso_samlp_response_abstract_set_inResponseTo(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
 						 inResponseTo);
   xmlFree(inResponseTo);
 
+  /* Recipient */
   request_providerID = lasso_node_get_child_content(request, "ProviderID", NULL, NULL);
   lasso_samlp_response_abstract_set_recipient(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
 					      request_providerID);
   xmlFree(request_providerID);
 
+  /* Status / StatusCode / Value */
   ss = lasso_samlp_status_new();
   ssc = lasso_samlp_status_code_new();
   lasso_samlp_status_code_set_value(LASSO_SAMLP_STATUS_CODE(ssc),
@@ -129,96 +203,6 @@ lasso_name_identifier_mapping_response_new(const xmlChar       *providerID,
   return response;
 }
 
-LassoNode *
-lasso_name_identifier_mapping_response_new_from_query(const gchar *query)
-{
-  LassoNode *response;
-  GData *gd;
-  
-  response = LASSO_NODE(g_object_new(LASSO_TYPE_NAME_IDENTIFIER_MAPPING_RESPONSE, NULL));
-
-  gd = lasso_query_to_dict(query);
-  
-  /* ResponseID */
-  lasso_samlp_response_abstract_set_responseID(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
-					       lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "ResponseID"), 0));
-  
-  /* MajorVersion */
-  lasso_samlp_response_abstract_set_majorVersion(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
-						 lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "MajorVersion"), 0));
-  
-  /* MinorVersion */
-  lasso_samlp_response_abstract_set_minorVersion(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
-						 lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "MinorVersion"), 0));
-  
-  /* IssueInstant */
-  lasso_samlp_response_abstract_set_issueInstant(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
-						 lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "IssueInstant"), 0));
-  
-  /* InResponseTo */
-  lasso_samlp_response_abstract_set_inResponseTo(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
-						 lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "InResponseTo"), 0));
-  
-  /* Recipient */
-  lasso_samlp_response_abstract_set_recipient(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
-					      lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "Recipient"), 0));
-  
-  /* ProviderID */
-  lasso_lib_name_identifier_mapping_response_set_providerID(LASSO_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE(response),
-							  lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "ProviderID"), 0));
-
-
-  g_datalist_clear(&gd);
-
-  return response;
-}
-
-LassoNode *
-lasso_name_identifier_mapping_response_new_from_soap(const gchar *buffer)
-{
-  LassoNode *response;
-  LassoNode *envelope, *lassoNode_response;
-  xmlNodePtr xmlNode_response;
-  LassoNodeClass *class;
-
-  response = LASSO_NODE(g_object_new(LASSO_TYPE_NAME_IDENTIFIER_MAPPING_RESPONSE, NULL));
-
-  envelope = lasso_node_new_from_dump(buffer);
-  lassoNode_response = lasso_node_get_child(envelope, "NameIdentifierMappingResponse",
-					    lassoLibHRef, NULL);
-     
-  class = LASSO_NODE_GET_CLASS(lassoNode_response);
-  xmlNode_response = xmlCopyNode(class->get_xmlNode(LASSO_NODE(lassoNode_response)), 1);
-  lasso_node_destroy(lassoNode_response);
-
-  class = LASSO_NODE_GET_CLASS(response);
-  class->set_xmlNode(LASSO_NODE(response), xmlNode_response);
-  lasso_node_destroy(envelope);
-  
-  return response;
-}
-
-
-static LassoNode *
-lasso_name_identifier_mapping_response_new_from_xml(gchar *buffer)
-{
-  LassoNode *response;
-  LassoNode *lassoNode_response;
-  xmlNodePtr xmlNode_response;
-  LassoNodeClass *class;
-
-  response = LASSO_NODE(g_object_new(LASSO_TYPE_NAME_IDENTIFIER_MAPPING_RESPONSE, NULL));
-
-  lassoNode_response = lasso_node_new_from_dump(buffer);
-  class = LASSO_NODE_GET_CLASS(lassoNode_response);
-  xmlNode_response = xmlCopyNode(class->get_xmlNode(LASSO_NODE(lassoNode_response)), 1);
-  class = LASSO_NODE_GET_CLASS(response);
-  class->set_xmlNode(LASSO_NODE(response), xmlNode_response);
-  lasso_node_destroy(lassoNode_response);
-  
-  return response;
-}
-
 LassoNode*
 lasso_name_identifier_mapping_response_new_from_export(gchar               *buffer,
 						       lassoNodeExportType  export_type)
@@ -228,9 +212,6 @@ lasso_name_identifier_mapping_response_new_from_export(gchar               *buff
   g_return_val_if_fail(buffer != NULL, NULL);
 
   switch(export_type){
-  case lassoNodeExportTypeQuery:
-    response = lasso_name_identifier_mapping_response_new_from_query(buffer);
-    break;
   case lassoNodeExportTypeSoap:
     response = lasso_name_identifier_mapping_response_new_from_soap(buffer);
     break;
diff --git a/lasso/Attic/protocols/name_identifier_mapping_response.h b/lasso/Attic/protocols/name_identifier_mapping_response.h
index a82723a0..529d9097 100644
--- a/lasso/Attic/protocols/name_identifier_mapping_response.h
+++ b/lasso/Attic/protocols/name_identifier_mapping_response.h
@@ -58,15 +58,15 @@ LASSO_EXPORT GType      lasso_name_identifier_mapping_response_get_type
 LASSO_EXPORT LassoNode* lasso_name_identifier_mapping_response_new                    (const xmlChar       *providerID,
 										       const xmlChar       *statusCodeValue,
 										       LassoNode           *request,
-										       xmlChar             *content,
-										       xmlChar             *qualifier,
-										       xmlChar             *format,
 										       lassoSignatureType   sign_type,
 										       lassoSignatureMethod sign_method);
 
 LASSO_EXPORT LassoNode* lasso_name_identifier_mapping_response_new_from_export        (gchar               *buffer,
 										       lassoNodeExportType  export_type);
 
+LASSO_EXPORT gint       lasso_name_identifier_mapping_response_set_status_code_value  (LassoNameIdentifierMappingResponse *response,
+										       xmlChar                            *statusCodeValue);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */