From 20019d62e96f1cf46119f7f2e65b9b07838f2a60 Mon Sep 17 00:00:00 2001
From: Tomasz Marciniak <t.marciniak@samsung.com>
Date: Wed, 18 May 2016 09:28:52 +0200
Subject: [PATCH] [WidgetService] Adjusted privilege checking.

[Verification] Code compiles.

Change-Id: I2004b99232a4b71a158f4b75bef0c5325312b0bc
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>
---
 src/widgetservice/widgetservice_instance.cc | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/widgetservice/widgetservice_instance.cc b/src/widgetservice/widgetservice_instance.cc
index 81ac3c95..be4d077a 100755
--- a/src/widgetservice/widgetservice_instance.cc
+++ b/src/widgetservice/widgetservice_instance.cc
@@ -25,6 +25,7 @@
 
 #include "widgetservice/widgetservice_utils.h"
 #include "common/scope_exit.h"
+#include "common/tools.h"
 
 namespace extension {
 namespace widgetservice {
@@ -37,7 +38,7 @@ std::mutex WidgetServiceInstance::listener_mutex_;
 namespace {
 const common::ListenerToken kWidgetChangeCallbackToken{"WidgetChangeCallback"};
 
-const std::string kPrivilegeWidget = "http://tizen.org/privilege/widget.viewer";
+const std::string kPrivilegeWidgetService = "http://tizen.org/privilege/widget.viewer";
 
 const std::string kLang = "lang";
 const std::string kInstanceId = "instanceId";
@@ -181,7 +182,8 @@ WidgetServiceInstance::~WidgetServiceInstance() {
 TizenResult WidgetServiceInstance::GetWidget(const picojson::object& args) {
   ScopeLogger();
 
-  //CHECK_PRIVILEGE_ACCESS(kPrivilegeWidget, &out);
+  CHECK_PRIVILEGE(kPrivilegeWidgetService);
+
   CHECK_EXIST(args, kWidgetId, out)
 
   const auto& widget_id = args.find(kWidgetId)->second.get<std::string>();
@@ -201,7 +203,7 @@ TizenResult WidgetServiceInstance::GetWidgets(const picojson::object& args,
                                                const common::AsyncToken& token) {
   ScopeLogger();
 
-  //CHECK_PRIVILEGE_ACCESS(kPrivilegeWidget, &out);
+  CHECK_PRIVILEGE(kPrivilegeWidgetService);
 
   std::string pkgid;
   const auto id = args.find(kPackageId);
@@ -240,7 +242,8 @@ TizenResult WidgetServiceInstance::GetWidgets(const picojson::object& args,
 TizenResult WidgetServiceInstance::GetPrimaryWidgetId(const picojson::object& args) {
   ScopeLogger();
 
-  //CHECK_PRIVILEGE_ACCESS(kPrivilegeWidget, &out);
+  CHECK_PRIVILEGE(kPrivilegeWidgetService);
+
   CHECK_EXIST(args, kId, out)
 
   const auto& id = args.find(kId)->second.get<std::string>();
@@ -282,7 +285,8 @@ TizenResult WidgetServiceInstance::GetSize(const picojson::object& args) {
 TizenResult WidgetServiceInstance::GetName(picojson::object const& args) {
   ScopeLogger();
 
-  //CHECK_PRIVILEGE_ACCESS(kPrivilegeWidget, &out);
+  CHECK_PRIVILEGE(kPrivilegeWidgetService);
+
   CHECK_EXIST(args, kWidgetId, out)
 
   const auto& widget_id = args.find(kWidgetId)->second.get<std::string>();
@@ -372,7 +376,8 @@ TizenResult WidgetServiceInstance::GetVariant(picojson::object const& args) {
 TizenResult WidgetServiceInstance::GetVariants(picojson::object const& args, const common::AsyncToken& token) {
   ScopeLogger();
 
-  //CHECK_PRIVILEGE_ACCESS(kPrivilegeWidget, &out);
+  CHECK_PRIVILEGE(kPrivilegeWidgetService);
+
   CHECK_EXIST(args, kWidgetId, out)
 
   const auto& widget_id = args.find(kWidgetId)->second.get<std::string>();
@@ -447,7 +452,8 @@ void WidgetServiceInstance::CallWidgetLifecycleListener(const std::string& widge
 TizenResult WidgetServiceInstance::AddChangeListener(picojson::object const& args) {
   ScopeLogger();
 
-  //CHECK_PRIVILEGE_ACCESS(kPrivilegeWidget, &out);
+  CHECK_PRIVILEGE(kPrivilegeWidgetService);
+
   CHECK_EXIST(args, kWidgetId, out)
 
   const auto& widget_id = args.find(kWidgetId)->second.get<std::string>();
-- 
2.34.1