Added mising facetId, conditional inclusion of test app

Change-Id: I64bc6643175bb3c7259044f8f5d367ea53f99f4a
Signed-off-by: Manasij Sur Roy <manasij.r@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54f1735..d434402 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,4 +14,8 @@ ADD_DEPENDENCIES(fido-service fido-ui-service)
 #INSTALL(DIRECTORY lib/fido/asm/ DESTINATION lib/fido/asm/)
 ADD_SUBDIRECTORY(test/Dummy_ASM_DBUS)
 ADD_SUBDIRECTORY(test/shell_tc)
+MESSAGE( STATUS "USE_JSON_BUILDER: " ${USE_JSON_BUILDER} )
+if(NOT USE_JSON_BUILDER)
+ADD_SUBDIRECTORY(test/Fido_Sample_RPM)
+endif()
 

diff --git a/common/fido_json_handler.c b/common/fido_json_handler.c
index 860ae3d..9ff4bbb 100644 (file)
--- a/common/fido_json_handler.c
+++ b/common/fido_json_handler.c
@@ -1887,6 +1887,7 @@ _uaf_composer_compose_final_challenge(const char *app_id, const char *challenge,
     }
 
     json_object_set_string_member(root_obj, _JSON_KEY_APPID, app_id);
+       json_object_set_string_member(root_obj, _JSON_KEY_FACET_ID, facet_id);
     json_object_set_string_member(root_obj, _JSON_KEY_CHALLENGE, challenge);
 
     JsonNode *jsonNode = NULL;

diff --git a/packaging/fido-client.spec b/packaging/fido-client.spec
index 202c7b3..dac6fa1 100644 (file)
--- a/packaging/fido-client.spec
+++ b/packaging/fido-client.spec
@@ -283,3 +283,36 @@ This is a dummy ASM for testing FIDO client.
 %attr(0644,root,root) %{_datadir}/dbus-1/services/org.tizen.dummyasm.service
 %{_libdir}/fido/asm/dummy_asm.json
 %endif
+
+%if "%{?tizen_version}" == "2.3.1"
+#################################################################################
+## Fido Sample App
+
+%package -n org.tizen.FidoSample
+Summary:    Fido Sample App (Internal Dev)
+Group:      Account/Testing
+Requires:   %{name} = %{version}-%{release}
+
+BuildRequires: cmake
+BuildRequires: pkgconfig(capi-appfw-application)
+BuildRequires: pkgconfig(capi-system-system-settings)
+BuildRequires: pkgconfig(elementary)
+BuildRequires: pkgconfig(efl-extension)
+BuildRequires: pkgconfig(dlog)
+BuildRequires: pkgconfig(json-glib-1.0)
+BuildRequires: pkgconfig(glib-2.0) >= 2.26
+BuildRequires: pkgconfig(gio-unix-2.0)
+Requires: fido-client
+
+%description -n org.tizen.FidoSample
+This is a program to test the Fido service internally.
+
+%files -n org.tizen.FidoSample
+%defattr(-,root,root,-)
+%manifest org.tizen.FidoSample.manifest
+/opt/usr/apps/org.tizen.FidoSample/bin/*
+/opt/usr/apps/org.tizen.FidoSample/res/*
+/opt/usr/apps/org.tizen.FidoSample/shared/res/*
+/opt/share/packages/org.tizen.FidoSample.xml
+##/opt/share/icons/default/small/org.tizen.FidoSample.png
+%endif